diff --git a/app-admin/eselect-pinentry/metadata.xml b/app-admin/eselect-pinentry/metadata.xml
index 91f4e72fb544..d68fe974c15a 100644
--- a/app-admin/eselect-pinentry/metadata.xml
+++ b/app-admin/eselect-pinentry/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+<herd>crypto</herd>
 </pkgmetadata>
diff --git a/app-crypt/pinentry-qt/metadata.xml b/app-crypt/pinentry-qt/metadata.xml
index 91f4e72fb544..d68fe974c15a 100644
--- a/app-crypt/pinentry-qt/metadata.xml
+++ b/app-crypt/pinentry-qt/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+<herd>crypto</herd>
 </pkgmetadata>
diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml
index 91f4e72fb544..d68fe974c15a 100644
--- a/app-crypt/pinentry/metadata.xml
+++ b/app-crypt/pinentry/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+<herd>crypto</herd>
 </pkgmetadata>
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 90e160013f21..eed3f2568cd4 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,2 +1,3 @@
 DIST llpp-12.tar.gz 100362 SHA256 30c66684a1b2892bd1125afb99583abad5cc433dee2c623ec0cdefb0ec4c6fe4 SHA512 c6c298bf0fdf8eb10aa1e1812d386022fae26271084b014a3a512fc1c8cf7c8ca5768c3587e7c83e34210354e4219b74cee22fb51edc1fe467de4c11b631416c WHIRLPOOL f2ffe1005b2f0d89dda865c3d0f0a306e311cad6ef45070a702eefe2c44e59ca5067e95de182fb4673526dea801b8969d44260fb32d1fd57549777f95194dfde
 DIST llpp-13.tar.gz 102399 SHA256 c6f0b4bb742e62cfa7e711f8ff1b25ca6456596961e637805c060e8ca206ff70 SHA512 c8d64adb488534353e83f70ee47075cb141475ebfdbfeecf2f19c23bf88f194499f5bf7227a102baa5e9f83671c68519001edcd6ddf0d507a3ccba5f66056b8d WHIRLPOOL 96a517113b67e5e7ea7523afd062dae587eafb265eb50c83f6412920acfeedeba4a05c49d398932da08e0eab1d65911e478eefb561c8a39320d3ff85b38a054b
+DIST llpp-13_p20121123.tar.gz 110436 SHA256 367c01e14478b18c39a34bc515f495b980789e536744e7b698d1639e6935eb35 SHA512 2c8f47adb619416743eb2ee9f43df38989af4e255626810bc9ac34020e37d5e6637589a4e20324184184c1da21d2ed9c3f6083d02cc98a8364946091831edc60 WHIRLPOOL e8ccfbf7a6c782913ea8ba4851b42f30eba171f0c03a14946697e0763f4b95c0f56e629d0d1747f169b6bb138cedbe0bb2487012d9e1b76a902722aaf6866c59
diff --git a/app-text/llpp/llpp-13_p20121123.ebuild b/app-text/llpp/llpp-13_p20121123.ebuild
new file mode 100644
index 000000000000..9c4e78f843f3
--- /dev/null
+++ b/app-text/llpp/llpp-13_p20121123.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-13_p20121123.ebuild,v 1.1 2012/11/28 08:16:43 xmw Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="http://repo.or.cz/w/llpp.git"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/freetype
+	media-libs/jbig2dec
+	media-libs/openjpeg
+	virtual/jpeg
+	x11-libs/libX11
+	x11-misc/xsel"
+DEPEND="${RDEPEND}
+	>=app-text/mupdf-1.1_p20121127
+	dev-lang/ocaml[ocamlopt]
+	dev-ml/lablgl[glut]"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch
+}
+
+src_compile() {
+	ocaml str.cma keystoml.ml KEYS > help.ml || die
+	printf 'let version ="%s";;\n' ${PV} >> help.ml || die
+
+	local myccopt="$(freetype-config --cflags) -O -include ft2build.h -D_GNU_SOURCE"
+	local mycclib="-lfitz -lz -ljpeg -lopenjpeg -ljbig2dec -lfreetype -lX11 -lpthread"
+	ocamlopt.opt -c -o link.o -ccopt "${myccopt}" link.c || die
+	ocamlopt.opt -c -o help.cmx help.ml || die
+	ocamlopt.opt -c -o wsi.cmi wsi.mli || die
+	ocamlopt.opt -c -o wsi.cmx wsi.ml || die
+	ocamlopt.opt -c -o parser.cmx parser.ml || die
+	ocamlopt.opt -c -o main.cmx -I +lablGL main.ml || die
+	ocamlopt.opt -o llpp -I +lablGL \
+		str.cmxa unix.cmxa lablgl.cmxa link.o \
+	    -cclib "${mycclib}" help.cmx parser.cmx wsi.cmx main.cmx || die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc KEYS README Thanks fixme
+}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 0bcd670b657c..9dcf4136e099 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,2 +1,4 @@
 DIST mupdf-1.0-source.tar.gz 4208530 SHA256 4f5e12625f7f827f6eb5606026c9a7a7dbdeaf935fcea3bc173ed8d469698ec2 SHA512 00f71288740a137fa3eb3537453f0465949a2dbc590a38651b3dd7a651dad6d0dc5070a3072988439f52729b12478cb467f202157ceb44e5a560431354567861 WHIRLPOOL b58166c37fa6ba81e946e53326dad50426886380b051943f2988657780e3c77e4970541f27ec3efc29ce6693012293bf3104dfd79dfc50f644c6f051431294f3
 DIST mupdf-1.1-source.tar.gz 4281735 SHA256 e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34 SHA512 d61694041d28309e8119283fb97cef5e1f2effa6e93bfe5ad0b2a0b6b76e38a575a23b0ba367cb59efa77f35b131bf82667f2c7c8df29eb4cdbe3c12b0ad3a33 WHIRLPOOL 67ba7df6c0b94f3213b2e6a709fc3d9ec02945a0825169fb8833b2919b4bd4d8e6fd5f29b2b231df213f8e68d092526b59c152281b56d1c3a9064799ed35e60c
