Sync with portage [Mon Jan 14 22:42:10 MSK 2013].

11 years ago · 1cac0b686d
parent f37fc2d9c5
commit 1cac0b686d
131 changed files with 1499 additions and 834 deletions
--- a/app-admin/eselect-lib-bin-symlink/Manifest
+++ b/app-admin/eselect-lib-bin-symlink/Manifest
@ -1 +1,2 @@
+DIST eselect-lib-bin-symlink-0.1.1.tar.bz2 45376 SHA256 397ac213f606d3d0534539a9b34f755389294cb1d584b1b656e105a441286b15 SHA512 16b56153aa61534997f42641656c3feaf27243fece8cdd42e93ed0be5dabedafc316af8111cd7ff0e321666de8deb1a35e86032cd9590060f677ac7e68fd48bd WHIRLPOOL e1490e3dc35a8eb96416469fb0f4b310867d1a245abd96fafc2ed0b96561f3cfbcfaff651df79e387338801177898a4b116f2c15242d1a74cb8a3e0375072b87
 DIST eselect-lib-bin-symlink-0.1.tar.bz2 45331 SHA256 eb612453252e06991c0a3840d8cc1bc287dd5dbf84f21c9ce17018156822a14b SHA512 c4e31c81ee778a18335e3a5f45eba28688ca6af8b7f5069897a19f1d51e0a83fc35b80149c29643c01ff959aedd05b80a020bd0fbdb9fc7ecf207405f8c77ed6 WHIRLPOOL 97cf79e2287d347000d72cdfad6592dbb39f36fe4170ccd88719d7661f0578351a7879c73c412167cf931c0d9b53b3ef52298c6e5d900efa5136020a2ab65cd1
--- a/app-admin/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild
+++ b/app-admin/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild,v 1.1 2013/01/14 13:19:56 mgorny Exp $
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="An eselect library to manage executable symlinks"
+HOMEPAGE="https://bitbucket.org/mgorny/eselect-lib-bin-symlink/"
+SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~amd64-linux ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh ~sparc ~sparc64-solaris ~sparc-solaris ~x64-freebsd ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~x86-linux ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-admin/eselect"
--- a/app-admin/eselect-pinentry/eselect-pinentry-0.4.ebuild
+++ b/app-admin/eselect-pinentry/eselect-pinentry-0.4.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-pinentry/eselect-pinentry-0.4.ebuild,v 1.4 2013/01/14 13:21:45 ssuominen Exp $
+
+EAPI=5
+
+DESCRIPTION="Manage /usr/bin/pinentry symlink"
+HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-lib-bin-symlink-0.1.1"
+
+S=${FILESDIR}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins pinentry.eselect-${PV} pinentry.eselect
+}
--- a/app-admin/eselect-pinentry/files/pinentry.eselect-0.4
+++ b/app-admin/eselect-pinentry/files/pinentry.eselect-0.4
@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: pinentry.eselect-0.4,v 1.3 2013/01/14 13:21:45 ssuominen Exp $
+
+DESCRIPTION="Manage /usr/bin/pinentry implementation"
+MAINTAINER="ssuominen@gentoo.org"
+VERSION="0.4"
+
+SYMLINK_PATH=/usr/bin/pinentry
+SYMLINK_TARGETS=( pinentry-qt pinentry-gtk-2 pinentry-qt4 pinentry-curses )
+SYMLINK_DESCRIPTION='pinentry implementation'
+
+inherit bin-symlink
--- a/app-admin/lsyncd/lsyncd-2.1.4.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.1.4.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/lsyncd-2.1.4.ebuild,v 1.2 2012/12/02 00:38:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/lsyncd-2.1.4.ebuild,v 1.3 2013/01/14 12:17:07 nimiux Exp $

 EAPI=5

@ -10,7 +10,7 @@ SRC_URI="http://lsyncd.googlecode.com/files/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""

 CDEPEND=">=dev-lang/lua-5.1[deprecated]"
--- a/app-backup/duplicity/duplicity-0.6.20.ebuild
+++ b/app-backup/duplicity/duplicity-0.6.20.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.20.ebuild,v 1.1 2012/10/30 09:33:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.20.ebuild,v 1.2 2013/01/14 12:30:40 nimiux Exp $

 EAPI="4"

@ -16,7 +16,7 @@ SRC_URI="http://code.launchpad.net/${PN}/0.6-series/${PV}/+download/${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="s3"

 DEPEND="
--- a/app-i18n/man-pages-ru/Manifest
+++ b/app-i18n/man-pages-ru/Manifest
@ -1,3 +1,4 @@
 DIST man-pages-ru_3.24-2059-1262-20100523.tar.bz2 198613 SHA256 dbeb43548b0578bc291e68da082d04952c1b2b0a854595e1b2442801c325c096 SHA512 e851ab5f42b59a06f32b9230b5c7efddf5b311da0b9d3f9b4a0ff5e4120ad593f0e8d6ff07faf1af7c0b4191c66eb22666fb10ee8ec7a354c30ba538020c1171 WHIRLPOOL b523ab00f752f430780bf6ef639a2e87b75991a18ef22502aad6ec4a965bddee79fdee70938469c06118dbd3a4f5796db96bb7918c1156814c93cb411f8c6c05
 DIST man-pages-ru_3.27-2066-1435-20101003.tar.bz2 377019 SHA256 b6d5cebf506ea7e100f5c0f1e66c17f13cb61e42d6214cc5a7489a43da3c593b SHA512 9df89207a335488fa15a746171a922bb93480463ffc1dbe9d0997f218d0f8dcab3ee713e6e6ce80d9eb2da99e256f031c0506d6e0da97ef23a03352eff65e551 WHIRLPOOL e28e5af2b5d492cc9091f82ec6b8392fe9dbc6cd4d5ebbe53f474f46536267495777d507ddcb7a56da6e9a5540524359d28bfbf6bc5123f1afd29989d2f4f10f
+DIST man-pages-ru_3.41-2145-1724-20130102.tar.bz2 669902 SHA256 23e76ba0025616b3670716363227440e6fdda17bd8498be5beb565561b25f8ba SHA512 1bc37cbea0ee559985f2ded4dec136e5b178db26d25d571fe9fbf10f611d91be65d08973b5d9a2db1e80aa1da3f0b54ae6a28a8b6d63ac0c559f606e4779e403 WHIRLPOOL ea224a6182c1de420a75e5a851bae9ddf3522ed14a053d9ad835fb156301410bb392c704273a205421ab50bd27f264dcc2da9c95fb4ad1889e6fb708a1cd8845
 DIST manpages-ru-0.98.tar.bz2 233762 SHA256 d52a57775fa031d0ec78dcddbf5faebcc65c9bd4051ba79e624b465d49dacd79 SHA512 fa0a0d266d2ad1d9eed81de501cc52f3654715f453d459b4e73af227cef4ea5f9652e7abb6d1c753223be57068a7ebbcb429033b5896e646e9cd217d403a2a2c WHIRLPOOL b70d1c779f55773e0bc0e1a001b7af28cfc08c1c0e5853b7fa7cc0cc019bff7cc3d73d8a97842f68f195cf5a8394bb334a4b2b28646723be467ac4b800c54b63
--- a/app-i18n/man-pages-ru/man-pages-ru-3.41.2145.1724.20130102.ebuild
+++ b/app-i18n/man-pages-ru/man-pages-ru-3.41.2145.1724.20130102.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/app-i18n/man-pages-ru/man-pages-ru-3.41.2145.1724.20130102.ebuild,v 1.1 2013/01/14 17:53:37 pinkbyte Exp $
+
+EAPI="5"
+
+inherit versionator
+
+MY_PV="$(replace_version_separator 1 . $(replace_all_version_separators -))"
+
+DESCRIPTION="A collection of Russian translations of Linux manual pages"
+HOMEPAGE="http://man-pages-ru.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.bz2"
+
+LICENSE="FDL-1.3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/man"
+
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+src_install() {
+	insinto /usr/share/man/ru
+	doins -r man*
+	dodoc README
+}
--- a/app-i18n/man-pages-ru/metadata.xml
+++ b/app-i18n/man-pages-ru/metadata.xml
@ -5,4 +5,8 @@
 		<email>pva@gentoo.org</email>
 		<name>Peter Volkov</name>
 	</maintainer>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-misc/colordiff/colordiff-1.0.13.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.13.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.13.ebuild,v 1.1 2012/12/01 13:34:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/colordiff/colordiff-1.0.13.ebuild,v 1.3 2013/01/14 17:15:09 pinkbyte Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="http://www.colordiff.org/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="sys-apps/diffutils"
--- a/app-misc/when/when-1.1.30.ebuild
+++ b/app-misc/when/when-1.1.30.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/when/when-1.1.30.ebuild,v 1.1 2012/10/25 09:22:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/when/when-1.1.30.ebuild,v 1.3 2013/01/14 16:20:13 pinkbyte Exp $

 EAPI=4

@ -10,7 +10,7 @@ SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"

 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""

 DEPEND="dev-lang/perl"
@ -20,15 +20,15 @@ S="${WORKDIR}"/when_dist

 src_prepare() {
 	# Fix path for tests
-	sed -i 's,^	when,	./when,' Makefile
+	sed -i 's,^	when,	./when,' Makefile || die 'sed failed'
 }

 src_compile() { :; }

 src_test() {
 	# The when command requires these files, or attempts to run setup function.
-	mkdir "${HOME}"/.when
-	touch "${HOME}"/.when/{calendar,preferences}
+	mkdir "${HOME}"/.when || die 'mkdir failed'
+	touch "${HOME}"/.when/{calendar,preferences} || die 'touch failed'
 	emake test
 }

--- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.0.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-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.12 2013/01/13 10:52:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.14 2013/01/14 13:24:37 scarabeus Exp $

 EAPI=5

@ -125,7 +125,6 @@ COMMON_DEPEND="
 	>=media-libs/libcdr-0.0.5
 	media-libs/libvisio
 	>=net-misc/curl-7.21.4
-	net-misc/npapi-sdk
 	net-nds/openldap
 	sci-mathematics/lpsolve
 	virtual/jpeg
@ -290,7 +289,8 @@ src_unpack() {
 			mypv=${PV/.9999}
 			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
 			EGIT_PROJECT="${PN}/${mod}"
-			EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+			EGIT_SOURCEDIR="${WORKDIR}/${P}"
+			[[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
 			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
 			EGIT_NOUNPACK="true"
 			git-2_src_unpack
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.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/libreoffice/libreoffice-9999-r2.ebuild,v 1.150 2013/01/13 10:52:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.152 2013/01/14 13:24:37 scarabeus Exp $

 EAPI=5

@ -124,7 +124,6 @@ COMMON_DEPEND="
 	>=media-libs/libcdr-0.0.5
 	media-libs/libvisio
 	>=net-misc/curl-7.21.4
-	net-misc/npapi-sdk
 	net-nds/openldap
 	sci-mathematics/lpsolve
 	virtual/jpeg
@ -289,7 +288,8 @@ src_unpack() {
 			mypv=${PV/.9999}
 			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
 			EGIT_PROJECT="${PN}/${mod}"
-			EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
+			EGIT_SOURCEDIR="${WORKDIR}/${P}"
+			[[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
 			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
 			EGIT_NOUNPACK="true"
 			git-2_src_unpack
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@ -2,3 +2,4 @@ DIST eix-0.23.10.tar.xz 438336 SHA256 6525b65de08dc3c5946f008b57c8027e5725d2bbc0
 DIST eix-0.25.5.tar.xz 487608 SHA256 bc0ff803063e7a20ad6cd24763808f5a2b95600bf2b6525fff402e4e430606c6 SHA512 3a7898c5f320bfd52e606eb732701301c96bd63fb143c4a195343efdf4abb354fd6b20cdfa6d0a72fcb39b60bfe6f7a4fe7135c908b5464952f01f965820a7a0 WHIRLPOOL dd9d5a996506b2575754969117fce09539ecba41e925f17c330aa5ff22dd6e12d1908104000d9ce109151d8caf214c9eec46b85292456d7526ecbc4d98b91db4
 DIST eix-0.27.4.tar.xz 513880 SHA256 3264c877d617fc9f6d63d2f8562e0029369c0d9f6b3f9dff095eb21e639273f8 SHA512 c93792ef08d2e6804252c94f82b7e6e046072137c22679cf547f82c9151a3e19cea8071d09b003f2c755ff37bc665ccb3703d0dc92bf1b4c6c916541ede00335 WHIRLPOOL d51ddbdebb2017e47c2618369179698bb1b997bc4f7f2057c183cf40dac3ec2b1e806328a3900928887697a9de94f0c7d2be6b5f85439c66da9245dd8931c04f
 DIST eix-0.27.6.tar.xz 523388 SHA256 80453053fbb5d92446bf62735189ad36941bf168bd66b079814cd629ed5acc71 SHA512 2b47f9d65f6568584c0e8649d6f9df7d95bb5cd759d632b8c860c64866792a0b34988b295f540e3d38b0397b40a72c36eb62f73b747adf062a71c37b1c9aac79 WHIRLPOOL c199b3cc7e002082131733eea3636664b8d98e4e50e93cdc2fe8c45ae2ea612de552114914c9237d66403f150d7401e2786e053bf8876d2ad688583b72c08c87
+DIST eix-0.28.0.tar.xz 529200 SHA256 58f68f6f232c12193bef85b2ab0e60cd6b5d3d94e015c41e9cb76b64856086df SHA512 e0f94fb7ec2d8dd5210045e8d75f2d6ed19da320d6dcc5a308f65f3122cf088b040a7988344f0e8513946defc53996611f68ee2e1cecc915c455fcf2dcb34c73 WHIRLPOOL f82ba8073a8dc99e452b712293c82b3981c870979a69fefc8fa5084b80c2c78e8773d16c38d65f7e821eec10d86531b70e5fc11b8351343efaf3c625f6374d20
--- a/app-portage/eix/eix-0.28.0.ebuild
+++ b/app-portage/eix/eix-0.28.0.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.28.0.ebuild,v 1.1 2013/01/14 13:54:01 axs Exp $
+
+EAPI=5
+
+PLOCALES="de ru"
+inherit bash-completion-r1 eutils multilib l10n
+
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
+HOMEPAGE="http://eix.berlios.de"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="clang debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion"
+
+RDEPEND="app-shells/push
+	sqlite? ( >=dev-db/sqlite-3 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	clang? ( sys-devel/clang )
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if [[ ${REPLACING_VERSIONS//./} -lt 0253 ]]; then
+	    local eixcache="${EROOT}"/var/cache/${PN}
+	    [[ -f ${eixcache} ]] && rm -f "${eixcache}"
+	fi
+}
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	econf $(use_with sqlite) $(use_with doc extra-doc) \
+		$(use_with zsh-completion) \
+		$(use_enable nls) $(use_enable tools separate-tools) \
+		$(use_enable security) $(use_enable optimization) \
+		$(use_enable strong-optimization) $(use_enable debug debugging) \
+		$(use_with prefix always-accept-keywords) \
+		$(use_with dep dep-default) \
+		$(use_with clang nongnu-cxx clang++) \
+		--with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
+		--with-portage-rootpath="${ROOTPATH}" \
+		--with-eprefix-default="${EPREFIX}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	keepdir "/var/cache/${PN}"
+	fowners portage:portage "/var/cache/${PN}"
+	fperms 775 "/var/cache/${PN}"
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for owner/group portage:
+	# merging changes this owner/group back to root.
+	use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
+	local obs="${EROOT}var/cache/eix.previous"
+	! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
+}
--- a/app-text/pdfsandwich/Manifest
+++ b/app-text/pdfsandwich/Manifest
@ -1,2 +1 @@
-DIST pdfsandwich-0.0.3.tar.bz2 12088 SHA256 358ca5834f029a3c7ea41f755f2998681085885d1f7f72d05e67b793e373175c SHA512 fe8c89877603758bcdd113c4a4cb01ff9468660f26cf4e8235b450276e5cf72a5df2712aec018b6971eb9fecd01c386b3b84f9d6707acb8c363d24698bdd9bdf WHIRLPOOL abab2bed5cffd2047caf0efaab54c2f72e471fcfeb86f1bff6ea79df30a9d162ccb84c6e92770379b746ed12aea436397056fd2d3b74bb85786ebef367e4b4e6
-DIST pdfsandwich-0.0.6.tar.bz2 12661 SHA256 cd578d00c079037630db07ff4b433019546dd6624bda034dfed9c34e13b5aefd SHA512 7a6387dd09d5bcb215cfe13b444aa8498db0f097a498291fae342e54ba7d5858a1d85feea8b628d109a208ec331c2d0c2f7ef2db2572d96652b6ef419b9a89e2 WHIRLPOOL b1da9a1e46fa4a23b4267264b93b64e404453790713c59478801865b9ae90dc9968f74d8f3b02a907e4ecdab52d55112073a559833e7ab0d55f1638f9892b5f0
+DIST pdfsandwich-0.0.7.tar.bz2 12730 SHA256 48587855b6a49082c480a08c82600dd6e9ff791cb5587459d1057e37ebde0767 SHA512 1a7ad1c5accc5db2d8c0a68c0dcd23691323fdde4c267ba49677c1619d7c03de3ff3bf5cd4646072424ae52d69914b38fee0501423a57e9d12363318beb68c9d WHIRLPOOL 2876fde0beddc4987fa94270799873295422befadaae307f9be30938a1e8ec29c955333fbed09a8f41e224cfaec70110007e07917bed6e12146b0de83faa407f
--- a/app-text/pdfsandwich/pdfsandwich-0.0.3.ebuild
+++ b/app-text/pdfsandwich/pdfsandwich-0.0.3.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdfsandwich/pdfsandwich-0.0.3.ebuild,v 1.2 2011/09/13 14:37:43 tomka Exp $
-
-EAPI="2"
-
-DESCRIPTION="generator of sandwich OCR pdf files"
-HOMEPAGE="http://pdfsandwich.origo.ethz.ch/wiki/pdfsandwich"
-SRC_URI="http://download.origo.ethz.ch/pdfsandwich/2161/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-# >=cuneiform-0.9 will break placement of background text with
-# exact-image  This is discussed on upstream's mailing list.
-
-RDEPEND="app-text/cuneiform[imagemagick]
-	media-gfx/exact-image
-	app-text/ghostscript-gpl"
-DEPEND="sys-apps/gawk
-	>=dev-lang/ocaml-3.10[ocamlopt]"
-
-src_prepare() {
-	sed -i "/^OCAMLOPTFLAGS/s/$/ -ccopt \"\$(CFLAGS) \$(LDFLAGS)\"/" Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}
--- a/app-text/pdfsandwich/pdfsandwich-0.0.7.ebuild
+++ b/app-text/pdfsandwich/pdfsandwich-0.0.7.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdfsandwich/pdfsandwich-0.0.6.ebuild,v 1.1 2012/10/10 18:39:04 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdfsandwich/pdfsandwich-0.0.7.ebuild,v 1.1 2013/01/14 12:48:32 tomka Exp $

 EAPI=4

--- a/dev-db/pgbouncer/files/pgbouncer.initd
+++ b/dev-db/pgbouncer/files/pgbouncer.initd
@ -1,6 +1,6 @@
 #!/sbin/runscript

-extra_started_commands="reload"
+extra_started_commands="reload upgrade"

 if [ -d /run ] ; then
 	RUNDIR=/run/pgbouncer
@ -14,8 +14,7 @@ depend() {
 }

 start() {
-	mkdir -p ${RUNDIR}
-	chown pgbouncer:pgbouncer ${RUNDIR}
+	checkpath -d -m 755 -o pgbouncer:pgbouncer ${RUNDIR}

 	ebegin "Starting pgbouncer"
 	start-stop-daemon --start --pidfile ${RUNDIR}/pgbouncer.pid \
@ -31,7 +30,14 @@ stop() {

 reload() {
 	ebegin "Gracefully reloading pgbouncer"
-	start-stop-daemon --stop --oknodo --signal HUP \
-		--pidfile ${RUNDIR}/pgbouncer.pid
+	kill -HUP $(head -n1 ${RUNDIR}/pgbouncer.pid)
 	eend $?
 }
+
+upgrade() {
+	egrep -q "^unix_socket_dir" /etc/pgbouncer.conf || \
+		eerror "Not running with unix sockets, cannot upgrade"
+    ebegin "Gracefully upgrading pgbouncer"
+		/usr/bin/pgbouncer -R -q -d -u pgbouncer /etc/pgbouncer.conf
+    eend $?
+}
--- a/dev-db/pgbouncer/pgbouncer-1.5.3-r1.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.5.3-r1.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgbouncer/pgbouncer-1.5.3-r1.ebuild,v 1.1 2013/01/14 17:29:29 pinkbyte Exp $
+
+EAPI="4"
+
+inherit eutils user
+
+RESTRICT="test"
+
+DESCRIPTION="Lightweight connection pooler for PostgreSQL"
+HOMEPAGE="http://pgfoundry.org/projects/pgbouncer/"
+SRC_URI="http://pgfoundry.org/frs/download.php/3369/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="dev-libs/libevent"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup pgbouncer
+	enewuser pgbouncer -1 -1 -1 pgbouncer
+}
+
+src_prepare() {
+	local rundir=""
+	[[ ! -d /run ]] && rundir="/var"
+
+	sed -i -e "s,${PN}.log,/var/log/${PN}/${PN}.log," \
+		-e "s,${PN}.pid,/var/run/${PN}/${PN}.pid," \
+		-e "s,etc/userlist.txt,/etc/userlist.txt," \
+		-e "s,;unix_socket_dir = /tmp,unix_socket_dir = ${rundir}/run/${PN}.sock," \
+		"${S}"/etc/pgbouncer.ini || die
+}
+
+src_configure() {
+	# --enable-debug is only used to disable stripping
+	econf \
+		--enable-debug \
+		$(use_enable debug cassert) \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins etc/pgbouncer.ini pgbouncer.conf
+	newinitd "${FILESDIR}"/pgbouncer.initd "${PN}"
+
+	dodoc README NEWS AUTHORS
+	dodoc doc/*.txt
+
+	dodir /var/log/pgbouncer/
+	fowners pgbouncer:pgbouncer /var/log/pgbouncer/
+}
+
+pkg_postinst() {
+	einfo "Please read the config.txt for Configuration Directives"
+	einfo
+	einfo "For Administration Commands, see:"
+	einfo "    man pgbouncer"
+	einfo
+	einfo "By default, PgBouncer does not have access to any database."
+	einfo "GRANT the permissions needed for your application and make sure that it"
+	einfo "exists in PgBouncer's auth_file."
+}
--- a/dev-lang/ekopath/Manifest
+++ b/dev-lang/ekopath/Manifest
@ -1,4 +1,2 @@
-DIST ekopath-4.0.12.1_pre20120308.run 50834782 SHA256 22bc2bcd01b378a8ef509e9cc3011a5410bbda4e78ee351d109c6571588ce85f SHA512 b69d62c2717acb80a9e4345cddf36e5d0400aa4c987b9910b54307cc8f1ab4cae4c062fa5a4ea691e3a16255aacc27e7c74647a5113e047111789c4a6f12aedd WHIRLPOOL b45224ad699f33dd18bf52dd5eb39361b9735a21e9947993dba981ae22a257e954078f50dd9a64f5dd300d8ef57c0a5c1ad6c7549d829bebbd252952d230fb65
-DIST ekopath-4.0.12.1_pre20120430.run 50818242 SHA256 3aec658635bb6bae921d07822be44c948b7d1affade9bd75f07969d359babb7e SHA512 a2dd92d5a1577331c243b4fb9a3c0cf8f38753ed819d3fffcd112a4951549d88812cfa6100c37cf4bd7033e38da49facfa87ed58e918bb5cefa3929b799b52a1 WHIRLPOOL a5f02ec1d08a701954280f683b18243eecde13446f7f0595a1077e16d4ae3199003d17237c870731ffcb5d67ebdf7ffefb2c26f175dfe2127477978efe0834c1
-DIST ekopath-4.0.12.1_pre20120530.run 50816268 SHA256 c32d59b0cd8f808b15aba492848d1ef4e05f9890d9abbe52a2ed7b893e83e381 SHA512 bacb77ca6a65ea6da9ee461c3035722cbf6a7507b465424cc9dee5ea57897743b22a25cace69f4a472b25240e0acce9609baf4bc16f3e13dd26e70456b5167d4 WHIRLPOOL 1bac4761be1a53789d10c11f77f38dca20f7a2ffc6a860f493ba66c0235b5a5791ea8de4bd9789aa4465652512b8906c892bf6f64aa27705e8976a92bba38842
 DIST ekopath-4.0.12.1_pre20121102.run 48196538 SHA256 55b8f3af3447ae458565ae3bba6b391f73a9bf306d50b7c5ff2a4bd0bb3564dc SHA512 ab7bbb066c27d61e239b2b29972e0d0089ed06fd662f9be7fd04ca81cf3c29eb793a245ae54ba5c10322e1274d0fe5330d6363f8a864314229d4754582f3f8da WHIRLPOOL f082bcf4f8f2743496b8961cb60f4978e5e88010a6c2f3232b675109afc95e7cc7e35532bb7461d01db89f254ce5e5074d8de58a2035d5dbcb517aee4ebc245c
+DIST ekopath-5.0.0_pre20130113.run 64799029 SHA256 8b58074da6010bd99d51fbce86de20303c75da2a3ef02c78f025e335bec9105f SHA512 0d270a53d1603478d66ad602df8f5152c1b77a64c1f153b1c6bdc1568c3f45db1390fa466424379dde97e98fbcebf216cbaebb335d8f8edc11ba81779e26ba67 WHIRLPOOL 13fb755043ed0e8d7b064cfe167a1be7aba0502987f9d154b2016475d45ea0204aae098d8e0736078dbbd1d964b8f75c3841ffa138def3cbc8fd073d4409c1bf
--- a/dev-lang/ekopath/ekopath-4.0.12.1_pre20120308.ebuild
+++ b/dev-lang/ekopath/ekopath-4.0.12.1_pre20120308.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-4.0.12.1_pre20120308.ebuild,v 1.1 2012/03/08 12:28:14 xarthisius Exp $
-
-EAPI=4
-
-inherit versionator
-
-MY_PV=$(get_version_component_range 1-4)
-DATE=$(get_version_component_range 5)
-DATE=${DATE/pre}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${PN}-${DATE}-installer.run
-	-> ${P}.run"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="mirror"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	opt/${PN}/lib/${MY_PV}/x8664/*
-	opt/${PN}/bin/path*
-	opt/${PN}/bin/funclookup
-	opt/${PN}/bin/doctool
-	opt/${PN}/bin/subclient
-	opt/${PN}/bin/subserver
-	opt/${PN}/bin/assign"
-
-pkg_pretend() {
-	if has_version app-arch/rpm ; then
-		ewarn "You have app-arch/rpm installed on your system. Therefore"
-		ewarn "${PN} will fail to install due to sandbox violation."
-		ewarn "As this cannot be fixed on distribution level, please use"
-		ewarn "following workaround:"
-		ewarn "  emerge -C rpm && emerge -1 ${PN} && emerge -1 rpm"
-		die
-	fi
-}
-
-src_unpack() {
-	cp "${DISTDIR}"/${A} "${S}" || die
-	chmod +x "${S}"/${P}.run
-}
-
-src_prepare() {
-	cat > "99${PN}" <<-EOF
-		PATH=/opt/${PN}/bin
-		ROOTPATH=/opt/${PN}/bin
-		LDPATH=/opt/${PN}/lib:/opt/${PN}/lib/${MY_PV}/x8664/64
-	EOF
-}
-
-src_install() {
-	# You must paxmark -m EI_PAX (not PT_PAX) to run the installer
-	# on a pax enabled kernel.  Adding PT_PAX breaks the binary.
-	/usr/bin/scanelf -Xxz m ${P}.run >> /dev/null
-
-	./${P}.run \
-		--prefix "${D}/opt/${PN}" \
-		--disable-components subscriptionmanager \
-		--mode unattended || die
-
-	# This is a temporary/partial fix to remove a RWX GNU STACK header
-	# from libstl.so.  It still leaves libstl.a in bad shape.
-	# The correct fix is in the assembly atomic-cxx.S, which we don't get
-	#   See http://www.gentoo.org/proj/en/hardened/gnu-stack.xml
-	#   Section 6.  How to fix the stack (in practice)
-	/usr/bin/scanelf -Xe "${D}/opt/ekopath/lib/4.0.11/x8664/64/libstl.so"
-
-	rm -rf "${D}"/opt/${PN}/uninstall || die
-	rm -rf "${D}"/opt/${PN}/bin/{pathdb,funclookup} || die #libtinfo
-	rm -rf "${D}"/opt/${PN}/lib/${MY_PV}/x8664/coco || die #DT_PATH
-	doenvd "99${PN}"
-}
--- a/dev-lang/ekopath/ekopath-4.0.12.1_pre20120430.ebuild
+++ b/dev-lang/ekopath/ekopath-4.0.12.1_pre20120430.ebuild
@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-4.0.12.1_pre20120430.ebuild,v 1.1 2012/04/30 19:55:05 xarthisius Exp $
-
-EAPI=4
-
-inherit versionator
-
-MY_PV=$(get_version_component_range 1-4)
-DATE=$(get_version_component_range 5)
-DATE=${DATE/pre}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${PN}-${DATE}-installer.run
-	-> ${P}.run"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="mirror"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	opt/${PN}/lib/${MY_PV}/x8664/*
-	opt/${PN}/bin/path*
-	opt/${PN}/bin/funclookup
-	opt/${PN}/bin/doctool
-	opt/${PN}/bin/subclient
-	opt/${PN}/bin/subserver
-	opt/${PN}/bin/assign"
-
-pkg_pretend() {
-	if has_version app-arch/rpm ; then
-		ewarn "You have app-arch/rpm installed on your system. Therefore"
-		ewarn "${PN} will fail to install due to sandbox violation."
-		ewarn "As this cannot be fixed on distribution level, please use"
-		ewarn "following workaround:"
-		ewarn "  emerge -C rpm && emerge -1 ${PN} && emerge -1 rpm"
-		die
-	fi
-	echo opt/${PN}/lib/${MY_PV}/x8664/64/libeh.so
-}
-
-src_unpack() {
-	cp "${DISTDIR}"/${A} "${S}" || die
-	chmod +x "${S}"/${P}.run
-}
-
-src_prepare() {
-	cat > "99${PN}" <<-EOF
-		PATH=/opt/${PN}/bin
-		ROOTPATH=/opt/${PN}/bin
-		LDPATH=/opt/${PN}/lib:/opt/${PN}/lib/${MY_PV}/x8664/64
-	EOF
-}
-
-src_install() {
-	# You must paxmark -m EI_PAX (not PT_PAX) to run the installer
-	# on a pax enabled kernel.  Adding PT_PAX breaks the binary.
-	/usr/bin/scanelf -Xxz m ${P}.run >> /dev/null
-
-	./${P}.run \
-		--prefix "${D}/opt/${PN}" \
-		--disable-components subscriptionmanager \
-		--mode unattended || die
-
-	# This is a temporary/partial fix to remove a RWX GNU STACK header
-	# from libstl.so.  It still leaves libstl.a in bad shape.
-	# The correct fix is in the assembly atomic-cxx.S, which we don't get
-	#   See http://www.gentoo.org/proj/en/hardened/gnu-stack.xml
-	#   Section 6.  How to fix the stack (in practice)
-	/usr/bin/scanelf -Xe "${D}/opt/ekopath/lib/4.0.11/x8664/64/libstl.so"
-
-	rm -rf "${D}"/opt/${PN}/uninstall || die
-	rm -rf "${D}"/opt/${PN}/bin/{pathdb,funclookup} || die #libtinfo
-	rm -rf "${D}"/opt/${PN}/lib/${MY_PV}/x8664/coco || die #DT_PATH
-	doenvd "99${PN}"
-}
--- a/dev-lang/ekopath/ekopath-4.0.12.1_pre20120530.ebuild
+++ b/dev-lang/ekopath/ekopath-4.0.12.1_pre20120530.ebuild
@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-4.0.12.1_pre20120530.ebuild,v 1.2 2012/06/25 14:16:20 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ekopath/ekopath-5.0.0_pre20130113.ebuild,v 1.1 2013/01/14 17:41:37 xarthisius Exp $

 EAPI=4

 inherit versionator

-MY_PV=$(get_version_component_range 1-4)
-DATE=$(get_version_component_range 5)
+MY_PV=$(get_version_component_range 1-3)
+DATE=$(get_version_component_range 4)
 DATE=${DATE/pre}
 DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}

@ -19,7 +19,7 @@ SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${PN}-${DATE}-in
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="doc"

 DEPEND="!!app-arch/rpm"
 RDEPEND=""
@ -51,14 +51,16 @@ src_prepare() {
 }

 src_install() {
+	local opts
+	use doc || opts="${opts} --disable-components documentation"
 	# You must paxmark -m EI_PAX (not PT_PAX) to run the installer
 	# on a pax enabled kernel.  Adding PT_PAX breaks the binary.
 	/usr/bin/scanelf -Xxz m ${P}.run >> /dev/null

 	./${P}.run \
 		--prefix "${D}/opt/${PN}" \
-		--disable-components subscriptionmanager \
-		--mode unattended || die
+		--mode unattended \
+		${opts} || die

 	# This is a temporary/partial fix to remove a RWX GNU STACK header
 	# from libstl.so.  It still leaves libstl.a in bad shape.
--- a/dev-python/psycopg/psycopg-2.4.6-r1.ebuild
+++ b/dev-python/psycopg/psycopg-2.4.6-r1.ebuild
@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.4.6-r1.ebuild,v 1.1 2013/01/14 13:31:41 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="http://initd.org/psycopg/ http://pypi.python.org/pypi/psycopg2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+RDEPEND=">=dev-db/postgresql-base-8.1"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+
+	[[ ${EPYTHON} != python3* ]] && append-flags -fno-strict-aliasing
+
+	distutils-r1_python_compile
+}
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-2.4.2-setup.py.patch"
+		"${FILESDIR}/${PN}-2.0.9-round-solaris.patch"
+	)
+
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+#	if use mxdatetime; then
+#		sed -i 's/\(use_pydatetime=\)1/\10/' setup.cfg || die
+#	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc -j1 html text
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc doc/{HACKING,SUCCESS}
+
+	if use doc; then
+		dodoc doc/psycopg2.txt
+		dohtml doc/html/.
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/.
+	fi
+}
--- a/dev-python/pycairo/pycairo-1.10.0-r4.ebuild
+++ b/dev-python/pycairo/pycairo-1.10.0-r4.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-python/pycairo/pycairo-1.10.0-r4.ebuild,v 1.3 2013/01/13 13:23:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild,v 1.4 2013/01/14 17:29:27 bicatali Exp $

 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} python3_{1,2,3} )
@ -19,7 +19,7 @@ SRC_URI="http://cairographics.org/releases/py2cairo-${PYCAIRO_PYTHON2_VERSION}.t
 # || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10.
 LICENSE="LGPL-3 || ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~ppc-macos ~x64-macos ~x86-linux ~x86-macos"
 IUSE="doc examples +svg test xcb"

 RDEPEND="
--- a/dev-python/pysqlite/pysqlite-2.6.3-r1.ebuild
+++ b/dev-python/pysqlite/pysqlite-2.6.3-r1.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/pysqlite-2.6.3-r1.ebuild,v 1.1 2013/01/14 11:59:03 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="DB-API 2.0 interface for SQLite 3.x"
+HOMEPAGE="http://code.google.com/p/pysqlite/ http://pypi.python.org/pypi/pysqlite"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="pysqlite"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="examples"
+
+DEPEND=">=dev-db/sqlite-3.3.8:3[extensions]"
+RDEPEND=${DEPEND}
+
+python_prepare_all() {
+	# Enable support for loadable sqlite extensions.
+	sed -e "/define=SQLITE_OMIT_LOAD_EXTENSION/d" -i setup.cfg || die
+
+	# Fix encoding.
+	sed -e "/coding:/s:ISO-8859-1:utf-8:" \
+		-i lib/{__init__.py,dbapi2.py} || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	local script='
+import sys, pysqlite2.test, unittest
+r = unittest.TextTestRunner().run(pysqlite2.test.suite())
+sys.exit(0 if r.wasSuccessful() else 1)'
+
+	cd "${TMPDIR}" || die
+	"${PYTHON}" -c "${script}" \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -rf "${ED}usr/pysqlite2-doc"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins doc/includes/sqlite3/. || die
+	fi
+}
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@ -1 +1,2 @@
 DIST pytools-11.tar.gz 49995 SHA256 0ed356f87fa93adf12c8ead3017ac42aa88971572a2658947ed3a42dc2f0f47a SHA512 8501cda6eb91f66c9d84aba9745972ab618e74e4778221058937a24bae54d018fe6d83e8b6c3ff8be46471fcdbb0988dcc00ccbe1f43071a91da640f8928f5bd WHIRLPOOL c00f3f70d5ec01a17d0db581327a207aa7bd18a206c8e45172e2e829162112529fab01ff15dd958d60f8ebc0eb8351a20814764f0c9f83dc73399d645dc919b1
+DIST pytools-2012.1.tar.gz 44076 SHA256 4738e5c8b3b5e3f03a392f12abb157053e3134fd777752eea334c496bf485136 SHA512 f62d8e7313dcd33c9f7d5551c60da7bc2b573e0e593428d83cc307b24265604cea3b11cb050464776659cb7543081d3737e2072f8dfad96a0b3154571841dae2 WHIRLPOOL 77a4d83dfb92d5286324744a13e0922365e3ce3c30e29cdbf1b3106f295ddd91bb032c95cde9446d19b81683bfd4d1841efc182c111ed7f2c9e03bcfed8a9738
--- a/dev-python/pytools/metadata.xml
+++ b/dev-python/pytools/metadata.xml
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>spock@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pytools</remote-id>
-	</upstream>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pytools</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-python/pytools/pytools-2012.1.ebuild
+++ b/dev-python/pytools/pytools-2012.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-python/pytools/pytools-2012.1.ebuild,v 1.1 2013/01/14 13:51:37 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+DISTUTILS_SRC_TEST="py.test"
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of tools missing from the Python standard library"
+HOMEPAGE="http://mathema.tician.de/software/pytools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools
+	test? ( dev-python/pytest )"
+RDEPEND=""
+
+python_test() {
+	py.test || die "Tests fail with ${EPYTHON}"
+	}
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@ -1,2 +1,3 @@
 DIST spyder-2.1.11.zip 2180419 SHA256 b6d98442a8b529e31cd66c47c6634571aeaae40067757e95b2d6ee748fbc5877 SHA512 fe47a6ee505c0de9fe3a4f2cf13b5bc814aa074214bb06bf2452ba8a23c46a27422a2d484a099b063d419a8539fc81ca08288f281183addf68a6cbe10b5bb299 WHIRLPOOL 9545108e94d605947a6abe3e6b25ba1f89bc75e5469434f6b65d425f9a0919a30fc977126d5aa17ee2a94cc0d22d53d9f0d7df437eef4e244a3248eb569c169a
+DIST spyder-2.1.13.zip 2182796 SHA256 5222946d8ef96d9c770d63b3831b5af1555cf886933ab5d339321aa83ecc5a30 SHA512 4a3096079ec45d17559e1ddcb32186bb1c7717c5c1fec0c3c32265fcf9202789fdf52bedc8bc390b6e736dd1b0786eb74ceb0d88faae8be686f3b6305879e4f6 WHIRLPOOL 6598fd997589b3f1ff5c081e38d3c667bdeabb84b1ff4b636111d865aab10722162ad6526c6453ce38e3fb1a18045736e6ea14196f0debaf7b21932c9faf146f
 DIST spyder-2.1.9.zip 1949933 SHA256 a68228d870ca62b52399591ce14dfeb537289dcbabd1ba848e96d5d694bd933d SHA512 f6d9a9b7052610da209af94629db2a231f1780b22d0d46b5a32fe6997ae66320349bdb3b7b52e82ebf9133204eb0bb685752ab096ad516b2c01211594252c2dc WHIRLPOOL 7ac0b51a8288423d8b9c52d6b02104f5152ba994c04f4ae9d766b07582a14499aadf72be404c76be5be96f6b8c2bd522f9a2a29becbdc73ea79bc59e3c1f3947
--- a/dev-python/spyder/files/spyder-2.1.13-disable_sphinx_dependency.patch
+++ b/dev-python/spyder/files/spyder-2.1.13-disable_sphinx_dependency.patch
@ -0,0 +1,48 @@
+diff -r -U1 spyder-2.1.13.orig/setup.py spyder-2.1.13/setup.py
+--- spyder-2.1.13.orig/setup.py	2013-01-04 20:05:24.000000000 +0700
+++ spyder-2.1.13/setup.py	2013-01-15 02:10:31.085350157 +0700
+@@ -15,3 +15,2 @@
+ from distutils.command.build import build
+-from sphinx import setup_command
+ import os
+@@ -42,30 +41,2 @@
+ 
+-# Sphinx build (documentation)
+-class MyBuild(build):
+-    def has_doc(self):
+-        setup_dir = os.path.dirname(os.path.abspath(__file__))
+-        return os.path.isdir(os.path.join(setup_dir, 'doc'))
+-    sub_commands = build.sub_commands + [('build_doc', has_doc)]
+-
+-
+-class MyBuildDoc(setup_command.BuildDoc):
+-    def run(self):
+-        build = self.get_finalized_command('build')
+-        sys.path.insert(0, os.path.abspath(build.build_lib))
+-        dirname = self.distribution.get_command_obj('build').build_purelib
+-        self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
+-        try:
+-            setup_command.BuildDoc.run(self)
+-        except UnicodeDecodeError:
+-            print >>sys.stderr, "ERROR: unable to build documentation "\
+-                                "because Sphinx do not handle source path "\
+-                                "with non-ASCII characters. Please try to "\
+-                                "move the source package to another location "\
+-                                "(path with *only* ASCII characters)."        
+-        sys.path.pop(0)
+-
+-
+-cmdclass = {'build': MyBuild, 'build_doc': MyBuildDoc}
+-
+-
+ NAME = 'spyder'
+@@ -118,3 +89,3 @@
+                                      ('.mo', '.svg', '.png'))},
+-      requires=["rope (>=0.9.2)", "sphinx (>=0.6.0)", "PyQt4 (>=4.4)"],
+      requires=["rope (>=0.9.2)", "PyQt4 (>=4.4)"],
+       scripts=[osp.join('scripts', fname) for fname in SCRIPTS],
+@@ -137,3 +108,2 @@
+                    'Topic :: Scientific/Engineering',
+-                   'Topic :: Software Development :: Widget Sets'],
+-      cmdclass=cmdclass)
+                   'Topic :: Software Development :: Widget Sets'])
--- a/dev-python/spyder/spyder-2.1.13.ebuild
+++ b/dev-python/spyder/spyder-2.1.13.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/spyder/spyder-2.1.13.ebuild,v 1.1 2013/01/14 15:19:48 grozin Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
+
+inherit distutils eutils
+
+DESCRIPTION="Python IDE with matlab-like features"
+HOMEPAGE="http://code.google.com/p/spyderlib/ http://pypi.python.org/pypi/spyder"
+SRC_URI="http://spyderlib.googlecode.com/files/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc ipython matplotlib numpy pep8 +pyflakes pylint +rope scipy sphinx"
+
+RDEPEND=">=dev-python/PyQt4-4.4[webkit]
+	ipython? ( dev-python/ipython )
+	matplotlib? ( dev-python/matplotlib )
+	numpy? ( dev-python/numpy )
+	pep8? ( dev-python/pep8 )
+	pyflakes? ( >=dev-python/pyflakes-0.3 )
+	pylint? ( dev-python/pylint )
+	rope? ( >=dev-python/rope-0.9.3 )
+	scipy? ( sci-libs/scipy )
+	sphinx? ( dev-python/sphinx )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( dev-python/sphinx )"
+
+PYTHON_MODNAME="spyderlib spyderplugins"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}"/${PN}-2.1.13-disable_sphinx_dependency.patch
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		einfo "Generation of documentation"
+		PYTHONPATH="build-$(PYTHON -f --ABI)" \
+			sphinx-build doc doc_output || die "Generation of documentation failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+	doicon spyderlib/images/spyder.svg
+	make_desktop_entry spyder Spyder spyder "Development;IDE"
+	if use doc; then
+		pushd doc_output > /dev/null
+		insinto /usr/share/doc/${PF}/html
+		doins -r [a-z]* _images _static
+		popd > /dev/null
+	fi
+}
--- a/dev-python/whoosh/whoosh-2.4.1-r1.ebuild
+++ b/dev-python/whoosh/whoosh-2.4.1-r1.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/whoosh/whoosh-2.4.1-r1.ebuild,v 1.1 2013/01/14 11:06:32 blueness Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+
+MY_PN="Whoosh"
+
+inherit distutils-r1
+
+DESCRIPTION="Fast, pure-Python full text indexing, search and spell checking library"
+HOMEPAGE="http://bitbucket.org/mchaput/whoosh/wiki/Home/ http://pypi.python.org/pypi/Whoosh/"
+SRC_URI="mirror://pypi/W/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_install_all() {
+	local DOCS=( README.txt )
+	distutils-r1_python_install_all
+
+	if use doc; then
+		insinto "/usr/share/doc/${PF}/"
+		doins -r docs/build/html/_sources/* || die
+	fi
+}
+
+python_test() {
+	${EPYTHON} setup.py test || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-tex/luatex/luatex-0.70.1-r1.ebuild
+++ b/dev-tex/luatex/luatex-0.70.1-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1-r1.ebuild,v 1.3 2012/10/17 13:20:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1-r1.ebuild,v 1.4 2013/01/14 11:18:50 aballier Exp $

 EAPI=4

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

 pkg_postinst() {
 	if ! has_version '>=dev-texlive/texlive-basic-2008' ; then
-		elog "Please note that this package does not install much files, mainly the"
-		elog "${PN} executable that will need other files in order to be useful.."
-		elog "Please consider installing a recent TeX distribution"
-		elog "like TeX Live 2008 to get the full power of ${PN}"
+		elog "Note that this package does not install many files, mainly just the"
+		elog "${PN} executable, which needs other files in order to be"
+		elog "useful. Please consider installing a recent TeX distribution such as"
+		elog "TeX Live 2008 or later to take advantage of the full power of"
+		elog "${PN} ."
 	fi
 	efmtutil-sys
 }
--- a/dev-tex/luatex/luatex-0.70.1.ebuild
+++ b/dev-tex/luatex/luatex-0.70.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1.ebuild,v 1.16 2012/08/08 16:30:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1.ebuild,v 1.17 2013/01/14 11:18:50 aballier Exp $

 EAPI=4

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

 pkg_postinst() {
 	if ! has_version '>=dev-texlive/texlive-basic-2008' ; then
-		elog "Please note that this package does not install much files, mainly the"
-		elog "${PN} executable that will need other files in order to be useful.."
-		elog "Please consider installing a recent TeX distribution"
-		elog "like TeX Live 2008 to get the full power of ${PN}"
+		elog "Note that this package does not install many files, mainly just the"
+		elog "${PN} executable, which needs other files in order to be"
+		elog "useful. Please consider installing a recent TeX distribution such as"
+		elog "TeX Live 2008 or later to take advantage of the full power of"
+		elog "${PN} ."
 	fi
 	if [ "$ROOT" = "/" ] && [ -x "${EPREFIX}"/usr/bin/fmtutil-sys ] ; then
 		einfo "Rebuilding formats"
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@ -1,2 +1,3 @@
 DIST cppcheck-1.56.tar.bz2 1131979 SHA256 0de45db8126a11f396130235a8b0c93ceff150a0afa675f5c7f5a07395c31df5 SHA512 f9dd83f38dc0255ecd122f7e7270e72ace5e9a4bbd14d94c9e47eff766c4eef3951f8b222a1c6e8b2613ba01d4e2140615f3309a0a60daacc399b3220038dec4 WHIRLPOOL b8ee263861048506e9da2e3b45dff2af69e3f2ddf47fef6e04f945b8576bad63c617b9eaf2daff994f0681958009fb1d60fdec8637355e668aedf11a4872fbdc
 DIST cppcheck-1.57.tar.bz2 1180272 SHA256 8774a804e08465787e3ddc3af9faf496606c207aa65f750eefd2851a9ccdafd5 SHA512 14afca2fb2cac3965b189b1f110554d40c1db259b6f839407c3e2937d322ec9323e1f2fc1207bd1ba9c1e7af6f77fc5521a6201a7223d10be21fac6c625919df WHIRLPOOL 38e95045c66cd8df1f3e57925288b8ae6ac50c96fa7219f61361dd68b2f704079384480ef89b59f11e607dfebed74a49140cdaab073ff758299a3e71a65d5b5a
+DIST cppcheck-1.58.tar.bz2 1230439 SHA256 d82e98f83ad9fa963d8f9f72d73b409abe13a35aaf302a86a0114a161715b19b SHA512 440b93ccbfb1b5d70f6d945a29ee949ccde30888454aa1938864521c81f9568150194fd0a610139cd10fd5e0e183bc1257bfb91d35ec5a107b20e8db38ae396e WHIRLPOOL 04b60a1271bba5799800e7ec8cdc59c967c8c144127ef25a2362e8643215323c39fcee75dcf15006a4565284d0dde3ddbf0a855ca9ad1664dca595a6129cb001
--- a/dev-util/cppcheck/cppcheck-1.58.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.58.ebuild
@ -0,0 +1,80 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppcheck/cppcheck-1.58.ebuild,v 1.1 2013/01/14 11:18:58 xmw Exp $
+
+EAPI="3"
+PYTHON_DEPEND="htmlreport? 2"
+
+inherit distutils eutils qt4-r2 toolchain-funcs
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://apps.sourceforge.net/trac/cppcheck/"
+SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="htmlreport qt4"
+
+DEPEND="htmlreport? ( dev-python/pygments )
+	qt4? ( x11-libs/qt-gui:4 )"
+RDEPEND="${DEPEND}"
+
+DISTUTILS_SETUP_FILES=("htmlreport|setup.py")
+
+pkg_setup() {
+	if use htmlreport ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	if use htmlreport ; then
+		pushd htmlreport
+		python_convert_shebangs -r 2 .
+		distutils_src_prepare
+		popd
+	fi
+}
+
+src_configure() {
+	tc-export CXX
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_configure
+		popd
+	fi
+}
+
+src_compile() {
+	emake || die
+	if use qt4 ; then
+		pushd gui
+		qt4-r2_src_compile
+		popd
+	fi
+	use htmlreport && distutils_src_compile
+	#https://sourceforge.net/apps/trac/cppcheck/ticket/4149
+	#$(tc-getCXX) ${CFLAGS} ${LDFLAGS} -o ${PN}-democlient.cgi \
+	#	democlient.cpp -I../lib democlient.cpp
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc readme.txt || die
+	if use qt4 ; then
+		dobin gui/${PN}-gui || die
+		dodoc readme_gui.txt gui/{projectfile.txt,gui.cppcheck} || die
+	fi
+	use htmlreport && distutils_src_install
+	#dobin ${PN}-democlient.cgi
+}
+
+pkg_postinst() {
+	use htmlreport && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use htmlreport && distutils_pkg_postrm
+}
--- a/media-gfx/pstoedit/pstoedit-3.61.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.61.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.61.ebuild,v 1.6 2012/12/01 19:32:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.61.ebuild,v 1.7 2013/01/14 17:25:19 bicatali Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
 IUSE="emf flash imagemagick plotutils"

 RDEPEND="
--- a/media-gfx/tgif/Manifest
+++ b/media-gfx/tgif/Manifest
@ -1 +1 @@
-DIST tgif-QPL-4.1.45.tar.gz 2198909 RMD160 e789771c2faf3988a58e9b02619217ea2553146f SHA1 65278d8f9714f130a6197c10426e5172713ce3db SHA256 f18d503cbb15917e95667f8be90d6c1966139b87bcd098431861293bfa62880c
+DIST tgif-QPL-4.2.5.tar.gz 3093619 SHA256 2f24e9fecafae6e671739bd80691a06c9d032bdd1973ca164823e72ab1c567ba SHA512 7b007620190883e30216407bf31c4142493bbd270b4babc282994dec37d221d79f0b1cadc9efda9bc337eb323254e69beee2d4c4873877e7321df41922f456ef WHIRLPOOL 26ddcd8c669335c8147acd57f478b5fb395acf4fcea0cdcb5180b8ee5869122be1a1098ad7ba8abff84af71d414e89acfb43a5c2acb1147d7da45e259675842e
--- a/media-gfx/tgif/files/tgif-4.1.45-gentoo.patch
+++ b/media-gfx/tgif/files/tgif-4.1.45-gentoo.patch
@ -1,37 +0,0 @@
--- Makefile.noimake.orig	2006-12-04 23:28:33.000000000 +0100
-+++ Makefile.noimake	2006-12-04 23:29:35.000000000 +0100
-@@ -18,7 +18,7 @@
- # @(#)$Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/files/tgif-4.1.45-gentoo.patch,v 1.1 2006/12/04 22:25:20 dev-zero Exp $
- #
- 
-INSTALLPATH	= /usr/local
-+INSTALLPATH	= $(DESTDIR)/usr
- MANSECTION	= n
- 
- O 		= .o
-@@ -27,7 +27,7 @@
- CC 		= cc
- BINDIR		= $(INSTALLPATH)/bin
- TGIFDIR 	= $(INSTALLPATH)/lib/tgif
-MANPATH		= $(INSTALLPATH)/man
-+MANPATH		= $(INSTALLPATH)/share/man
- MANDIR		= $(MANPATH)/man$(MANSECTION)
- 
- XDIR		= /usr/openwin
-@@ -43,7 +43,7 @@
- #		directory right after the -c option.  So, if you are running
- #		Solaris, please install the files manually.
- #
-INSTALL		= install
-+INSTALL		= install -D
- 
- CFLAGS		= -O $(DEFINES) -I$(INCROOT)
- LDFLAGS		= -L$(USRLIBDIR) -lc -lX11 -ldl -lm
-@@ -82,6 +82,7 @@
- INSTMANFLAGS	= -m 0444
- DEFINES		= -DTGIF_PATH=\"$(TGIFDIR)\" -DPSFILE_MOD=0664 \
- 		  -DEPSF_FILE_EXT=\"eps\" -DPS_FILE_EXT=\"ps\" \
-+		  -D_HAS_STREAMS_SUPPORT -D_DONT_USE_MKTEMP \
- 		  -DXBM_FILE_EXT=\"xbm\" -DXPM_FILE_EXT=\"xpm\" \
- 		  -DOBJ_FILE_EXT=\"obj\" -DSYM_FILE_EXT=\"sym\" \
- 		  -DTEXT_FILE_EXT=\"txt\" -DPIN_FILE_EXT=\"pin\" \
--- a/media-gfx/tgif/files/tgif-4.1.45-sym.patch
+++ b/media-gfx/tgif/files/tgif-4.1.45-sym.patch
@ -1,50 +0,0 @@
-diff -r -u tgif-QPL-4.1.45.orig/Makefile.noimake tgif-QPL-4.1.45/Makefile.noimake
--- tgif-QPL-4.1.45.orig/Makefile.noimake	2006-06-14 00:29:58.000000000 +0200
-+++ tgif-QPL-4.1.45/Makefile.noimake	2009-06-05 01:20:32.000000000 +0200
-@@ -318,7 +318,11 @@
- 		$(TGIFDIR)/tgificon.eps $(TGIFDIR)/tgificon.obj \
- 		$(TGIFDIR)/tgificon.xbm $(TGIFDIR)/tgificon.xpm \
- 		$(TGIFDIR)/tangram.sym $(TGIFDIR)/tgif.Xdefaults \
-		$(TGIFDIR)/keys.obj
-+		$(TGIFDIR)/eq4-2x.sym $(TGIFDIR)/eq4-epstool.sym \
-+		$(TGIFDIR)/eq4-lyx-ps2epsi.sym $(TGIFDIR)/eq4-ps2epsi.sym \
-+		$(TGIFDIR)/eq4.sym $(TGIFDIR)/eq4xpm.sym \
-+		$(TGIFDIR)/flip-flop.sym $(TGIFDIR)/nand2.sym \
-+		$(TGIFDIR)/pin.sym $(TGIFDIR)/keys.obj
- 	@echo Making install ...
- 
- $(BINDIR)/tgif: tgif
-@@ -339,6 +343,33 @@
- $(TGIFDIR)/tgificon.xpm: tgificon.xpm
- 	$(INSTALL) -c tgificon.xpm $(TGIFDIR)/tgificon.xpm
- 
-+$(TGIFDIR)/eq4-2x.sym: eq4-2x.sym
-+	$(INSTALL) -c eq4-2x.sym $(TGIFDIR)/eq4-2x.sym
-+
-+$(TGIFDIR)/eq4-epstool.sym: eq4-epstool.sym
-+	$(INSTALL) -c eq4-epstool.sym $(TGIFDIR)/eq4-epstool.sym
-+
-+$(TGIFDIR)/eq4-lyx-ps2epsi.sym: eq4-lyx-ps2epsi.sym
-+	$(INSTALL) -c eq4-lyx-ps2epsi.sym $(TGIFDIR)/eq4-lyx-ps2epsi.sym
-+
-+$(TGIFDIR)/eq4-ps2epsi.sym: eq4-ps2epsi.sym
-+	$(INSTALL) -c eq4-ps2epsi.sym $(TGIFDIR)/eq4-ps2epsi.sym
-+
-+$(TGIFDIR)/eq4.sym: eq4.sym
-+	$(INSTALL) -c eq4.sym $(TGIFDIR)/eq4.sym
-+
-+$(TGIFDIR)/eq4xpm.sym: eq4xpm.sym
-+	$(INSTALL) -c eq4xpm.sym $(TGIFDIR)/eq4xpm.sym
-+
-+$(TGIFDIR)/flip-flop.sym: flip-flop.sym
-+	$(INSTALL) -c flip-flop.sym $(TGIFDIR)/flip-flop.sym
-+
-+$(TGIFDIR)/nand2.sym: nand2.sym
-+	$(INSTALL) -c nand2.sym $(TGIFDIR)/nand2.sym
-+
-+$(TGIFDIR)/pin.sym: pin.sym
-+	$(INSTALL) -c pin.sym $(TGIFDIR)/pin.sym
-+
- $(TGIFDIR)/tangram.sym: tangram.sym
- 	$(INSTALL) -c tangram.sym $(TGIFDIR)/tangram.sym
- 
--- a/media-gfx/tgif/tgif-4.1.45-r1.ebuild
+++ b/media-gfx/tgif/tgif-4.1.45-r1.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/tgif-4.1.45-r1.ebuild,v 1.3 2010/02/21 04:24:52 abcd Exp $
-
-EAPI=3
-
-inherit eutils toolchain-funcs
-
-MY_P="${PN}-QPL-${PV}"
-
-DESCRIPTION="Tgif is an Xlib base 2-D drawing facility under X11."
-HOMEPAGE="http://bourbon.usc.edu/tgif/index.html"
-SRC_URI="ftp://bourbon.usc.edu/pub/${PN}/${MY_P}.tar.gz"
-
-LICENSE="QPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND="x11-libs/libX11
-	x11-proto/xproto"
-RDEPEND="${DEPEND}
-	media-libs/netpbm"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-sym.patch"
-	sed -i \
-		-e '/^INSTPGMFLAGS/d' \
-		-e 's/#prtgif /prtgif #/' \
-		-e "/LDFLAGS/ s:=:+=:" \
-		Makefile.noimake || die "sed failed"
-}
-
-src_compile() {
-	emake -f Makefile.noimake \
-		CC=$(tc-getCC) CPPFLAGS="${CFLAGS}" TGIFDIR="${EPREFIX}/usr/bin/tgif" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake -f Makefile.noimake CC=$(tc-getCC) DESTDIR="${ED}" install \
-		|| die "emake install failed"
-
-	## example-files
-	dodoc tgif.Xdefaults tgificon.eps tgificon.obj \
-		tgificon.xbm tgificon.xpm tangram.sym eq4.sym eq4-2x.sym \
-		eq4-ps2epsi.sym eq4-epstool.sym eq4xpm.sym \
-		eq4-lyx-ps2epsi.sym keys.obj
-
-	dodoc README HISTORY
-}
--- a/media-gfx/tgif/tgif-4.2.5.ebuild
+++ b/media-gfx/tgif/tgif-4.2.5.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tgif/tgif-4.2.5.ebuild,v 1.1 2013/01/14 12:07:10 pinkbyte Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils eutils flag-o-matic
+
+MY_P="${PN}-QPL-${PV}"
+
+DESCRIPTION="Xlib base 2-D drawing facility under X11"
+HOMEPAGE="http://bourbon.usc.edu/tgif/index.html"
+SRC_URI="ftp://bourbon.usc.edu/pub/${PN}/${MY_P}.tar.gz"
+
+LICENSE="QPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-proto/xproto"
+RDEPEND="${DEPEND}
+	media-libs/netpbm"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog HISTORY NEWS README )
+
+src_prepare() {
+	sed -i \
+		-e 's/^CFLAGS=/CFLAGS+=/' \
+		-e 's:^TGIFDIR.*:TGIFDIR = $(datadir)/tgif:' \
+		Makefile.am || die 'sed on Makefile.am failed'
+
+	append-cppflags -D_DONT_USE_MKTEMP -DHAS_STREAMS_SUPPORT
+
+	autotools-utils_src_prepare
+}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Mon, 14 Jan 2013 11:06:52 +0000
+Mon, 14 Jan 2013 18:06:53 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Mon, 14 Jan 2013 11:06:52 +0000
+Mon, 14 Jan 2013 18:06:53 +0000
--- a/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-0.1.1
+++ b/metadata/md5-cache/app-admin/eselect-lib-bin-symlink-0.1.1
@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An eselect library to manage executable symlinks
+EAPI=5
+HOMEPAGE=https://bitbucket.org/mgorny/eselect-lib-bin-symlink/
+KEYWORDS=~alpha ~amd64 ~amd64-fbsd ~amd64-linux ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh ~sparc ~sparc64-solaris ~sparc-solaris ~x64-freebsd ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-admin/eselect
+SLOT=0
+SRC_URI=mirror://bitbucket/mgorny/eselect-lib-bin-symlink/downloads/eselect-lib-bin-symlink-0.1.1.tar.bz2
+_eclasses_=autotools	5116b10b2150724f41b564f1cc863e47	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=87474e2b2f5d56dbb8f705f823a0359a
--- a/metadata/md5-cache/app-admin/eselect-pinentry-0.4
+++ b/metadata/md5-cache/app-admin/eselect-pinentry-0.4
@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Manage /usr/bin/pinentry symlink
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/eselect/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=app-admin/eselect-lib-bin-symlink-0.1.1
+SLOT=0
+_md5_=6dc4e1676011ddc04d25759617fd95af
--- a/metadata/md5-cache/app-admin/lsyncd-2.1.4
+++ b/metadata/md5-cache/app-admin/lsyncd-2.1.4
@ -3,9 +3,9 @@ DEPEND=>=dev-lang/lua-5.1[deprecated] app-text/asciidoc
 DESCRIPTION=Live Syncing (Mirror) Daemon
 EAPI=5
 HOMEPAGE=http://code.google.com/p/lsyncd/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1[deprecated] net-misc/rsync
 SLOT=0
 SRC_URI=http://lsyncd.googlecode.com/files/lsyncd-2.1.4.tar.gz
-_md5_=f54c3ef5da61428485295bb2493a29cc
+_md5_=7f64653d10e35dc5db0d9008c2509430
--- a/metadata/md5-cache/app-backup/duplicity-0.6.20
+++ b/metadata/md5-cache/app-backup/duplicity-0.6.20
@ -4,10 +4,10 @@ DESCRIPTION=Secure backup system using gnupg to encrypt data
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/duplicity/
 IUSE=s3
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/paramiko >=dev-python/pexpect-2.1 >=dev-python/py-gnupg-0.3.2 s3? ( dev-python/boto ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://code.launchpad.net/duplicity/0.6-series/0.6.20/+download/duplicity-0.6.20.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e
-_md5_=9cc5dbb501e10a18cf2fc7e57abff72b
+_md5_=8a0048fc55c223797e082817dd77c99f
--- a/metadata/md5-cache/app-i18n/man-pages-ru-3.41.2145.1724.20130102
+++ b/metadata/md5-cache/app-i18n/man-pages-ru-3.41.2145.1724.20130102
@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A collection of Russian translations of Linux manual pages
+EAPI=5
+HOMEPAGE=http://man-pages-ru.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=FDL-1.3
+RDEPEND=virtual/man
+SLOT=0
+SRC_URI=mirror://sourceforge/man-pages-ru/man-pages-ru_3.41-2145-1724-20130102.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=181b3e181904c6368dad5c157aefdb21
--- a/metadata/md5-cache/app-misc/colordiff-1.0.13
+++ b/metadata/md5-cache/app-misc/colordiff-1.0.13
@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Colorizes output of diff
 EAPI=5
 HOMEPAGE=http://www.colordiff.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-apps/diffutils
 SLOT=0
 SRC_URI=http://www.colordiff.org/colordiff-1.0.13.tar.gz
 _eclasses_=prefix	21058c21ca48453d771df15500873ede
-_md5_=f79f30e6b60149a02aab8a36adc9583d
+_md5_=f38fb9f3ce4c42ad4eec6b0df61aeb74
--- a/metadata/md5-cache/app-misc/when-1.1.30
+++ b/metadata/md5-cache/app-misc/when-1.1.30
@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=Extremely simple personal calendar program aimed at the Unix geek who wants something minimalistic
 EAPI=4
 HOMEPAGE=http://www.lightandmatter.com/when/when.html
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=Artistic
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://www.lightandmatter.com/when/when.tar.gz -> when-1.1.30.tar.gz
-_md5_=7bcd2c6c811888cce245de03f27714a1
+_md5_=72538f8e7808d555f7880dd188a18c70
--- a/metadata/md5-cache/app-office/libreoffice-4.0.9999
+++ b/metadata/md5-cache/app-office/libreoffice-4.0.9999
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-python/python-exec[python_targets_python2_7?,python_targets_python3_3?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-libs/liborcus-0.3 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-misc/npapi-sdk net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 ) webdav? ( net-libs/neon ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( >=virtual/jdk-1.6 >=dev-java/ant-core-1.7 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) dev-vcs/git
+DEPEND=dev-python/python-exec[python_targets_python2_7?,python_targets_python3_3?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-libs/liborcus-0.3 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 ) webdav? ( net-libs/neon ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( >=virtual/jdk-1.6 >=dev-java/ant-core-1.7 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) dev-vcs/git
 DESCRIPTION=LibreOffice, a full office productivity suite.
 EAPI=5
 HOMEPAGE=http://www.libreoffice.org
 IUSE=bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba +webdav libreoffice_extensions_nlpsolver libreoffice_extensions_presenter-minimizer libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_3
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND==app-office/libreoffice-l10n-3.6*
-RDEPEND=dev-python/python-exec[python_targets_python2_7?,python_targets_python3_3?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-libs/liborcus-0.3 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-misc/npapi-sdk net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
+RDEPEND=dev-python/python-exec[python_targets_python2_7?,python_targets_python3_3?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-libs/liborcus-0.3 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
 REQUIRED_USE=bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.7.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	5116b10b2150724f41b564f1cc863e47	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python-single-r1	24fb5eb34cffbd2bfe575987513c972a	python-utils-r1	069a968fde0ceb8a9cd5c6a89d77cbc2	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=69000fc870862b94985c6bf908d1629b
+_md5_=c8513628931e471cd57dd0f34f90fe0f
--- a/metadata/md5-cache/app-office/libreoffice-9999-r2
+++ b/metadata/md5-cache/app-office/libreoffice-9999-r2
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-python/python-exec[python_targets_python2_7?,python_targets_python3_3?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-libs/liborcus-0.3 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-misc/npapi-sdk net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 ) webdav? ( net-libs/neon ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( >=virtual/jdk-1.6 >=dev-java/ant-core-1.7 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) dev-vcs/git
+DEPEND=dev-python/python-exec[python_targets_python2_7?,python_targets_python3_3?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-libs/liborcus-0.3 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 ) webdav? ( net-libs/neon ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds virtual/pkgconfig net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-devel/ucpp sys-libs/zlib x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( >=virtual/jdk-1.6 >=dev-java/ant-core-1.7 ) odk? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) dev-vcs/git
 DESCRIPTION=LibreOffice, a full office productivity suite.
 EAPI=5
 HOMEPAGE=http://www.libreoffice.org
 IUSE=bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba +webdav libreoffice_extensions_nlpsolver libreoffice_extensions_presenter-minimizer libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java aqua kde python_targets_python2_7 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_3
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND==app-office/libreoffice-l10n-3.6*
-RDEPEND=dev-python/python-exec[python_targets_python2_7?,python_targets_python3_3?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-libs/liborcus-0.3 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-misc/npapi-sdk net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
+RDEPEND=dev-python/python-exec[python_targets_python2_7?,python_targets_python3_3?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-libs/liborcus-0.3 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
 REQUIRED_USE=bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.7.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	5116b10b2150724f41b564f1cc863e47	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	2d9eb3508fa5d6759e39354b74545567	kde4-base	6e4e3fc3a36f43b71c84ad615e804a83	kde4-functions	37767566f9ffa88075c4d392a59100a9	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python-single-r1	24fb5eb34cffbd2bfe575987513c972a	python-utils-r1	069a968fde0ceb8a9cd5c6a89d77cbc2	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f869af284d7e3a5801c732a3a0355fb3
+_md5_=083e38b7169e7024f295e0741e13fba2
--- a/metadata/md5-cache/app-portage/eix-0.28.0
+++ b/metadata/md5-cache/app-portage/eix-0.28.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=app-shells/push sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) app-arch/xz-utils clang? ( sys-devel/clang ) nls? ( sys-devel/gettext )
+DESCRIPTION=Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more
+EAPI=5
+HOMEPAGE=http://eix.berlios.de
+IUSE=clang debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion linguas_de linguas_ru
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-shells/push sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://berlios/eix/eix-0.28.0.tar.xz
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	d40dc948067bd3db1c8ebf7d51897313	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=def68a0c4325f42e130bc854c758886a
--- a/metadata/md5-cache/app-text/pdfsandwich-0.0.3
+++ b/metadata/md5-cache/app-text/pdfsandwich-0.0.3
@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-apps/gawk >=dev-lang/ocaml-3.10[ocamlopt]
-DESCRIPTION=generator of sandwich OCR pdf files
-EAPI=2
-HOMEPAGE=http://pdfsandwich.origo.ethz.ch/wiki/pdfsandwich
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/cuneiform[imagemagick] media-gfx/exact-image app-text/ghostscript-gpl
-SLOT=0
-SRC_URI=http://download.origo.ethz.ch/pdfsandwich/2161/pdfsandwich-0.0.3.tar.bz2
-_md5_=250d3f87d7609011f1a27599f6f79f55
--- a/metadata/md5-cache/app-text/pdfsandwich-0.0.7
+++ b/metadata/md5-cache/app-text/pdfsandwich-0.0.7
@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/tesseract-3.00 media-gfx/exact-image app-text/ghostscript-gpl
 SLOT=0
-SRC_URI=mirror://sourceforge/pdfsandwich/pdfsandwich-0.0.6.tar.bz2
-_md5_=77315a159571de4e2a171ad90d5f38d0
+SRC_URI=mirror://sourceforge/pdfsandwich/pdfsandwich-0.0.7.tar.bz2
+_md5_=ac40a219cd932f53f42ad11037f4200b
--- a/metadata/md5-cache/dev-db/pgbouncer-1.5.3-r1
+++ b/metadata/md5-cache/dev-db/pgbouncer-1.5.3-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=dev-libs/libevent
+DESCRIPTION=Lightweight connection pooler for PostgreSQL
+EAPI=4
+HOMEPAGE=http://pgfoundry.org/projects/pgbouncer/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libevent
+RESTRICT=test
+SLOT=0
+SRC_URI=http://pgfoundry.org/frs/download.php/3369/pgbouncer-1.5.3.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2cc5fad1e498a65857204ae5cf59cb8d
--- a/metadata/md5-cache/dev-lang/ekopath-4.0.12.1_pre20120308
+++ b/metadata/md5-cache/dev-lang/ekopath-4.0.12.1_pre20120308
@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare pretend unpack
-DESCRIPTION=PathScale EKOPath Compiler Suite
-EAPI=4
-HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2012-03-08-installer.run -> ekopath-4.0.12.1_pre20120308.run
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=30a8497a17fa98033c8893b96697d5e5
--- a/metadata/md5-cache/dev-lang/ekopath-4.0.12.1_pre20120430
+++ b/metadata/md5-cache/dev-lang/ekopath-4.0.12.1_pre20120430
@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare pretend unpack
-DESCRIPTION=PathScale EKOPath Compiler Suite
-EAPI=4
-HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2012-04-30-installer.run -> ekopath-4.0.12.1_pre20120430.run
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=2891ff6f9619f7e9856342a68c0f19f3
--- a/metadata/md5-cache/dev-lang/ekopath-4.0.12.1_pre20120530
+++ b/metadata/md5-cache/dev-lang/ekopath-4.0.12.1_pre20120530
@ -3,10 +3,11 @@ DEPEND=!!app-arch/rpm
 DESCRIPTION=PathScale EKOPath Compiler Suite
 EAPI=4
 HOMEPAGE=http://www.pathscale.com/ekopath-compiler-suite
+IUSE=doc
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RESTRICT=mirror
 SLOT=0
-SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2012-05-30-installer.run -> ekopath-4.0.12.1_pre20120530.run
+SRC_URI=http://c591116.r16.cf2.rackcdn.com/ekopath/nightly/Linux/ekopath-2013-01-13-installer.run -> ekopath-5.0.0_pre20130113.run
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=7f75bd23ebe248720220828fb1d48e11
+_md5_=7f3b4dbace279d0b64548f994a666f09
--- a/metadata/md5-cache/dev-python/psycopg-2.4.6-r1
+++ b/metadata/md5-cache/dev-python/psycopg-2.4.6-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-db/postgresql-base-8.1 doc? ( dev-python/sphinx[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] ) dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 )
+DESCRIPTION=PostgreSQL database adapter for Python
+EAPI=5
+HOMEPAGE=http://initd.org/psycopg/ http://pypi.python.org/pypi/psycopg2
+IUSE=debug doc examples python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-db/postgresql-base-8.1 dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 )
+RESTRICT=test
+SLOT=2
+SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.4.6.tar.gz
+_eclasses_=distutils-r1	ddac14029e0508e83c9cb6ddf6ac30fa	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	b9091432451f035281bf6fc17720e820	python-utils-r1	069a968fde0ceb8a9cd5c6a89d77cbc2	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ca81871e7ed4ea862c1f5b7f254b80f8
--- a/metadata/md5-cache/dev-python/pycairo-1.10.0-r4
+++ b/metadata/md5-cache/dev-python/pycairo-1.10.0-r4
@ -4,10 +4,10 @@ DESCRIPTION=Python bindings for the cairo library
 EAPI=5
 HOMEPAGE=http://cairographics.org/pycairo/ http://pypi.python.org/pypi/pycairo
 IUSE=doc examples +svg test xcb python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~ppc-macos ~x64-macos ~x86-linux ~x86-macos
 LICENSE=LGPL-3 || ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=x11-libs/cairo-1.10.0[svg?,xcb?] xcb? ( x11-libs/xpyb )
 SLOT=0
 SRC_URI=http://cairographics.org/releases/py2cairo-1.10.0.tar.bz2 http://cairographics.org/releases/pycairo-1.10.0.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	b9091432451f035281bf6fc17720e820	python-utils-r1	069a968fde0ceb8a9cd5c6a89d77cbc2	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	waf-utils	681b3e9181d1a20ad8d0c186333ddcf7
-_md5_=c58aac21c59d97ae89fd54ef8f9b6d49
+_md5_=b0d8b59b1252e27c64adf3f2a47ccb69
--- a/metadata/md5-cache/dev-python/pysqlite-2.6.3-r1
+++ b/metadata/md5-cache/dev-python/pysqlite-2.6.3-r1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-db/sqlite-3.3.8:3[extensions] 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(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 )
+DESCRIPTION=DB-API 2.0 interface for SQLite 3.x
+EAPI=5
+HOMEPAGE=http://code.google.com/p/pysqlite/ http://pypi.python.org/pypi/pysqlite
+IUSE=examples python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=pysqlite
+RDEPEND=>=dev-db/sqlite-3.3.8:3[extensions] 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(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 )
+SLOT=2
+SRC_URI=http://pysqlite.googlecode.com/files/pysqlite-2.6.3.tar.gz
+_eclasses_=distutils-r1	ddac14029e0508e83c9cb6ddf6ac30fa	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	b9091432451f035281bf6fc17720e820	python-utils-r1	069a968fde0ceb8a9cd5c6a89d77cbc2	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f219d48cc8d756667ca42ef72cd2ab46
--- a/metadata/md5-cache/dev-python/pytools-2012.1
+++ b/metadata/md5-cache/dev-python/pytools-2012.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools test? ( dev-python/pytest ) 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(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 )
+DESCRIPTION=A collection of tools missing from the Python standard library
+EAPI=5
+HOMEPAGE=http://mathema.tician.de/software/pytools
+IUSE=test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=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(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytools/pytools-2012.1.tar.gz
+_eclasses_=distutils-r1	ddac14029e0508e83c9cb6ddf6ac30fa	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	b9091432451f035281bf6fc17720e820	python-utils-r1	069a968fde0ceb8a9cd5c6a89d77cbc2	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4460b0f53c0143ada72ff71625a45a91
--- a/metadata/md5-cache/dev-python/spyder-2.1.13
+++ b/metadata/md5-cache/dev-python/spyder-2.1.13
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=>=dev-python/PyQt4-4.4[webkit] ipython? ( dev-python/ipython ) matplotlib? ( dev-python/matplotlib ) numpy? ( dev-python/numpy ) pep8? ( dev-python/pep8 ) pyflakes? ( >=dev-python/pyflakes-0.3 ) pylint? ( dev-python/pylint ) rope? ( >=dev-python/rope-0.9.3 ) scipy? ( sci-libs/scipy ) sphinx? ( dev-python/sphinx ) app-arch/unzip doc? ( dev-python/sphinx ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+DESCRIPTION=Python IDE with matlab-like features
+EAPI=3
+HOMEPAGE=http://code.google.com/p/spyderlib/ http://pypi.python.org/pypi/spyder
+IUSE=doc ipython matplotlib numpy pep8 +pyflakes pylint +rope scipy sphinx
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/PyQt4-4.4[webkit] ipython? ( dev-python/ipython ) matplotlib? ( dev-python/matplotlib ) numpy? ( dev-python/numpy ) pep8? ( dev-python/pep8 ) pyflakes? ( >=dev-python/pyflakes-0.3 ) pylint? ( dev-python/pylint ) rope? ( >=dev-python/rope-0.9.3 ) scipy? ( sci-libs/scipy ) sphinx? ( dev-python/sphinx ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+SLOT=0
+SRC_URI=http://spyderlib.googlecode.com/files/spyder-2.1.13.zip
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c00230110d8d748f9ff2cc68cc94f683
--- a/metadata/md5-cache/dev-python/whoosh-2.4.1-r1
+++ b/metadata/md5-cache/dev-python/whoosh-2.4.1-r1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] test? ( dev-python/nose[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] ) dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 )
+DESCRIPTION=Fast, pure-Python full text indexing, search and spell checking library
+EAPI=5
+HOMEPAGE=http://bitbucket.org/mchaput/whoosh/wiki/Home/ http://pypi.python.org/pypi/Whoosh/
+IUSE=doc test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-python/python-exec[python_targets_python2_5?,python_targets_python2_6?,python_targets_python2_7?,python_targets_python3_1?,python_targets_python3_2?,python_targets_python3_3?,python_targets_pypy1_9?,python_targets_pypy2_0?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 )
+SLOT=0
+SRC_URI=mirror://pypi/W/Whoosh/Whoosh-2.4.1.tar.gz
+_eclasses_=distutils-r1	ddac14029e0508e83c9cb6ddf6ac30fa	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	b9091432451f035281bf6fc17720e820	python-utils-r1	069a968fde0ceb8a9cd5c6a89d77cbc2	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d30a7d1f4a916fb379e7af0a8a430cf0
--- a/metadata/md5-cache/dev-tex/luatex-0.70.1
+++ b/metadata/md5-cache/dev-tex/luatex-0.70.1
@ -10,4 +10,4 @@ RDEPEND=dev-libs/zziplib >=media-libs/libpng-1.4 >=app-text/poppler-0.12.3-r3[xp
 SLOT=0
 SRC_URI=http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-0.70.1.tar.bz2 http://foundry.supelec.fr/gf/download/frsrelease/392/1732/luatex-beta-0.70.1-doc.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=34fe55e37772ea94cb80a18a737eb783
+_md5_=9eb312674db21a66198b2c05cca7e301
--- a/metadata/md5-cache/dev-tex/luatex-0.70.1-r1
+++ b/metadata/md5-cache/dev-tex/luatex-0.70.1-r1
@ -10,4 +10,4 @@ RDEPEND=dev-libs/zziplib >=media-libs/libpng-1.4 >=app-text/poppler-0.12.3-r3[xp
 SLOT=0
 SRC_URI=http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-0.70.1.tar.bz2 http://foundry.supelec.fr/gf/download/frsrelease/392/1732/luatex-beta-0.70.1-doc.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	texlive-common	dcab7201316e43f118d20a1d6dab09a9	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c42ccfeca8ba4c447e13176cae5f1336
+_md5_=77718e22e098c95a0f80943f88fced90
--- a/metadata/md5-cache/dev-util/cppcheck-1.58
+++ b/metadata/md5-cache/dev-util/cppcheck-1.58
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=htmlreport? ( dev-python/pygments ) qt4? ( x11-libs/qt-gui:4 ) htmlreport? ( =dev-lang/python-2* )
+DESCRIPTION=static analyzer of C/C++ code
+EAPI=3
+HOMEPAGE=http://apps.sourceforge.net/trac/cppcheck/
+IUSE=htmlreport qt4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=htmlreport? ( dev-python/pygments ) qt4? ( x11-libs/qt-gui:4 ) htmlreport? ( =dev-lang/python-2* )
+SLOT=0
+SRC_URI=mirror://sourceforge/cppcheck/cppcheck-1.58.tar.bz2
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	qt4-r2	19af9102ca9b827213997cc636e7e33c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b74173522bea2527a41deb92518a0bee
--- a/metadata/md5-cache/media-gfx/pstoedit-3.61
+++ b/metadata/md5-cache/media-gfx/pstoedit-3.61
@ -4,10 +4,10 @@ DESCRIPTION=Translate PostScript and PDF graphics into other vector formats
 EAPI=4
 HOMEPAGE=http://sourceforge.net/projects/pstoedit/
 IUSE=emf flash imagemagick plotutils
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.4.3 >=media-libs/gd-2.0.35-r1 >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) flash? ( >=media-libs/ming-0.4.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) plotutils? ( media-libs/plotutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/pstoedit/pstoedit-3.61.tar.gz
 _eclasses_=autotools	5116b10b2150724f41b564f1cc863e47	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a82d8d1795332dc7d14caf8047a49fc6
+_md5_=2d0c11e23bd29a46ccb80116cffe69b6
--- a/metadata/md5-cache/media-gfx/tgif-4.1.45-r1
+++ b/metadata/md5-cache/media-gfx/tgif-4.1.45-r1
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-proto/xproto
-DESCRIPTION=Tgif is an Xlib base 2-D drawing facility under X11.
-EAPI=3
-HOMEPAGE=http://bourbon.usc.edu/tgif/index.html
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=QPL-1.0
-RDEPEND=x11-libs/libX11 x11-proto/xproto media-libs/netpbm
-SLOT=0
-SRC_URI=ftp://bourbon.usc.edu/pub/tgif/tgif-QPL-4.1.45.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ceb15c59a88e9feac53d5f7cacf20617
--- a/metadata/md5-cache/media-gfx/tgif-4.2.5
+++ b/metadata/md5-cache/media-gfx/tgif-4.2.5
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Xlib base 2-D drawing facility under X11
+EAPI=5
+HOMEPAGE=http://bourbon.usc.edu/tgif/index.html
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=QPL-1.0
+RDEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-proto/xproto media-libs/netpbm
+SLOT=0
+SRC_URI=ftp://bourbon.usc.edu/pub/tgif/tgif-QPL-4.2.5.tar.gz
+_eclasses_=autotools	5116b10b2150724f41b564f1cc863e47	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7be37e15ab3a14ddadf702c099f8b8b4
--- a/metadata/md5-cache/net-libs/qxmpp-0.7.5
+++ b/metadata/md5-cache/net-libs/qxmpp-0.7.5
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/speex test? ( x11-libs/qt-test:4 )
+DESCRIPTION=A cross-platform C++ XMPP client library based on the Qt framework.
+EAPI=5
+HOMEPAGE=http://code.google.com/p/qxmpp/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=LGPL-2.1
+RDEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/speex
+SLOT=0
+SRC_URI=http://qxmpp.googlecode.com/files/qxmpp-0.7.5.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-r2	19af9102ca9b827213997cc636e7e33c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e47a8844c1915383abe2e2958091c088
--- a/metadata/md5-cache/net-libs/qxmpp-9999
+++ b/metadata/md5-cache/net-libs/qxmpp-9999
@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/speex test? ( x11-libs/qt-test:4 ) dev-vcs/git
 DESCRIPTION=A cross-platform C++ XMPP client library based on the Qt framework.
-EAPI=4
+EAPI=5
 HOMEPAGE=http://code.google.com/p/qxmpp/
 IUSE=debug doc test
 LICENSE=LGPL-2.1
 RDEPEND=x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/speex
 SLOT=0
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	e92e09651292b1bef5656592364550f7	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-r2	19af9102ca9b827213997cc636e7e33c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e027b36ca8f5a69657f1595960a64039
+_md5_=92498692b4356a00ce0af56f9cc8e42d
--- a/metadata/md5-cache/net-misc/asterisk-g729-1.8.4.3.1.5-r2
+++ b/metadata/md5-cache/net-misc/asterisk-g729-1.8.4.3.1.5-r2
@ -9,4 +9,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=x86? ( http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-athlon_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-athlon_xp_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-barcelona_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-c3_2_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-c3_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-core2_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-generic_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-i686_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-k6_3_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-nocona_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-opteron_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-opteron_sse3_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-pentium3m_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-pentium4m_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-pentium_m_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-32/codec_g729a-1.8.4_3.1.5-prescott_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-32/benchg729-1.0.8-x86_32 -> benchg729-x86_32 http://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32 http://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32 ) amd64? ( http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-64/codec_g729a-1.8.4_3.1.5-barcelona_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-64/codec_g729a-1.8.4_3.1.5-core2_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-64/codec_g729a-1.8.4_3.1.5-generic_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-64/codec_g729a-1.8.4_3.1.5-nocona_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-64/codec_g729a-1.8.4_3.1.5-opteron_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-1.8.4/x86-64/codec_g729a-1.8.4_3.1.5-opteron_sse3_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-64/benchg729-1.0.8-x86_64 -> benchg729-x86_64 http://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64 http://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64 ) http://g729.uls.co.za/static/g729-stats-collector/collect-g729-stats.sh
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e45d32de030fbf731b69257dbdbf0e93
+_md5_=a75b8e08b6fc432b30cff14c32474275
--- a/metadata/md5-cache/net-misc/asterisk-g729-10.0.3.1.5
+++ b/metadata/md5-cache/net-misc/asterisk-g729-10.0.3.1.5
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=G.729 codec and supporting files for asterisk
-EAPI=4
-HOMEPAGE=http://store.digium.com/productview.php?product_code=G729CODEC
-KEYWORDS=~amd64 ~x86
-LICENSE=Digium
-RDEPEND==net-misc/asterisk-10*
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=x86? ( http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-athlon_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-athlon_xp_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-barcelona_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-c3_2_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-c3_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-core2_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-generic_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-i686_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-k6_3_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-nocona_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-opteron_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-opteron_sse3_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-pentium3m_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-pentium4m_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-pentium_m_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-32/codec_g729a-10.0_3.1.5-prescott_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-32/benchg729-1.0.8-x86_32 -> benchg729-x86_32 http://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32 http://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32 ) amd64? ( http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-64/codec_g729a-10.0_3.1.5-barcelona_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-64/codec_g729a-10.0_3.1.5-core2_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-64/codec_g729a-10.0_3.1.5-generic_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-64/codec_g729a-10.0_3.1.5-nocona_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-64/codec_g729a-10.0_3.1.5-opteron_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-10.0/x86-64/codec_g729a-10.0_3.1.5-opteron_sse3_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-64/benchg729-1.0.8-x86_64 -> benchg729-x86_64 http://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64 http://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64 ) http://g729.uls.co.za/static/g729-stats-collector/collect-g729-stats.sh
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e5f3112322c3f16e6c5fa31027b69538
--- a/metadata/md5-cache/net-misc/asterisk-g729-11.0.3.1.5
+++ b/metadata/md5-cache/net-misc/asterisk-g729-11.0.3.1.5
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=G.729 codec and supporting files for asterisk
+EAPI=4
+HOMEPAGE=http://store.digium.com/productview.php?product_code=G729CODEC
+KEYWORDS=~amd64 ~x86
+LICENSE=Digium
+RDEPEND==net-misc/asterisk-11*
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=x86? ( http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-athlon_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-athlon_xp_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-barcelona_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-c3_2_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-c3_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-core2_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-generic_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-i686_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-k6_3_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-nocona_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-opteron_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-opteron_sse3_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-pentium3m_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-pentium4m_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-pentium_m_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-32/codec_g729a-11.0_3.1.5-prescott_32.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-32/benchg729-1.0.8-x86_32 -> benchg729-x86_32 http://downloads.digium.com/pub/register/x86-32/register -> astregister-x86_32 http://downloads.digium.com/pub/register/x86-32/asthostid -> asthostid-x86_32 ) amd64? ( http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-64/codec_g729a-11.0_3.1.5-barcelona_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-64/codec_g729a-11.0_3.1.5-core2_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-64/codec_g729a-11.0_3.1.5-generic_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-64/codec_g729a-11.0_3.1.5-nocona_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-64/codec_g729a-11.0_3.1.5-opteron_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/asterisk-11.0/x86-64/codec_g729a-11.0_3.1.5-opteron_sse3_64.tar.gz http://downloads.digium.com/pub/telephony/codec_g729/benchg729/x86-64/benchg729-1.0.8-x86_64 -> benchg729-x86_64 http://downloads.digium.com/pub/register/x86-64/register -> astregister-x86_64 http://downloads.digium.com/pub/register/x86-64/asthostid -> asthostid-x86_64 ) http://g729.uls.co.za/static/g729-stats-collector/collect-g729-stats.sh
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=1dd52e4edaa3e31c4318b245b3b3903c
--- a/metadata/md5-cache/net-misc/batman-adv-2012.1.0
+++ b/metadata/md5-cache/net-misc/batman-adv-2012.1.0
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Better approach to mobile Ad-Hoc networking on layer 2 kernel module
-EAPI=4
-HOMEPAGE=http://www.open-mesh.org/
-IUSE=debug kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2012.1.0.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3552f0b843e01d50bbe9685a6cf60c94
--- a/metadata/md5-cache/net-misc/batman-adv-2012.2.0
+++ b/metadata/md5-cache/net-misc/batman-adv-2012.2.0
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
-DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=Better approach to mobile Ad-Hoc networking on layer 2 kernel module
-EAPI=4
-HOMEPAGE=http://www.open-mesh.org/
-IUSE=debug bla kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2012.2.0.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ae3c8e60d258ee5d7ccd1d16e371bf3a
--- a/metadata/md5-cache/net-misc/batman-adv-2013.0.0
+++ b/metadata/md5-cache/net-misc/batman-adv-2013.0.0
@ -3,11 +3,11 @@ DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/l
 DESCRIPTION=Better approach to mobile Ad-Hoc networking on layer 2 kernel module
 EAPI=4
 HOMEPAGE=http://www.open-mesh.org/
-IUSE=kernel_linux
+IUSE=bla dat debug kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
-SRC_URI=http://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2011.4.0.tar.gz
+SRC_URI=http://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2013.0.0.tar.gz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=14c77ad99d27c2514e8bdae291506463
+_md5_=ec26985c9237614c1461901c82a10343
--- a/metadata/md5-cache/net-misc/clipgrab-3.2.0.10
+++ b/metadata/md5-cache/net-misc/clipgrab-3.2.0.10
@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=x11-libs/qt-webkit:4 virtual/ffmpeg
 SLOT=0
-SRC_URI=http://clipgrab.de/download/clipgrab-3.2.0.6.tar.bz2
+SRC_URI=http://clipgrab.de/download/clipgrab-3.2.0.10.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	qt4-r2	19af9102ca9b827213997cc636e7e33c	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ff5d3038c54951467745990f79ea11df
+_md5_=e0f09f8c6ae03fc9a77c0b86b2c7e077
--- a/metadata/md5-cache/net-misc/youtube-dl-2013.01.13
+++ b/metadata/md5-cache/net-misc/youtube-dl-2013.01.13
@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=test? ( dev-python/nose[coverage] )
+DESCRIPTION=A small command-line program to download videos from YouTube.
+EAPI=5
+HOMEPAGE=http://rg3.github.com/youtube-dl/
+IUSE=offensive test 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
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=http://youtube-dl.org/downloads/2013.01.13/youtube-dl-2013.01.13.tar.gz
+_eclasses_=bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python-single-r1	24fb5eb34cffbd2bfe575987513c972a	python-utils-r1	069a968fde0ceb8a9cd5c6a89d77cbc2	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2cc890b69535e18e7001e71149871920
--- a/metadata/md5-cache/sci-calculators/units-1.88
+++ b/metadata/md5-cache/sci-calculators/units-1.88
@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/readline-4.1-r2 >=sys-libs/ncurses-5.2-r3
-DESCRIPTION=unit conversion program
-EAPI=2
-HOMEPAGE=http://www.gnu.org/software/units/units.html
-KEYWORDS=alpha amd64 ~arm hppa ppc sparc x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/readline-4.1-r2 >=sys-libs/ncurses-5.2-r3
-SLOT=0
-SRC_URI=mirror://gnu/units/units-1.88.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=71e4632d289d2e527d795a3533e650b4
--- a/metadata/md5-cache/sci-calculators/units-1.88-r1
+++ b/metadata/md5-cache/sci-calculators/units-1.88-r1
@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/readline-4.1-r2 >=sys-libs/ncurses-5.2-r3
-DESCRIPTION=unit conversion program
-EAPI=4
-HOMEPAGE=http://www.gnu.org/software/units/units.html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/readline-4.1-r2 >=sys-libs/ncurses-5.2-r3
-SLOT=0
-SRC_URI=mirror://gnu/units/units-1.88.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9e74e88667d5e48e83e6ae3afc150b8a
--- a/metadata/md5-cache/sci-calculators/units-2.00
+++ b/metadata/md5-cache/sci-calculators/units-2.00
@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=sys-libs/readline-4.1-r2
-DESCRIPTION=Unit conversion program
-EAPI=4
-HOMEPAGE=http://www.gnu.org/software/units/units.html
-KEYWORDS=~alpha amd64 ~arm hppa ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=|| ( dev-lang/python:2.5 dev-lang/python:2.6 dev-lang/python:2.7 ) >=sys-libs/readline-4.1-r2
-SLOT=0
-SRC_URI=mirror://gnu/units/units-2.00.tar.gz
-_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cabdcc1c7d29aa9df9278a81da29f93e
--- a/metadata/md5-cache/sys-apps/cciss_vol_status-1.10
+++ b/metadata/md5-cache/sys-apps/cciss_vol_status-1.10
@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Shows status of logical drives attached to HP SmartArray controllers.
+EAPI=4
+HOMEPAGE=http://cciss.sourceforge.net/#cciss_utils
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/cciss/cciss_vol_status-1.10.tar.gz
+_md5_=406cfe426cb386560dc15b739b91a778
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@ -3,10 +3,10 @@ DEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || (
 DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=3
 HOMEPAGE=http://www.gentoo.org/proj/en/portage/index.xml
-IUSE=build doc epydoc +ipc pypy2_0 python2 python3 selinux xattr
+IUSE=build doc epydoc +ipc linguas_ru pypy2_0 python2 python3 selinux xattr
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=python3? ( =dev-lang/python-3* ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/bash-4.2_p37[readline] ( <app-shells/bash-4.2_p37 >=app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( python3? ( =dev-lang/python-3*[ssl] ) !pypy2_0? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7[ssl] dev-lang/python:2.6[threads,ssl] ) ) ) ) pypy2_0? ( !python2? ( !python3? ( dev-python/pypy:2.0[bzip2,ssl] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7[ssl] dev-lang/python:2.6[ssl,threads] ) ) ) dev-python/python-mhash ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
 SLOT=0
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	e92e09651292b1bef5656592364550f7	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	e5b3412fa9f03670a666c8a137bd1060	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f5376f673715a84a06d688133e361113
+_md5_=32c222bcf6708731385312683737d1f3
--- a/metadata/md5-cache/sys-devel/automake-1.13.1
+++ b/metadata/md5-cache/sys-devel/automake-1.13.1
@ -2,9 +2,10 @@ DEFINED_PHASES=compile install unpack
 DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-8 >=sys-devel/autoconf-2.62 >=sys-apps/texinfo-4.7 sys-devel/gnuconfig sys-apps/help2man
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
 HOMEPAGE=http://www.gnu.org/software/automake/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-8 >=sys-devel/autoconf-2.62 >=sys-apps/texinfo-4.7 sys-devel/gnuconfig
 SLOT=1.13
 SRC_URI=mirror://gnu/automake/automake-1.13.1.tar.xz ftp://alpha.gnu.org/pub/gnu/automake/automake-1.13.1.tar.xz
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	unpacker	50e1227854e96469a19a63f053496328	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=059694f237413fdcf95e24f7ed5a49ee
+_md5_=878e2eb480adace1095bd7954db05e3a
--- a/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.3
+++ b/metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.3
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-base/xorg-server-1.3 >=x11-libs/libdrm-2.4.36[video_cards_omap] || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DESCRIPTION=OMAP video driver
+EAPI=4
+HOMEPAGE=http://xorg.freedesktop.org/
+KEYWORDS=~arm
+LICENSE=MIT
+RDEPEND=>=x11-base/xorg-server-1.3 >=x11-libs/libdrm-2.4.36[video_cards_omap] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+SLOT=0
+SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-omap-0.4.3.tar.bz2
+_eclasses_=autotools	5116b10b2150724f41b564f1cc863e47	autotools-utils	f4dc5b0e643575b9bd31a2bd7deeee31	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	ff8fcdb08e36af162e7cfd65dd10be44
+_md5_=5505b039f895034368cfe2ac9395af15
--- a/metadata/md5-cache/x11-misc/spacefm-0.8.5
+++ b/metadata/md5-cache/x11-misc/spacefm-0.8.5
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm preinst setup
+DEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) dev-util/intltool virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=A multi-panel tabbed file manager
+EAPI=5
+HOMEPAGE=http://ignorantguru.github.com/spacefm/
+IUSE=+startup-notification
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/spacefm-0.8.5.tar.xz mirror://sourceforge/spacefm/spacefm-0.8.5.tar.xz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=c01a99b4c0e3d9ca7ce5cfcfc48c4329
--- a/metadata/md5-cache/x11-misc/spacefm-9999
+++ b/metadata/md5-cache/x11-misc/spacefm-9999
@ -1,11 +1,11 @@
 DEFINED_PHASES=configure postinst postrm preinst setup unpack
-DEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) dev-util/intltool virtual/pkgconfig sys-devel/gettext dev-vcs/git >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification ) dev-util/intltool virtual/pkgconfig sys-devel/gettext dev-vcs/git >=sys-apps/sed-4
 DESCRIPTION=A multi-panel tabbed file manager
 EAPI=4
 HOMEPAGE=http://ignorantguru.github.com/spacefm/
 IUSE=+startup-notification
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification )
+RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils >=virtual/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-libs/libX11 x11-misc/shared-mime-info startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	69a2016af67775a812f4c03ba4b0e03e	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e63768aa4ff461a53bf82e91f4820f5d
+_md5_=953f92ac741b490e8d57f2c736b8bd09
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Mon, 14 Jan 2013 11:06:54 +0000
+Mon, 14 Jan 2013 18:06:55 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Mon Jan 14 11:06:52 UTC 2013
+Mon Jan 14 18:06:53 UTC 2013
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Mon, 14 Jan 2013 11:30:01 +0000
+Mon, 14 Jan 2013 18:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1358161501 Mon Jan 14 11:05:01 2013 UTC
+1358186701 Mon Jan 14 18:05:01 2013 UTC
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@ -1,3 +1,4 @@
 DIST qxmpp-0.3.61-extras.tar.bz2 205766 SHA256 4309a8d91fe8b71214b1e7133f77bf23527f5e366f4bb44b8d2235da4622eb25 SHA512 8a44e100ec18281a26d886eb9ccb543cf7386bbe7345061f2c32e78473e75011ff5b08cf68b91f04dc6bab288377d295d3e476774185e889bd01878c35388206 WHIRLPOOL d51b485b8995367bb758d50785e09c6f207a1c8cf936d6e1f4759521929ac02d5b569ebe4fde1afcd45387b452177e26bf24d0ff1da8e8acc7b04fdebd84911e
 DIST qxmpp-0.6.3.1-extras.tar.bz2 211653 SHA256 caedb40a26e450d18b567f19348deea49f0c2587c8ac4e0451969d6403753225 SHA512 25c012fbd7ce8d69aae12303186488488c736903d31763b491dba4af4840d64260831146b26c0a5a6e43b6dc03bc62d8ff0912050e5535b7cc20c584b6951c18 WHIRLPOOL 66aaa9fabced20c7fc2edaac10ab03353944005dc0eaaf49afd45d493d5358d1e416995f33d839a826ec56ab402e4cf66d500e6f9faae8a78a75e8878b72b7a5
 DIST qxmpp-0.7.4.tar.gz 1076965 SHA256 0aef904b29024d8435bde9d5e73e3e9ce47577f487a497cf2e8d10774fdf3b8d SHA512 a11c6073ba10ef699f1cf3d5a2001989a9babcfae3a6760525d808ce15a077b7031bcfc83dd73fd417d1e7415ae256eb7008457cac2e3204856444e5db53883d WHIRLPOOL 0bc602b03ff9d9ff5221fe2ff4a8c5b4564e758438492be7df4e8d0f76105ec9d3a867614210ae905975ee15c855d59eb2dcf68596d13426d122a54f4444f6cc
+DIST qxmpp-0.7.5.tar.gz 1075987 SHA256 0137da4b176e16bb72c5efde4cec7da750f25ce7d0f6bbb0fcfdccc8765e3d35 SHA512 399a034a7a30f545a890e3a8193de4c6a83d844ec3e6f75084b91f3260662d49d57ecf1f45c8df08136626077535ee7e580ff049a5950f0813352118e36873ea WHIRLPOOL 7c6c872523ff4403660bbb3d53696ecb90e7791f7d95347cfd09747499f8ad045480977aa08dcbdd7f031be24ac80d9df4d7730c52f9cdabdd98a584f1fc7848
--- a/net-libs/qxmpp/qxmpp-0.7.5.ebuild
+++ b/net-libs/qxmpp/qxmpp-0.7.5.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-0.7.5.ebuild,v 1.1 2013/01/14 16:53:52 pinkbyte Exp $
+
+EAPI=5
+
+inherit qt4-r2 multilib
+
+DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework."
+HOMEPAGE="http://code.google.com/p/qxmpp/"
+SRC_URI="http://qxmpp.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="debug doc test"
+
+RDEPEND="x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+	media-libs/speex"
+DEPEND="${RDEPEND}
+	test? ( x11-libs/qt-test:4 )"
+
+src_prepare(){
+	if ! use doc; then
+		sed -i \
+			-e '/SUBDIRS/s/doc//' \
+			-e '/INSTALLS/d' \
+			qxmpp.pro || die "sed for removing docs failed"
+	fi
+	if ! use test; then
+		sed -i -e '/SUBDIRS/s/tests//' \
+			qxmpp.pro || die "sed for removing tests failed"
+	fi
+	qt4-r2_src_prepare
+}
+
+src_configure(){
+	eqmake4 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)"
+}
+
+src_install() {
+	qt4-r2_src_install
+	if use doc; then
+		# Use proper path for documentation
+		mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${P} || die "doc mv failed"
+	fi
+}
--- a/net-libs/qxmpp/qxmpp-9999.ebuild
+++ b/net-libs/qxmpp/qxmpp-9999.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-9999.ebuild,v 1.11 2012/10/14 18:46:13 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-9999.ebuild,v 1.12 2013/01/14 16:53:52 pinkbyte Exp $

-EAPI=4
+EAPI=5

 EGIT_REPO_URI="https://code.google.com/p/qxmpp"

--- a/Show More
+++ b/Show More