+DIST mupdf-1.1_p20120816.tar.gz 4274527 SHA256 f1905839972c8a0315cd9487c05db87670bc9860320a348c15d34d50306d3fb0 SHA512 8dc809545e1931da5772847ccecc668eb09d048c086b21001bdc3514ac096e5a5a5f50d29cd98a033b641ef4d71c70d40dec9227a6e7baf6cd4ca6a6d84a1a44 WHIRLPOOL 7ee83acc09cec52f435524339f5c102a3459bbc9155e924f88f50879961ca7fa167dd78b3b1c968a2e80b22c29cc85840930340ffaecf7b1f525b6cdd3ebbc91
+DIST mupdf-1.1_p20121127.tar.gz 6922632 SHA256 4594bc0473e61200e6d2aba06488ea3127a7d42cd70daa01ea12c3dba5eb654c SHA512 1dff76502a5cf13e26f0bed30046878334730912ddec12f2674de69f62b173182020566f1ddd341bf3a51b28af1334c0cfcc70cac0ac8b0fb1dceacae6b25418 WHIRLPOOL 1597b87b7c53e522a5929b8c0c5c07b0a957084fb4b6974d68feea755d88606930b8a78b998efb94190c00d3d9135a60652f2751c709d49315ae10e30dc9ee0e
diff --git a/app-text/mupdf/files/mupdf-1.1_p20121127-buildsystem.patch b/app-text/mupdf/files/mupdf-1.1_p20121127-buildsystem.patch
new file mode 100644
index 000000000000..d15187486105
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.1_p20121127-buildsystem.patch
@@ -0,0 +1,24 @@
+--- mupdf-1.0-source/Makerules
++++ mupdf-1.0-source/Makerules
+@@ -6,7 +6,7 @@
+ CFLAGS += -Wall
+ 
+ ifeq "$(build)" "debug"
+-CFLAGS += -pipe -g -DDEBUG
++CFLAGS += -DDEBUG
+ else ifeq "$(build)" "profile"
+ CFLAGS += -pipe -O2 -DNDEBUG -pg
+ LDFLAGS += -pg
+@@ -21,9 +21,9 @@
+ endif
+ 
+ ifeq "$(OS)" "Linux"
+-SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
+-SYS_OPENJPEG_INC := `pkg-config --cflags libopenjpeg`
+-X11_LIBS := -lX11 -lXext
++SYS_FREETYPE_INC := $(shell pkg-config --cflags freetype2)
++SYS_OPENJPEG_INC := $(shell pkg-config --cflags libopenjpeg)
++X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
+ 
+ ifeq "$(OS)" "FreeBSD"
diff --git a/app-text/mupdf/files/mupdf-9999-buildsystem.patch b/app-text/mupdf/files/mupdf-9999-buildsystem.patch
new file mode 100644
index 000000000000..d15187486105
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-9999-buildsystem.patch
@@ -0,0 +1,24 @@
+--- mupdf-1.0-source/Makerules
++++ mupdf-1.0-source/Makerules
+@@ -6,7 +6,7 @@
+ CFLAGS += -Wall
+ 
+ ifeq "$(build)" "debug"
+-CFLAGS += -pipe -g -DDEBUG
++CFLAGS += -DDEBUG
+ else ifeq "$(build)" "profile"
+ CFLAGS += -pipe -O2 -DNDEBUG -pg
+ LDFLAGS += -pg
+@@ -21,9 +21,9 @@
+ endif
+ 
+ ifeq "$(OS)" "Linux"
+-SYS_FREETYPE_INC := `pkg-config --cflags freetype2`
+-SYS_OPENJPEG_INC := `pkg-config --cflags libopenjpeg`
+-X11_LIBS := -lX11 -lXext
++SYS_FREETYPE_INC := $(shell pkg-config --cflags freetype2)
++SYS_OPENJPEG_INC := $(shell pkg-config --cflags libopenjpeg)
++X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
+ 
+ ifeq "$(OS)" "FreeBSD"
diff --git a/app-text/mupdf/mupdf-1.1_p20120816.ebuild b/app-text/mupdf/mupdf-1.1_p20120816.ebuild
new file mode 100644
index 000000000000..5aeb90346922
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.1_p20120816.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.1_p20120816.ebuild,v 1.1 2012/11/28 08:05:27 xmw Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla"
+
+RDEPEND="media-libs/freetype:2
+	media-libs/jbig2dec
+	>=media-libs/openjpeg-1.5
+	virtual/jpeg
+	X? ( x11-libs/libX11
+		x11-libs/libXext )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1_rc1-buildsystem.patch
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
+	fi
+}
+
+src_compile() {
+	use X || my_nox11="NOX11=yes MUPDF= "
+
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" OS=Linux \
+		build=debug verbose=true ${my_nox11}
+}
+
+src_install() {
+	emake prefix="${ED}usr" libdir="${ED}usr/$(get_libdir)" \
+		build=debug verbose=true ${my_nox11} install
+
+	insinto /usr/include
+	doins pdf/mupdf{,-internal}.h
+	doins fitz/fitz{,-internal}.h
+	doins xps/muxps{,-internal}.h
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins debian/mupdf.pc
+
+	if use X ; then
+		domenu debian/mupdf.desktop
+		doicon debian/mupdf.xpm
+	fi
+	dodoc README doc/{example.c,overview.txt}
+}
diff --git a/app-text/mupdf/mupdf-1.1_p20121127.ebuild b/app-text/mupdf/mupdf-1.1_p20121127.ebuild
new file mode 100644
index 000000000000..adba64e3041e
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.1_p20121127.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.1_p20121127.ebuild,v 1.1 2012/11/28 08:14:04 xmw Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="http://mupdf.com/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla"
+
+RDEPEND="media-libs/freetype:2
+	media-libs/jbig2dec
+	>=media-libs/openjpeg-1.5
+	virtual/jpeg
+	X? ( x11-libs/libX11
+		x11-libs/libXext )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-buildsystem.patch
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
+	fi
+}
+
+src_compile() {
+	use X || my_nox11="NOX11=yes MUPDF= "
+
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" OS=Linux \
+		build=debug verbose=true ${my_nox11}
+}
+
+src_install() {
+	emake prefix="${ED}usr" libdir="${ED}usr/$(get_libdir)" \
+		build=debug verbose=true ${my_nox11} install
+
+	insinto /usr/include
+	doins pdf/mupdf{,-internal}.h
+	doins fitz/fitz{,-internal}.h
+	doins xps/muxps{,-internal}.h
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins debian/mupdf.pc
+
+	if use X ; then
+		domenu debian/mupdf.desktop
+		doicon debian/mupdf.xpm
+	fi
+	dodoc README doc/{example.c,overview.txt}
+}
diff --git a/app-text/mupdf/mupdf-9999.ebuild b/app-text/mupdf/mupdf-9999.ebuild
index 82642ace58cb..19b3a0e61d23 100644
--- a/app-text/mupdf/mupdf-9999.ebuild
+++ b/app-text/mupdf/mupdf-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.22 2012/08/09 06:25:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-9999.ebuild,v 1.23 2012/11/28 07:33:08 xmw Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1_rc1-buildsystem.patch
+	epatch "${FILESDIR}"/${PN}-9999-buildsystem.patch
 
 	if ! use vanilla ; then
 		epatch "${FILESDIR}"/${PN}-1.1_rc1-zoom-2.patch
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index cf3b05cfe444..95f33e189be3 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,2 +1,3 @@
 DIST apr-util-1.3.12.tar.bz2 607646 SHA256 93976dc2f40d8622c4e9c355f419bb20f2c0dd843ee21a295a092d1c1b950d9c SHA512 f863e55ce9cedec80f1b53908986025fff141c13b43bb1886b8a95465b0ca3939bc2dcdba5703a3152bc8e816e29e8b1b0cc3b13a29c90172ec7b3e859fe457c WHIRLPOOL bf3264ed30ace48d245aa3c8d00250eb975d612b2a3ffeedbb27a30a5a5c2af87d58c2e6fbc6c8757755ea0b54e132cd32f31b85848f69164c10e381db5bffd7
 DIST apr-util-1.4.1.tar.bz2 635000 SHA256 302a135df2531451e567e65e5bd806fb95cf53d74064fadfce20465f7170d1cf SHA512 2893c8fc14e35d8016c69d36c05712f6f67acade2cf3079954a5626a15ad50ccf88b6e5d9a7458479fea8dfc9f4c8eaf53e5c343c80692208a4edb768d45a9ba WHIRLPOOL 4eb82d89cc9fc3f77ee4f4f90653a7f31e773d550549eca7328d4430baf5e23363b6e682960f38c4f3543d33a9583829a633375ded5267ffc6c13a3709f57aef
+DIST apr-util-1.5.1.tar.bz2 652081 SHA256 296890939f968d167f980b17921ab035071e378a6383de20c4ffb40fd2626220 SHA512 ee0b4831c337788e7792c518ee49f559094cfd3915f8201df860b0d2ec934c0c4163b49d8ffd9f8e05e3c7cf06f3dbf3acec5b6207ed7a6283d6aa3674af89f4 WHIRLPOOL dbe79e737575058596ad98e6aa0ae88dd1aa83f6c51b62ca4888a51a2679ed627c820827bc2a5fc011785c98963a4932b735006dc467d626e3a90020820961a3
diff --git a/dev-libs/apr-util/apr-util-1.5.1.ebuild b/dev-libs/apr-util/apr-util-1.5.1.ebuild
new file mode 100644
index 000000000000..00ca0d13784a
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.5.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.5.1.ebuild,v 1.1 2012/11/28 07:45:27 polynomial-c Exp $
+
+EAPI="4"
+
+# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
+# APR_PV="${PV}"
+APR_PV="1.4.5"
+
+inherit autotools db-use eutils libtool multilib
+
+DESCRIPTION="Apache Portable Runtime Utility Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
+RESTRICT="test"
+
+RDEPEND="dev-libs/expat
+	>=dev-libs/apr-${APR_PV}:1
+	berkdb? ( >=sys-libs/db-4 )
+	freetds? ( dev-db/freetds )
+	gdbm? ( sys-libs/gdbm )
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( =virtual/mysql-5* )
+	nss? ( dev-libs/nss )
+	odbc? ( dev-db/unixODBC )
+	openssl? ( dev-libs/openssl )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=(CHANGES NOTICE README)
+
+src_prepare() {
+	eautoreconf
+
+	elibtoolize
+}
+
+src_configure() {
+	local myconf
+
+	[[ ${CHOST} == *-mint* ]] && myconf="${myconf} --disable-util-dso"
+
+	if use berkdb; then
+		local db_version
+		db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
+		db_version="$(db_ver_to_slot "${db_version}")"
+		db_version="${db_version/\./}"
+		myconf+=" --with-dbm=db${db_version} --with-berkeley-db=$(db_includedir 2> /dev/null):${EPREFIX}/usr/$(get_libdir)"
+	else
+		myconf+=" --without-berkeley-db"
+	fi
+
+	econf \
+		--datadir="${EPREFIX}"/usr/share/apr-util-1 \
+		--with-apr="${EPREFIX}"/usr \
+		--with-expat="${EPREFIX}"/usr \
+		--without-sqlite2 \
+		$(use_with freetds) \
+		$(use_with gdbm) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with nss) \
+		$(use_with odbc) \
+		$(use_with openssl) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite sqlite3) \
+		${myconf}
+}
+
+src_compile() {
+	emake CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+
+	if use doc; then
+		emake dox
+	fi
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -exec rm -f {} +
+	find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -exec rm -f {} +
+
+	if use doc; then
+		dohtml -r docs/dox/html/*
+	fi
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -exec rm -f {} +
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	rm -f "${ED}usr/$(get_libdir)/aprutil.exp"
+}
diff --git a/dev-libs/apr/apr-1.4.6-r1.ebuild b/dev-libs/apr/apr-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..e8bda72a10ef
--- /dev/null
+++ b/dev-libs/apr/apr-1.4.6-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.6-r1.ebuild,v 1.1 2012/11/28 04:40:54 ottxor Exp $
+
+EAPI="4"
+
+inherit autotools eutils libtool multilib
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom +uuid"
+
+RDEPEND="uuid? (
+	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )
+)"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=(CHANGES NOTICE README)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-mint.patch
+
+	# Ensure that system libtool is used.
+	local g=
+	[[ ${CHOST} == *-darwin* ]] && g=g
+	sed -e 's:${installbuilddir}/libtool:'"${EPREFIX}/usr/bin/${g}libtool"':' -i apr-config.in || die "sed failed"
+	sed -e 's:@LIBTOOL@:$(SHELL) '"${EPREFIX}/usr/bin/${g}libtool"':' -i build/apr_rules.mk.in || die "sed failed"
+
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	epatch "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+	local myconf
+
+	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+	if use older-kernels-compatibility; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+
+	if use urandom; then
+		myconf+=" --with-devrandom=/dev/urandom"
+	elif (( ${CHOST#*-hpux11.} <= 11 )); then
+		: # no /dev/*random on hpux11.11 and before, $PN detects this.
+	else
+		myconf+=" --with-devrandom=/dev/random"
+	fi
+
+	if [[ ${CHOST} == *-mint* ]] ; then
+		myconf+=" --disable-dso"
+	fi
+
+	# shl_load does not search runpath, but hpux11 supports dlopen
+	[[ ${CHOST} == *-hpux11* ]] && myconf="${myconf} --enable-dso=dlfcn"
+
+	if [[ ${CHOST} == *-solaris2.10 ]]; then
+		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
+		*atomic_cas_ptr*) ;;
+		*)
+			elog "You do not have Solaris Patch ID "$(
+				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
+			)" (Problem 4954703) installed on your host ($(hostname)),"
+			elog "using generic atomic operations instead."
+			myconf="${myconf} --disable-nonportable-atomics"
+			;;
+		esac
+	fi
+
+	if ! use uuid; then
+		local apr_cv_osuuid
+		export apr_cv_osuuid="no"
+	fi
+
+	CONFIG_SHELL="${EPREFIX}"/bin/bash econf \
+		--enable-layout=gentoo \
+		--enable-nonportable-atomics \
+		--enable-threads \
+		${myconf}
+
+	rm -f libtool
+}
+
+src_compile() {
+	emake
+
+	if use doc; then
+		emake dox
+	fi
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -exec rm -f {} +
+
+	if use doc; then
+		dohtml -r docs/dox/html/*
+	fi
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -exec rm -f {} +
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm -f "${ED}usr/$(get_libdir)/apr.exp"
+}
diff --git a/dev-libs/apr/files/apr-1.4.6-mint.patch b/dev-libs/apr/files/apr-1.4.6-mint.patch
new file mode 100644
index 000000000000..43442da98834
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.4.6-mint.patch
@@ -0,0 +1,27 @@
+diff -ur apr-1.2.11/build/apr_hints.m4 apr-1.2.11-mint/build/apr_hints.m4
+--- apr-1.2.11/build/apr_hints.m4	Tue Jun 26 23:47:46 2007
++++ apr-1.2.11-mint/build/apr_hints.m4	Tue Mar 25 12:00:14 2008
+@@ -44,8 +44,9 @@
+ 
+   case "$host" in
+     *mint)
+-	APR_ADDTO(CPPFLAGS, [-DMINT])
+-	APR_ADDTO(LIBS, [-lportlib])
++	APR_ADDTO(CPPFLAGS, [-DMINT -D_GNU_SOURCE])
++	apr_cv_pthreads_cflags="none"
++	apr_cv_pthreads_lib="-lpthread"
+ 	;;
+     *MPE/iX*)
+ 	APR_ADDTO(CPPFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE])
+diff -ur apr-1.2.11/build/apr_threads.m4 apr-1.2.11-mint/build/apr_threads.m4
+--- apr-1.2.11/build/apr_threads.m4	Thu Aug  3 11:05:26 2006
++++ apr-1.2.11-mint/build/apr_threads.m4	Wed Mar 19 08:38:56 2008
+@@ -198,7 +198,7 @@
+ AC_DEFUN(APR_CHECK_SIGWAIT_ONE_ARG,[
+   AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[
+   AC_TRY_COMPILE([
+-#if defined(__NETBSD__) || defined(DARWIN)
++#if defined(__NETBSD__) || defined(DARWIN) || defined(MINT)
+     /* When using the unproven-pthreads package, we need to pull in this
+      * header to get a prototype for sigwait().  Else things will fail later
+      * on.  XXX Should probably be fixed in the unproven-pthreads package.
diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index c74e8ea8b677..b86c6db4a91f 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -1,2 +1,2 @@
-DIST trojita-0.2.9.4.tar.bz2 238991 RMD160 4a5cb1122557d2ee6f383ef1160703b6708720a5 SHA1 ac5d3e508970878d47955b412eb57a9a7c1ae451 SHA256 4ef0acb730439fb794cc3e64276c16160cff2518ca16feb77008c5031e386758
-DIST trojita-0.3.tar.bz2 298004 RMD160 ecb7a3af7e34204e41732a60b99e8ed5286e071e SHA1 3f0c550b235cdba07819fd61af1d85322180ef56 SHA256 71165b39d88b77e812ee20aa21d79fb45d07d13f0ccafd92825537b2d9252d5d
+DIST trojita-0.2.9.4.tar.bz2 238991 SHA256 4ef0acb730439fb794cc3e64276c16160cff2518ca16feb77008c5031e386758
+DIST trojita-0.3.tar.bz2 298004 SHA256 71165b39d88b77e812ee20aa21d79fb45d07d13f0ccafd92825537b2d9252d5d
diff --git a/mail-client/trojita/trojita-0.3.ebuild b/mail-client/trojita/trojita-0.3.ebuild
index aba5aa8866dd..fcb9464e7456 100644
--- a/mail-client/trojita/trojita-0.3.ebuild
+++ b/mail-client/trojita/trojita-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-0.3.ebuild,v 1.1 2012/03/30 10:34:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-0.3.ebuild,v 1.2 2012/11/28 07:37:32 yngwin Exp $
 
 EAPI=4
 
@@ -23,14 +23,11 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="debug test"
 
-RDEPEND="
-	>=x11-libs/qt-gui-${QT_REQUIRED}:4
+RDEPEND=">=x11-libs/qt-gui-${QT_REQUIRED}:4
 	>=x11-libs/qt-sql-${QT_REQUIRED}:4[sqlite]
 	>=x11-libs/qt-webkit-${QT_REQUIRED}:4
-"
-DEPEND="${RDEPEND}
-	test? ( >=x11-libs/qt-test-${QT_REQUIRED}:4 )
-"
+	>=x11-libs/qt-test-${QT_REQUIRED}:4"
+DEPEND=${RDEPEND}
 
 src_configure() {
 	eqmake4 PREFIX=/usr
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
index 6e08fc5c8718..3f25a7377211 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.10 2012/03/30 10:34:00 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.11 2012/11/28 07:37:32 yngwin Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="debug test"
+IUSE="debug test +zlib"
 
 RDEPEND="
 	>=x11-libs/qt-gui-${QT_REQUIRED}:4
@@ -30,8 +30,16 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( >=x11-libs/qt-test-${QT_REQUIRED}:4 )
+	zlib? (
+		virtual/pkgconfig
+		sys-libs/zlib
+	)
 "
 
 src_configure() {
-	eqmake4 PREFIX=/usr
+	local myopts=""
+	use debug && myopts="$myopts CONFIG+=debug"
+	use test || myopts="$myopts CONFIG+=disable_tests"
+	use zlib || myopts="$myopts CONFIG+=disable_zlib"
+	eqmake4 PREFIX=/usr $myopts
 }
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 4f175821a3a0..73fdc1ddbb0f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Nov 2012 04:36:51 +0000
+Wed, 28 Nov 2012 09:06:51 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 05f65372d1ac..73fdc1ddbb0f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Nov 2012 04:36:52 +0000
+Wed, 28 Nov 2012 09:06:51 +0000
diff --git a/metadata/md5-cache/app-text/llpp-13_p20121123 b/metadata/md5-cache/app-text/llpp-13_p20121123
new file mode 100644
index 000000000000..2b71c49d84b7
--- /dev/null
+++ b/metadata/md5-cache/app-text/llpp-13_p20121123
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/freetype media-libs/jbig2dec media-libs/openjpeg virtual/jpeg x11-libs/libX11 x11-misc/xsel >=app-text/mupdf-1.1_p20121127 dev-lang/ocaml[ocamlopt] dev-ml/lablgl[glut]
+DESCRIPTION=a graphical PDF viewer which aims to superficially resemble less(1)
+EAPI=4
+HOMEPAGE=http://repo.or.cz/w/llpp.git
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/freetype media-libs/jbig2dec media-libs/openjpeg virtual/jpeg x11-libs/libX11 x11-misc/xsel
+SLOT=0
+SRC_URI=mirror://gentoo/llpp-13_p20121123.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=82044f02bb1b1539c20b9c1ebbf1226d
diff --git a/metadata/md5-cache/app-text/mupdf-1.1_p20120816 b/metadata/md5-cache/app-text/mupdf-1.1_p20120816
new file mode 100644
index 000000000000..29b4771ed584
--- /dev/null
+++ b/metadata/md5-cache/app-text/mupdf-1.1_p20120816
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/freetype:2 media-libs/jbig2dec >=media-libs/openjpeg-1.5 virtual/jpeg X? ( x11-libs/libX11 x11-libs/libXext ) virtual/pkgconfig
+DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
+EAPI=4
+HOMEPAGE=http://mupdf.com/
+IUSE=X vanilla
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=media-libs/freetype:2 media-libs/jbig2dec >=media-libs/openjpeg-1.5 virtual/jpeg X? ( x11-libs/libX11 x11-libs/libXext )
+SLOT=0
+SRC_URI=mirror://gentoo/mupdf-1.1_p20120816.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4e85fd4448d946a6ca6a7e68d3b19c2e
diff --git a/metadata/md5-cache/app-text/mupdf-1.1_p20121127 b/metadata/md5-cache/app-text/mupdf-1.1_p20121127
new file mode 100644
index 000000000000..0b2dddd1a6a7
--- /dev/null
+++ b/metadata/md5-cache/app-text/mupdf-1.1_p20121127
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/freetype:2 media-libs/jbig2dec >=media-libs/openjpeg-1.5 virtual/jpeg X? ( x11-libs/libX11 x11-libs/libXext ) virtual/pkgconfig
+DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
+EAPI=4
+HOMEPAGE=http://mupdf.com/
+IUSE=X vanilla
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=media-libs/freetype:2 media-libs/jbig2dec >=media-libs/openjpeg-1.5 virtual/jpeg X? ( x11-libs/libX11 x11-libs/libXext )
+SLOT=0
+SRC_URI=mirror://gentoo/mupdf-1.1_p20121127.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3caa715471e0888fdcbbfdf85d23e934
diff --git a/metadata/md5-cache/app-text/mupdf-9999 b/metadata/md5-cache/app-text/mupdf-9999
index f7a458e65484..902c1a0c2df4 100644
--- a/metadata/md5-cache/app-text/mupdf-9999
+++ b/metadata/md5-cache/app-text/mupdf-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 RDEPEND=media-libs/freetype:2 media-libs/jbig2dec >=media-libs/openjpeg-1.5 virtual/jpeg X? ( x11-libs/libX11 x11-libs/libXext )
 SLOT=0
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	e5bc4d49fb1a376c2ac3a203b3a4dc8a	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d1093b324e7bf97c393c5f4b9290013a
+_md5_=6f9948094c2b2caf0220b9f4fa7e08b2
diff --git a/metadata/md5-cache/dev-libs/apr-1.4.6-r1 b/metadata/md5-cache/dev-libs/apr-1.4.6-r1
new file mode 100644
index 000000000000..6cd052af3339
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/apr-1.4.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=uuid? ( elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Apache Portable Runtime Library
+EAPI=4
+HOMEPAGE=http://apr.apache.org/
+IUSE=doc elibc_FreeBSD older-kernels-compatibility static-libs +urandom +uuid
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=uuid? ( elibc_glibc? ( >=sys-apps/util-linux-2.16 ) elibc_mintlib? ( >=sys-apps/util-linux-2.18 ) )
+SLOT=1
+SRC_URI=mirror://apache/apr/apr-1.4.6.tar.bz2
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=880b499635de96ff897046223d971030
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.5.1 b/metadata/md5-cache/dev-libs/apr-util-1.5.1
new file mode 100644
index 000000000000..587335d9041b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/apr-util-1.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/expat >=dev-libs/apr-1.4.5:1 berkdb? ( >=sys-libs/db-4 ) freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Apache Portable Runtime Utility Library
+EAPI=4
+HOMEPAGE=http://apr.apache.org/
+IUSE=berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/expat >=dev-libs/apr-1.4.5:1 berkdb? ( >=sys-libs/db-4 ) freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 )
+RESTRICT=test
+SLOT=1
+SRC_URI=mirror://apache/apr/apr-util-1.5.1.tar.bz2
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=c0d2d56b030a60c9622e28c534888699
diff --git a/metadata/md5-cache/mail-client/trojita-0.3 b/metadata/md5-cache/mail-client/trojita-0.3
index 542b96b347df..eddd896a59e7 100644
--- a/metadata/md5-cache/mail-client/trojita-0.3
+++ b/metadata/md5-cache/mail-client/trojita-0.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=x11-libs/qt-gui-4.6.0:4 >=x11-libs/qt-sql-4.6.0:4[sqlite] >=x11-libs/qt-webkit-4.6.0:4 test? ( >=x11-libs/qt-test-4.6.0:4 )
+DEPEND=>=x11-libs/qt-gui-4.6.0:4 >=x11-libs/qt-sql-4.6.0:4[sqlite] >=x11-libs/qt-webkit-4.6.0:4 >=x11-libs/qt-test-4.6.0:4
 DESCRIPTION=A Qt IMAP e-mail client
 EAPI=4
 HOMEPAGE=http://trojita.flaska.net/
 IUSE=debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=x11-libs/qt-gui-4.6.0:4 >=x11-libs/qt-sql-4.6.0:4[sqlite] >=x11-libs/qt-webkit-4.6.0:4
+RDEPEND=>=x11-libs/qt-gui-4.6.0:4 >=x11-libs/qt-sql-4.6.0:4[sqlite] >=x11-libs/qt-webkit-4.6.0:4 >=x11-libs/qt-test-4.6.0:4
 SLOT=0
 SRC_URI=mirror://sourceforge/trojita/trojita-0.3.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-r2	19af9102ca9b827213997cc636e7e33c	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=48f2ae60decec2afe6432eb6fe140b11
+_md5_=b413f10b8564c7b391d49269490b5f05
diff --git a/metadata/md5-cache/mail-client/trojita-9999 b/metadata/md5-cache/mail-client/trojita-9999
index 5fae692cecc1..5b2ba6239851 100644
--- a/metadata/md5-cache/mail-client/trojita-9999
+++ b/metadata/md5-cache/mail-client/trojita-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=x11-libs/qt-gui-4.6.0:4 >=x11-libs/qt-sql-4.6.0:4[sqlite] >=x11-libs/qt-webkit-4.6.0:4 test? ( >=x11-libs/qt-test-4.6.0:4 ) dev-vcs/git
+DEPEND=>=x11-libs/qt-gui-4.6.0:4 >=x11-libs/qt-sql-4.6.0:4[sqlite] >=x11-libs/qt-webkit-4.6.0:4 test? ( >=x11-libs/qt-test-4.6.0:4 ) zlib? ( virtual/pkgconfig sys-libs/zlib ) dev-vcs/git
 DESCRIPTION=A Qt IMAP e-mail client
 EAPI=4
 HOMEPAGE=http://trojita.flaska.net/
-IUSE=debug test
+IUSE=debug test +zlib
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=x11-libs/qt-gui-4.6.0:4 >=x11-libs/qt-sql-4.6.0:4[sqlite] >=x11-libs/qt-webkit-4.6.0:4
 SLOT=0
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	15733ab6a6feb34af9837b41623c2bad	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-r2	19af9102ca9b827213997cc636e7e33c	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c3553cc80fddea1dcfd02314e43649a0
+_md5_=b856cbbdd8ca444d30343e8a50afc73a
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3-r2 b/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3-r2
index 6b250882878e..ece2345eba75 100644
--- a/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3-r2
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3-r2
@@ -3,11 +3,11 @@ DEPEND=dev-libs/gmp openmp? ( sys-devel/gcc[openmp] )
 DESCRIPTION=Elliptic Curve Method for Integer Factorization
 EAPI=4
 HOMEPAGE=http://ecm.gforge.inria.fr/
-IUSE=custom-tune openmp
+IUSE=+custom-tune openmp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp openmp? ( sys-devel/gcc[openmp] )
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/30965/gmp-ecm-6.4.3.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=46e73c7ce6e06fa811a1039dfef1bf08
+_md5_=0b1dae1adf9ecd8176cf9b6a1fa10224
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3-r3 b/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3-r3
new file mode 100644
index 000000000000..2131ddb4bb8f
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-6.4.3-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install
+DEPEND=dev-libs/gmp gwnum? ( sci-mathematics/gwnum ) openmp? ( sys-devel/gcc[openmp] )
+DESCRIPTION=Elliptic Curve Method for Integer Factorization
+EAPI=4
+HOMEPAGE=http://ecm.gforge.inria.fr/
+IUSE=+custom-tune +gwnum -openmp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp gwnum? ( sci-mathematics/gwnum ) openmp? ( sys-devel/gcc[openmp] )
+REQUIRED_USE=gwnum? ( !openmp )
+SLOT=0
+SRC_URI=https://gforge.inria.fr/frs/download.php/30965/gmp-ecm-6.4.3.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=af30bc0c5043e94f02e3597fe48e39c2
diff --git a/metadata/md5-cache/sci-mathematics/gwnum-277 b/metadata/md5-cache/sci-mathematics/gwnum-277
new file mode 100644
index 000000000000..612f952005a7
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/gwnum-277
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=George Woltman's GWNUM library
+EAPI=4
+HOMEPAGE=http://www.mersenne.org/freesoft/
+KEYWORDS=~amd64 ~x86
+LICENSE=as-is
+SLOT=0
+SRC_URI=http://gentooexperimental.org/~patrick/gwnum-277.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=6580edc02d03557e314c9f2f898981c7
diff --git a/metadata/md5-cache/sci-mathematics/msieve-1.50-r3 b/metadata/md5-cache/sci-mathematics/msieve-1.50-r3
index 06306aa42f63..c75ac1121f40 100644
--- a/metadata/md5-cache/sci-mathematics/msieve-1.50-r3
+++ b/metadata/md5-cache/sci-mathematics/msieve-1.50-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=sci-mathematics/ggnfs ecm? ( sci-mathematics/gmp-ecm ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib )
+DEPEND=ecm? ( sci-mathematics/gmp-ecm ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib )
 DESCRIPTION=A C library implementing a suite of algorithms to factor large integers
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/msieve/
 IUSE=zlib +ecm mpi
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
-RDEPEND=sci-mathematics/ggnfs ecm? ( sci-mathematics/gmp-ecm ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib )
+RDEPEND=ecm? ( sci-mathematics/gmp-ecm ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=mirror://sourceforge/msieve/msieve/Msieve%20v1.50/msieve150src.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7b3cf23a7e484bd57e7dd808e6a5cf4f
+_md5_=226701975d47fb5e154927b91627b1d9
diff --git a/metadata/md5-cache/sci-mathematics/yafu-1.33-r1 b/metadata/md5-cache/sci-mathematics/yafu-1.33-r1
index 39193e6cf84e..0907f1270c0a 100644
--- a/metadata/md5-cache/sci-mathematics/yafu-1.33-r1
+++ b/metadata/md5-cache/sci-mathematics/yafu-1.33-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/gmp sci-mathematics/gmp-ecm sieve? ( sci-mathematics/msieve )
+DEPEND=dev-libs/gmp sci-mathematics/gmp-ecm sieve? ( sci-mathematics/msieve sci-mathematics/ggnfs )
 DESCRIPTION=Yet another factoring utility
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/yafu/
-IUSE=sieve
+IUSE=+sieve
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
-RDEPEND=dev-libs/gmp sci-mathematics/gmp-ecm sieve? ( sci-mathematics/msieve )
+RDEPEND=dev-libs/gmp sci-mathematics/gmp-ecm sieve? ( sci-mathematics/msieve sci-mathematics/ggnfs )
 SLOT=0
 SRC_URI=mirror://sourceforge/yafu/1.33/yafu-1.33-src.zip
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c19002bf44bda8722f002f4df99f4fbb
+_md5_=f2cb7f82fe91a0be707634eb0d68813b
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 58c79a544bd3..4f13b5ac8b79 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Nov 2012 04:36:54 +0000
+Wed, 28 Nov 2012 09:06:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 696dbd535ba1..360094058657 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Nov 28 04:36:51 UTC 2012
+Wed Nov 28 09:06:51 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d3c15bb2e2cd..5cf8f868b163 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 28 Nov 2012 05:00:01 +0000
+Wed, 28 Nov 2012 09:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index bd1704c0477f..83b7f444e122 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1354077301 Wed Nov 28 04:35:01 2012 UTC
+1354093501 Wed Nov 28 09:05:01 2012 UTC
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index e15f0be0c8b7..a1c7877ef525 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5100,6 +5100,7 @@ sci-mathematics/fricas:sbcl - Add support for Steel Bank Common Lisp (dev-lisp/s
 sci-mathematics/geomview:avg - Enable experimental motion averaging technique
 sci-mathematics/geomview:netpbm - Add media-libs/netpbm support for external modules
 sci-mathematics/gmp-ecm:custom-tune - Improve performance of some operations by selecting machine-specific defaults
+sci-mathematics/gmp-ecm:gwnum - Use GWNum lib where possible
 sci-mathematics/gretl:R - Enable support for dev-lang/R
 sci-mathematics/gsl-shell:fox - Build a x11-libs/fox GUI
 sci-mathematics/isabelle:CCL - CCL (Classical Computational Logic)
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r2.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r2.ebuild
index 8157ed2d681a..9b0b3bddd00c 100644
--- a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r2.ebuild
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r2.ebuild,v 1.1 2012/11/25 07:36:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r2.ebuild,v 1.2 2012/11/28 08:11:17 patrick Exp $
 
 EAPI=4
 DESCRIPTION="Elliptic Curve Method for Integer Factorization"
@@ -12,7 +12,7 @@ inherit eutils
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="custom-tune openmp"
+IUSE="+custom-tune openmp"
 
 DEPEND="dev-libs/gmp
 	openmp? ( sys-devel/gcc[openmp] )"
diff --git a/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r3.ebuild b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r3.ebuild
new file mode 100644
index 000000000000..b576cd4b49f0
--- /dev/null
+++ b/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmp-ecm/gmp-ecm-6.4.3-r3.ebuild,v 1.1 2012/11/28 08:11:17 patrick Exp $
+
+EAPI=4
+DESCRIPTION="Elliptic Curve Method for Integer Factorization"
+HOMEPAGE="http://ecm.gforge.inria.fr/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/30965/${P}.tar.gz"
+
+inherit eutils
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+custom-tune +gwnum -openmp"
+
+DEPEND="dev-libs/gmp
+	gwnum? ( sci-mathematics/gwnum )
+	openmp? ( sys-devel/gcc[openmp] )"
+RDEPEND="${DEPEND}"
+
+# can't be both enabled
+REQUIRED_USE="gwnum? ( !openmp )"
+
+S=${WORKDIR}/ecm-${PV}
+
+src_configure() {
+	if use gwnum; then myconf="--with-gwnum=/usr/lib"; fi
+	# --enable-shellcmd is broken
+	econf $(use_enable openmp) $myconf || die
+}
+
+src_compile() {
+	if use custom-tune; then
+		use amd64 && cd x86_64
+		use x86 && cd pentium4
+		emake || die # build libecm/libmulredc.la
+		cd .. && make bench_mulredc || die
+		sed -i -e 's:#define TUNE_MULREDC_TABLE://#define TUNE_MULREDC_TABLE:g' `readlink ecm-params.h` || die
+		sed -i -e 's:#define TUNE_SQRREDC_TABLE://#define TUNE_SQRREDC_TABLE:g' `readlink ecm-params.h` || die
+		./bench_mulredc | tail -n 4 >> `readlink ecm-params.h` || die
+	fi
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	mkdir -p "${D}/usr/include/${PN}/"
+	cp "${S}"/*.h "${D}/usr/include/${PN}" || die "Failed to copy headers" # needed by other apps like YAFU
+}
diff --git a/sci-mathematics/gmp-ecm/metadata.xml b/sci-mathematics/gmp-ecm/metadata.xml
index 943079ae9149..33cbddc879e8 100644
--- a/sci-mathematics/gmp-ecm/metadata.xml
+++ b/sci-mathematics/gmp-ecm/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name='custom-tune'>Improve performance of some operations by selecting machine-specific defaults</flag>
+		<flag name='gwnum'>Use GWNum lib where possible</flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-mathematics/gwnum/Manifest b/sci-mathematics/gwnum/Manifest
new file mode 100644
index 000000000000..d448d4ae40e7
--- /dev/null
+++ b/sci-mathematics/gwnum/Manifest
@@ -0,0 +1 @@
+DIST gwnum-277.tar.bz2 24143696 SHA256 bbd7baec05d66b3cbe315e742b1b1aaa882dea838bed4901203c29a2e231397f SHA512 d88a15b01fad458640a84ffa3d5fca6fb35ecd99aff711e679cdae2a58b95c9caefdd4218015f620fd7a93bb54aabad1311205d7ec62d212ca8c6e80af696cc3 WHIRLPOOL db520213f8b324e5c4dc21800424755cd8f23cbbe26619f6393e8b5ed65653a89b73098638fd75137a05a6a323fc71b0acc5496d5ad405fe70f7d26671b301df
diff --git a/sci-mathematics/gwnum/gwnum-277.ebuild b/sci-mathematics/gwnum/gwnum-277.ebuild
new file mode 100644
index 000000000000..02b806550059
--- /dev/null
+++ b/sci-mathematics/gwnum/gwnum-277.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gwnum/gwnum-277.ebuild,v 1.2 2012/11/28 08:19:45 patrick Exp $
+
+EAPI=4
+DESCRIPTION="George Woltman's GWNUM library"
+HOMEPAGE="http://www.mersenne.org/freesoft/"
+# Sourcecode split out from prime95, we don't need the full lib
+SRC_URI="http://gentooexperimental.org/~patrick/${P}.tar.bz2"
+
+inherit eutils
+
+LICENSE="as-is" # No explicit license info, but some files have as-is
+SLOT="0"
+# Need to test if it actually compiles on x86
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	# makefile doesn't return zero? || die fails :(
+	use amd64 && emake -f make64
+	use x86 && emake
+}
+
+src_install() {
+	mkdir "${D}/usr/lib" -p
+	cp gwnum.a gwnum.lib "${D}/usr/lib" || die
+	mkdir "${D}/usr/include" -p
+	cp *.h "${D}/usr/include" || die
+}
diff --git a/sci-mathematics/gwnum/metadata.xml b/sci-mathematics/gwnum/metadata.xml
new file mode 100644
index 000000000000..24cbb90cf0c4
--- /dev/null
+++ b/sci-mathematics/gwnum/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-mathematics/msieve/msieve-1.50-r3.ebuild b/sci-mathematics/msieve/msieve-1.50-r3.ebuild
index 86c5264656f7..c3ee991718db 100644
--- a/sci-mathematics/msieve/msieve-1.50-r3.ebuild
+++ b/sci-mathematics/msieve/msieve-1.50-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-1.50-r3.ebuild,v 1.2 2012/11/27 17:42:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/msieve/msieve-1.50-r3.ebuild,v 1.3 2012/11/28 08:15:02 patrick Exp $
 
 EAPI=4
 DESCRIPTION="A C library implementing a suite of algorithms to factor large integers"
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="zlib +ecm mpi"
 
-DEPEND="sci-mathematics/ggnfs
-	ecm? ( sci-mathematics/gmp-ecm )
+DEPEND="ecm? ( sci-mathematics/gmp-ecm )
 	mpi? ( virtual/mpi )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
diff --git a/sci-mathematics/yafu/yafu-1.33-r1.ebuild b/sci-mathematics/yafu/yafu-1.33-r1.ebuild
index 068a41b6f0b2..f3202726cea9 100644
--- a/sci-mathematics/yafu/yafu-1.33-r1.ebuild
+++ b/sci-mathematics/yafu/yafu-1.33-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yafu/yafu-1.33-r1.ebuild,v 1.1 2012/11/25 07:42:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yafu/yafu-1.33-r1.ebuild,v 1.2 2012/11/28 08:12:53 patrick Exp $
 
 EAPI=4
 DESCRIPTION="Yet another factoring utility"
@@ -13,11 +13,12 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # nfs is overloaded, so using less confusing sieve here
-IUSE="sieve"
+IUSE="+sieve"
 
 DEPEND="dev-libs/gmp
 	sci-mathematics/gmp-ecm
-	sieve? ( sci-mathematics/msieve )"
+	sieve? ( sci-mathematics/msieve
+		sci-mathematics/ggnfs )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {