Sync with portage [Tue Oct 30 20:25:41 MSK 2012].

2012-10-30 20:25:45 +04:00 · 2012-10-30 20:25:45 +04:00 · 3c6407c3aa
commit 3c6407c3aa
parent da8705df23
118 changed files with 2320 additions and 196 deletions
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@ -1 +1,2 @@
 DIST duplicity-0.6.19.tar.gz 1131760 SHA256 f16a388d1ac4f8daf2bf9ffc2b277422ca367a8e56b9cdb5de0cd36b95ea5731 SHA512 d8b5f9fbd48bc3787d51926dd97278c2be2661779da16b15efa4e431b1e0a7709f9fdcdb78cbfd8c3edd45bbe05c55c583feabd2f54abadc899102d469efafb3 WHIRLPOOL 8d2afddb3e985f08fd6530c0cd7a1351a344225eae5d6b7f6c0287c86b9f6d1c67d38422dddaaf3070a1891b36c4e77b796b317c36eac85e1a4232dabbeac85c
+DIST duplicity-0.6.20.tar.gz 1142460 SHA256 51d0c6751fced1a34bab57deb2a31982ae8ff534f0c0b5f78dc50e96d5711664 SHA512 841c338660c4181fba177abce6c5120fc03f6424afc05724dde3727f023058e6906fe9a7f21793650578c889882d826538572782fc49eaede4f5076ceb8daa4d WHIRLPOOL 97a4e26d62763cb308b00f5cf0a2c8652b6b82f6e647224d097f8f9a4bd2ddb7ed1f0957214c5c1219bb1eeac9423df275e4f9348025c9005584d5faab10de5c
--- a/app-backup/duplicity/duplicity-0.6.20.ebuild
+++ b/app-backup/duplicity/duplicity-0.6.20.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2012 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 $
+
+EAPI="4"
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit distutils
+
+DESCRIPTION="Secure backup system using gnupg to encrypt data"
+HOMEPAGE="http://www.nongnu.org/duplicity/"
+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"
+IUSE="s3"
+
+DEPEND="
+	net-libs/librsync
+	app-crypt/gnupg
+"
+RDEPEND="${DEPEND}
+	dev-python/paramiko
+	>=dev-python/pexpect-2.1
+	>=dev-python/py-gnupg-0.3.2
+	s3? ( dev-python/boto )
+"
+
+src_prepare() {
+	distutils_src_prepare
+	sed -i -r "s/'COPYING',//" setup.py || die "Couldn't remove unnecessary COPYING file."
+}
--- a/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild
+++ b/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild,v 1.3 2012/10/30 05:12:33 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.10.2-r3.ebuild,v 1.4 2012/10/30 12:01:54 ago Exp $

 EAPI=4

@ -26,7 +26,7 @@ else
 		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
 		${BACKPORTS:+
 			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 S="${WORKDIR}/${P%_rc*}"

--- a/app-misc/fslurp/Manifest
+++ b/app-misc/fslurp/Manifest
@ -1,3 +1,4 @@
 DIST fslurp-0.7.tgz 10156 SHA256 e3004708eb2855b234d454f6712d0f922da081375385f0349516f13039756a79 SHA512 c6cd8263916594407c42ecd4d3af3b82aa803e99be28512ea7dcd947fd940bc7e2f7566958f9cfa63c17a564ec3fe1d7cf804ea823eb5acc6ec23dec9b5be89f WHIRLPOOL e0c1cc3d2a5c748514e1f9b0467f0a55eb4d5d88aee67c97fd7b7e2da6d1331f23ef44597ce93143b8cce67c55fcf88499beb71f2e2ded5dcc3be458ba5a1f31
 DIST fslurp-0.8.tgz 10539 SHA256 54a37d89df1a351fe4aaf4734dd1dfc5afeda8951d5b72bc82f975ecc19cf9bc SHA512 a660d2cc31aea915f2028d2a524156bdf99abd9207ffb6457a7384e1d21042d4f20e1f089320b2d75404365c0af485206036462a66e521ed033b2b8c8d9cc61e WHIRLPOOL 622a64c42de1e3b7ac0b75cce6ab1677318c901e8cc4e8c6b3b84f69a03f521f06e81c7487b5630e9c5549eb7f55fca21c91a1a9411fa09caec520dd199a7f88
 DIST fslurp-0.9.tgz 22733 SHA256 2f0864e33a679407b37fd1d3c90f7ac0a83e0e2552ebcde257f3c65adba83747 SHA512 399c1441b849bb8a4b459916042d3dc883b81183438add27833aa2cac9cc2cb43b740a080dbadf22a99d35aa0e857e04c59bb6677e14980b472324b6244e5f1b WHIRLPOOL f734b3f1bf9ec92afaf027a1494708568415169317f995a0c111c596148be1cb4741b48ca04fc6b72cf06237f948a0d77476fa63aff9443ae49c58fb690ebdc6
+DIST fslurp-2.1.2.tgz 30088 SHA256 e952b90e6ca38a8263a6e3a508370ce8a35353ff730faf39fed5c261dcae3f7c SHA512 3eed2e48c2fac9c62d24c74394884e67d9ed671461f30cb4376892225d9b946c0abf3ea50cda212fc620700ac8a7f50a13b914b523f158fe141667b6fdbde685 WHIRLPOOL c584ba1a56d01665394cfa35f095caeb652bbd58a202b1cf314aa697620c8d417c02b68d2c4bc65b8946d92beeb693a12233319c587082808b2d72b5b8656ec7
--- a/app-misc/fslurp/files/fslurp-2.1.2-makefile.patch
+++ b/app-misc/fslurp/files/fslurp-2.1.2-makefile.patch
@ -0,0 +1,41 @@
+--- fslurp-2.1.2/Makefile
+++ fslurp-2.1.2/Makefile
+@@ -46,31 +46,31 @@
+ SIMINCLUDES	= simulator.h
+ 
+ #DEBUGFLAGS	= -g
+-CFLAGS		= -c -Wall $(DEBUGFLAGS)
+CFLAGS		+= -c -Wall $(DEBUGFLAGS)
+ 
+-LDFLAGS		= -lm
+LIBS		= -lm
+ 
+ VERSION		:= fslurp-$(shell tail -1 version)
+ 
+ all:		$(TARGETS)
+ 
+ fslurp:		$(FSLURP_OBJS)
+-		$(CC) $(LDFLAGS) $^ -o $@
+		$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ simSolarNet2i1s: \
+ 		$(SIMSOLARNET2I1S_OBJS)
+-		$(CC) $(LDFLAGS) $^ -o $@
+		$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ simSolarNet1i0s: \
+ 		$(SIMSOLARNET1I0S_OBJS)
+-		$(CC) $(LDFLAGS) $^ -o $@
+		$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ simSolarNet0i0s: \
+ 		$(SIMSOLARNET0I0S_OBJS)
+-		$(CC) $(LDFLAGS) $^ -o $@
+		$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ simIFCEasy:	$(SIMIFCEASY_OBJS)
+-		$(CC) $(LDFLAGS) $^ -o $@
+		$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ test:		$(TARGETS) clean
+ 		./testcase.sh 
--- a/app-misc/fslurp/fslurp-2.1.2.ebuild
+++ b/app-misc/fslurp/fslurp-2.1.2.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fslurp/fslurp-2.1.2.ebuild,v 1.1 2012/10/30 09:44:21 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Read and display data from Fronius IG and IG Plus inverters"
+HOMEPAGE="http://fslurp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCXX)"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc History README TODO
+}
--- a/app-office/openerp/Manifest
+++ b/app-office/openerp/Manifest
@ -0,0 +1,2 @@
+DIST openerp-6.1-1.tar.gz 73310629 SHA256 a89016d706f1693833590d2ce5cf7768fb3586213661014adad5ed16cdc77cd7 SHA512 0cf407fda4d7ce414b548310018609381157e656069b5224bb05ae6dbf7d534b9acbbb5be561ec1f9a26786ec6fc9b917fb78faff3c67340916f663ccb5297cf WHIRLPOOL 384ae795df9d23c07a6e06c0c468cb6d9af0c2625648bda5d895271f2d1e07d00b81e7da3d4255f709d5eed299166c65b29ec335a71307ea1a3f6775b590befe
+DIST openerp-6.2dev-20121029-000101.tar.gz 60636301 SHA256 f972f07077b0fa5e420860109bb7c640d8b49f84a3362a790cbf591544101d7c SHA512 e125cc753055bc3a567f7bdcd3283070ce41951fb44910cd11733a54786954efc3c66357de581dd9a72b57c3050eb9027c0634df8f9af48d1170fdeb17671b1c WHIRLPOOL 82754864f33314fd90414fe8bbb43c4f1abe44a413222ac4ccbfac5d6a050063521e6b6e9e5e2ef0f1a9f9cabdd333794ebb7af6a0657798270c795d60c77be3
--- a/app-office/openerp/files/openerp
+++ b/app-office/openerp/files/openerp
@ -0,0 +1,22 @@
+#!/sbin/runscript
+
+# Additional options that are passed to the daemon.
+DAEMON_OPTS="-c ${CONFIGFILE}"
+
+depend() {
+	after postgresql
+}
+
+start() {
+	ebegin "Starting openerp server"
+	start-stop-daemon --start --quiet --pidfile "${PIDFILE}" --exec /usr/bin/openerp-server \
+		--make-pidfile --user "${USER}" --background -- ${DAEMON_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping openerp server"
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" --signal 9
+	rm -f "${PIDFILE}"
+	eend $?
+}
--- a/app-office/openerp/files/openerp-6.1-setup.py.patch
+++ b/app-office/openerp/files/openerp-6.1-setup.py.patch
@ -0,0 +1,32 @@
+--- setup.py.old	2012-07-01 17:31:24.000000000 +0400
+++ setup.py	2012-07-01 17:33:52.000000000 +0400
+@@ -22,6 +22,7 @@
+ 
+ import glob, os, re, setuptools, sys
+ from os.path import join, isfile
+from distutils.sysconfig import get_python_lib
+ 
+ # List all data files
+ def data():
+@@ -32,7 +33,7 @@ def data():
+                 files.append(os.path.join(root, filename))
+     d = {}
+     for v in files:
+-        k=os.path.dirname(v)
+        k=os.path.join(get_python_lib(prefix=''), os.path.dirname(v))
+         if k in d:
+             d[k].append(v)
+         else:
+@@ -41,9 +42,9 @@ def data():
+     if os.name == 'nt':
+         r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
+ 
+-    import babel
+-    r.append(("localedata",
+-              glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata" , '*'))))
+#    import babel
+#    r.append(("localedata",
+#              glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata" , '*'))))
+ 
+     return r
+ 
--- a/app-office/openerp/files/openerp-confd
+++ b/app-office/openerp/files/openerp-confd
@ -0,0 +1,3 @@
+USER="openerp"
+CONFIGFILE="/etc/openerp/openerp.cfg"
+PIDFILE="/var/run/openerp/openerp.pid"
--- a/app-office/openerp/files/openerp.cfg
+++ b/app-office/openerp/files/openerp.cfg
@ -0,0 +1,64 @@
+[options]
+
+# General options:
+admin_passwd = admin
+
+pidfile = /var/run/openerp/openerp-server.pid
+interface =
+port = 8069
+netinterface =
+netport = 8070
+netrpc = True
+xmlrpc = True
+init =
+without_demo = False
+demo = {}
+update =
+cache_timeout = 100000
+stop_after_init = False
+debug_mode = False
+assert_exit_level = warn
+price_accuracy = 2
+
+# SSL Configuration:
+secure = False
+secure_cert_file = server.cert
+secure_pkey_file = server.pkey
+
+# Logging Configuration:
+logfile = /var/log/openerp/openerp-server.log
+syslog = False
+log_level = debug
+
+# SMTP Configuration:
+email_from = False
+smtp = localhost
+smtp_port = 25
+smtp_ssl = False
+smtp_user = False
+smtp_password = False
+
+# pg_path points at local pg instance - please change as needed
+# Database related options:
+db_user = openerp
+db_password = change_this
+pg_path = /run/postgresql/.s.PGSQL.5432
+db_name = False
+db_host = False
+db_port = False
+db_maxconn = 64
+import_partial =
+
+# Internationalisation options:
+language =
+translate_out =
+translate_in =
+translate_modules = ['all']
+
+# Security-related options:
+list_db = True
+server_actions_allow_code = False
+
+
+
+
--- a/app-office/openerp/files/openerp.logrotate
+++ b/app-office/openerp/files/openerp.logrotate
@ -0,0 +1,10 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp/files/openerp.logrotate,v 1.1 2012/10/30 09:27:35 patrick Exp $
+
+/var/log/openerp/*.log {
+ monthly
+ create 660 openerp openerp
+ missingok
+ copytruncate
+}
--- a/app-office/openerp/metadata.xml
+++ b/app-office/openerp/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
--- a/app-office/openerp/openerp-6.1.1.ebuild
+++ b/app-office/openerp/openerp-6.1.1.ebuild
@ -0,0 +1,106 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp/openerp-6.1.1.ebuild,v 1.1 2012/10/30 09:27:35 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils distutils
+
+DESCRIPTION="Open Source ERP & CRM"
+HOMEPAGE="http://www.openerp.com/"
+FNAME="${PN}-6.1-1"
+SRC_URI="http://nightly.openerp.com/6.1/releases/${FNAME}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="postgres ldap ssl"
+
+CDEPEND="postgres? ( dev-db/postgresql-server )
+	dev-python/lxml
+	dev-python/psycopg:2
+	dev-python/pychart
+	dev-python/reportlab
+	media-gfx/pydot
+	dev-python/vobject
+	dev-python/mako
+	dev-python/pyyaml
+	dev-python/Babel
+	dev-python/gdata
+	ldap? ( dev-python/python-ldap )
+	dev-python/python-openid
+	dev-python/werkzeug
+	dev-python/xlwt
+	dev-python/feedparser
+	dev-python/python-dateutil
+	dev-python/pywebdav
+	ssl? ( dev-python/pyopenssl )
+	dev-python/vatnumber
+	dev-python/zsi"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+OPENERP_USER="openerp"
+OPENERP_GROUP="openerp"
+
+S="${WORKDIR}/${FNAME}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-6.1-setup.py.patch"
+}
+
+src_install() {
+	distutils_src_install
+
+	doinitd "${FILESDIR}/${PN}"
+	newconfd "${FILESDIR}/openerp-confd" "${PN}"
+	keepdir /var/run/openerp
+	keepdir /var/log/openerp
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openerp.logrotate openerp || die
+	dodir /etc/openerp
+	insinto /etc/openerp
+	newins "${FILESDIR}"/openerp.cfg openerp.cfg || die
+}
+
+pkg_preinst() {
+	enewgroup ${OPENERP_GROUP}
+	enewuser ${OPENERP_USER} -1 -1 -1 ${OPENERP_GROUP}
+
+	fowners ${OPENERP_USER}:${OPENERP_GROUP} /var/run/openerp
+	fowners ${OPENERP_USER}:${OPENERP_GROUP} /var/log/openerp
+	fowners -R ${OPENERP_USER}:${OPENERP_GROUP} "$(python_get_sitedir)/${PN}/addons/"
+
+	use postgres || sed -i '6,8d' "${D}/etc/init.d/openerp" || die "sed failed"
+}
+
+pkg_postinst() {
+	chown ${OPENERP_USER}:${OPENERP_GROUP} /var/run/openerp
+	chown ${OPENERP_USER}:${OPENERP_GROUP} /var/log/openerp
+	chown -R ${OPENERP_USER}:${OPENERP_GROUP} "$(python_get_sitedir)/${PN}/addons/"
+
+	elog "In order to setup the initial database, run:"
+	elog " emerge --config =${CATEGORY}/${PF}"
+	elog "Be sure the database is started before"
+}
+
+pquery() {
+	psql -q -At -U postgres -d template1 -c "$@"
+}
+
+pkg_config() {
+	einfo "In the following, the 'postgres' user will be used."
+	if ! pquery "SELECT usename FROM pg_user WHERE usename = '${OPENERP_USER}'" | grep -q ${OPENERP_USER}; then
+		ebegin "Creating database user ${OPENERP_USER}"
+		createuser --username=postgres --createdb --no-adduser ${OPENERP_USER}
+		eend $? || die "Failed to create database user"
+	fi
+}
--- a/app-office/openerp/openerp-6.2_pre20121029.ebuild
+++ b/app-office/openerp/openerp-6.2_pre20121029.ebuild
@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp/openerp-6.2_pre20121029.ebuild,v 1.1 2012/10/30 13:42:07 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils distutils
+
+DESCRIPTION="Open Source ERP & CRM"
+HOMEPAGE="http://www.openerp.com/"
+#yes, this is definitely a horrible URI
+FNAME="${PN}-${PV/_*/}dev-${PV/*_pre/}-000101"
+SRC_URI="http://nightly.openerp.com/trunk/nightly/src/${FNAME}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="postgres ldap ssl"
+
+CDEPEND="postgres? ( dev-db/postgresql-server )
+	dev-python/psutil
+	dev-python/docutils
+	dev-python/lxml
+	dev-python/psycopg:2
+	dev-python/pychart
+	dev-python/reportlab
+	media-gfx/pydot
+	dev-python/vobject
+	dev-python/mako
+	dev-python/pyyaml
+	dev-python/Babel
+	dev-python/gdata
+	ldap? ( dev-python/python-ldap )
+	dev-python/python-openid
+	dev-python/werkzeug
+	dev-python/xlwt
+	dev-python/feedparser
+	dev-python/python-dateutil
+	dev-python/pywebdav
+	ssl? ( dev-python/pyopenssl )
+	dev-python/vatnumber
+	dev-python/zsi"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+OPENERP_USER="openerp"
+OPENERP_GROUP="openerp"
+
+S="${WORKDIR}/${FNAME}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-6.1-setup.py.patch"
+}
+
+src_install() {
+	distutils_src_install
+
+	doinitd "${FILESDIR}/${PN}"
+	newconfd "${FILESDIR}/openerp-confd" "${PN}"
+	keepdir /var/run/openerp
+	keepdir /var/log/openerp
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openerp.logrotate openerp || die
+	dodir /etc/openerp
+	insinto /etc/openerp
+	newins "${FILESDIR}"/openerp.cfg openerp.cfg || die
+}
+
+pkg_preinst() {
+	enewgroup ${OPENERP_GROUP}
+	enewuser ${OPENERP_USER} -1 -1 -1 ${OPENERP_GROUP}
+
+	fowners ${OPENERP_USER}:${OPENERP_GROUP} /var/run/openerp
+	fowners ${OPENERP_USER}:${OPENERP_GROUP} /var/log/openerp
+	fowners -R ${OPENERP_USER}:${OPENERP_GROUP} "$(python_get_sitedir)/${PN}/addons/"
+
+	use postgres || sed -i '6,8d' "${D}/etc/init.d/openerp" || die "sed failed"
+}
+
+pkg_postinst() {
+	chown ${OPENERP_USER}:${OPENERP_GROUP} /var/run/openerp
+	chown ${OPENERP_USER}:${OPENERP_GROUP} /var/log/openerp
+	chown -R ${OPENERP_USER}:${OPENERP_GROUP} "$(python_get_sitedir)/${PN}/addons/"
+
+	elog "In order to setup the initial database, run:"
+	elog " emerge --config =${CATEGORY}/${PF}"
+	elog "Be sure the database is started before"
+}
+
+pquery() {
+	psql -q -At -U postgres -d template1 -c "$@"
+}
+
+pkg_config() {
+	einfo "In the following, the 'postgres' user will be used."
+	if ! pquery "SELECT usename FROM pg_user WHERE usename = '${OPENERP_USER}'" | grep -q ${OPENERP_USER}; then
+		ebegin "Creating database user ${OPENERP_USER}"
+		createuser --username=postgres --createdb --no-adduser ${OPENERP_USER}
+		eend $? || die "Failed to create database user"
+	fi
+}
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@ -2,3 +2,4 @@ DIST lcdf-typetools-2.91.tar.gz 614362 SHA256 5b8fd4bec23c6e584c2d5289ff5b84c859
 DIST lcdf-typetools-2.92.tar.gz 588653 SHA256 a7a9eeab572f4f392870f6e70e291235af18633b30ac179342efb5e99b426860 SHA512 b8d8812d09375fc6879ac523cd48c4f18f08af0dfbac6c5e920c1bf53a8d5c4ce187f7dba0001995f62ded3e41129d82302465dcd23bcf432bb66b976de0ab76 WHIRLPOOL eb0688160b4aff434cb8fee2190d3970598a46efd23d158aa123ded05cb9d2d0bcc420ce5f9b58e164b8abcaab58ed74ac46cc8ff6bae67f3b3fe18bdd6e9deb
 DIST lcdf-typetools-2.94.tar.gz 617639 SHA256 0d66e64fa59aed1722cf45a862f63e2d7d5b47915528abe76c29441d12fca29f SHA512 dd8c6c277fb247b9cad636ea3dd93b5d99c879b710117a1c06e874f826bc361e47e61564e9bc45a33a148a630707df824c572e23be433f36c6348b303ce25ebc WHIRLPOOL 32a1cd769a8e55175fb716e23f52280f5d6112ba60809ee3f49bd448ea072e9698b3ea9dba672504e09cbaebecab658912eb06ab4645dc11f2edefbedd39f8e8
 DIST lcdf-typetools-2.95.tar.gz 620404 SHA256 4fad43cd22d3e5f2aa9953d1619f6491abd99d4f52a28be49f5944d5d22b2ec2 SHA512 600b2c6b65238885bbf5d85f23f8fa232c59c8ac5bc7bac5490f5d2079df8b0fa45e19ad66b1a69b9135901a9bee235a7b8d0575f40e47d52a1686a5db49594b WHIRLPOOL d37a459f75895b6d372c2cd2ccaf86005af8d897db53a19ac7d83d1aa68345c4eb0847fd2711009cdf10b587915647c0e12a20d7fd14ee183f1ec099fb241623
+DIST lcdf-typetools-2.97.tar.gz 616431 SHA256 761746041c669fa3673a3e90ec7a247abd0e2782bdddf0fc5d7ab70b33b6f975 SHA512 8812436843721b7134ec796549092854050d1e9017fef048a62e7aa0e866d20e9757b246dbad738cdf8d8583afada3a2db9c6c7dc2546154cafd4dcd0f27f7f2 WHIRLPOOL 767a2a74a9f9b7a0c29407178b96a1455da39239b835f59def2ae77db068655a8953362c6f8d48a8a31fb6fc40dea405c0e6eb276fe60750e9dfbb11954bd972
--- a/app-text/lcdf-typetools/lcdf-typetools-2.97.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.97.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.97.ebuild,v 1.1 2012/10/30 11:46:30 aballier Exp $
+
+EAPI=2
+
+DESCRIPTION="Font utilities for eg manipulating OTF"
+SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
+HOMEPAGE="http://www.lcdf.org/type/#typetools"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="+kpathsea"
+
+DEPEND="kpathsea? ( virtual/tex-base )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf $(use_with kpathsea)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc NEWS README ONEWS
+}
--- a/dev-libs/confuse/confuse-2.7.ebuild
+++ b/dev-libs/confuse/confuse-2.7.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.7.ebuild,v 1.11 2012/08/20 03:17:01 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.7.ebuild,v 1.12 2012/10/30 11:18:49 blueness Exp $

 EAPI=3

@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/confuse/${P}.tar.gz"

 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="nls static-libs"

 DEPEND="sys-devel/flex
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@ -1 +1,2 @@
 DIST starpu-1.0.2.tar.gz 2896034 SHA256 0c893a979e35bb67158f2a0c5c4c9bd28ffb6b0ac07de9a3cbabb03c69adc557 SHA512 fe44aa66f7f6053a1ef2ea2da046094baaff5ef75321295aa00d17d6fe431197b9b4d12444ff001fb67df3a449a397d209fae984958ccd3704ce852d05946f49 WHIRLPOOL a841120fcb8119a89d550e5b18ff7103308ea3a800ec9480b6398ca527829c72721fcd4a552f4d400243463c740de344e0f256d9ef7fbb7b59a4bc833c84b850
+DIST starpu-1.0.4.tar.gz 3002519 SHA256 bd64dcb49339f1522869398c19e1a98a8697310e3ec0873eba45bde00bef3436 SHA512 58625fcc6e9e6e9b26e111c44f145c2f3e2fbc0ecfe175487e34134fa04f568aa42d8e67aaf05572a4a52e2b1c277f9105a7a3854cfbe09eb25453030f92672e WHIRLPOOL a819671dbcc09c7882e21f14907f3459e0b138dda91d73a78935ce2b3512543398366ac036f1924940fddddc38a99d3e8eae77e25cc24db92fafab2d9c82a030
--- a/dev-libs/starpu/starpu-1.0.2.ebuild
+++ b/dev-libs/starpu/starpu-1.0.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/starpu-1.0.2.ebuild,v 1.2 2012/08/15 18:30:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/starpu-1.0.2.ebuild,v 1.3 2012/10/30 15:00:48 bicatali Exp $

 EAPI=4

@ -17,7 +17,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"

-IUSE="blas cuda doc examples fftw gcc-plugin mpi opencl qt4 static-libs test"
+IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl qt4 static-libs test"
 RDEPEND="sys-apps/hwloc
 	sci-mathematics/glpk
 	blas? ( virtual/blas )
@ -42,16 +42,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.1-no-pc-ldflags.patch
 )

-src_prepare() {
-	# do not force -Werror, Gentoo bug #423011
-	sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' configure.ac || die
-	autotools-utils_src_prepare
-}

 src_configure() {
 	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
 	local myeconfargs=(
 		$(use_enable cuda)
+		$(use_enable debug)
 		$(use_enable fftw starpufft)
 		$(use_enable gcc-plugin gcc-extensions)
 		$(use_enable opencl)
--- a/dev-libs/starpu/starpu-1.0.4.ebuild
+++ b/dev-libs/starpu/starpu-1.0.4.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/starpu-1.0.4.ebuild,v 1.1 2012/10/30 15:00:48 bicatali Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils toolchain-funcs
+
+PID=31588
+
+DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
+HOMEPAGE="http://runtime.bordeaux.inria.fr/StarPU/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl qt4 static-libs test"
+RDEPEND="sys-apps/hwloc
+	sci-mathematics/glpk
+	blas? ( virtual/blas )
+	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
+	fftw? ( sci-libs/fftw:3.0 )
+	mpi? ( virtual/mpi )
+	opencl? ( virtual/opencl )
+	qt4? (  >=x11-libs/qt-gui-4.7:4
+			>=x11-libs/qt-opengl-4.7:4
+			>=x11-libs/qt-sql-4.7:4
+			x11-libs/qwt )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( gcc-plugin? ( dev-scheme/guile ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.1-respect-cflags.patch
+	"${FILESDIR}"/${PN}-1.0.1-system-blas.patch
+	"${FILESDIR}"/${PN}-1.0.1-no-pc-ldflags.patch
+)
+
+src_configure() {
+	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+	local myeconfargs=(
+		$(use_enable cuda)
+		$(use_enable debug)
+		$(use_enable fftw starpufft)
+		$(use_enable gcc-plugin gcc-extensions)
+		$(use_enable opencl)
+		$(use_enable qt4 starpu-top)
+		$(use_with mpi mpicc "$(type -P mpicc)")
+		$(use mpi && use_enable test mpi-check)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	use doc && dodoc doc/*.pdf
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+	fi
+}
--- a/dev-ml/ocaml-sha/Manifest
+++ b/dev-ml/ocaml-sha/Manifest
@ -1 +1,2 @@
 DIST ocaml-sha-1.7.tar.gz 11909 SHA256 ddc9bf6baff81e2ec9280c404880d4b9b02e154af8343cb0f697d0f4dc8a4c09 SHA512 3f76e21a07565bc499a8ae56dc3096b0db9d6fe99dafec4368b390f242ef6bb5492427447915ccd41bcda1f165ae92cee38ba1252246b1d146dd65ce4660609b WHIRLPOOL 0ac38a2de16ff8da01c57b9cde0eaf8b1df755220f06bba57dddfddeffd99b08ee2eb64a59c67f4e08a51897ef4dd9e63618419ec47264968c83b374a9859579
+DIST ocaml-sha-1.8.tar.gz 11911 SHA256 473c67cc95629ed7bf788bdc08a6d829dc953c223628bc030ecaa28c0cf3245d SHA512 53a0c86d239a4b98b4ce5236c20f97273f9bb4cde539ed248712cdb35fa49df998db2b5a57343e555907848885a46846e932934d15477ad65c321d9e2a5c1e60 WHIRLPOOL a8309f445ac95ac9c497afadd5285420310e09687bfde1de60c2bfb1d838611cca15c6ae80d1e4a8e90379d304d510875e8249931ac2a39950df1037a38a9a12
--- a/dev-ml/ocaml-sha/ocaml-sha-1.8.ebuild
+++ b/dev-ml/ocaml-sha/ocaml-sha-1.8.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-sha/ocaml-sha-1.8.ebuild,v 1.1 2012/10/30 11:42:23 aballier Exp $
+
+EAPI=4
+
+inherit findlib vcs-snapshot
+
+DESCRIPTION="A binding for SHA interface code in OCaml"
+HOMEPAGE="http://github.com/vincenthz/ocaml-sha"
+SRC_URI="http://nodeload.github.com/vincenthz/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-3.12[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_install() {
+	findlib_src_install
+	dodoc README
+}
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.2.ebuild
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.2.ebuild,v 1.1 2012/04/19 08:57:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.2.ebuild,v 1.2 2012/10/30 11:03:54 ago Exp $

 EAPI=3

@ -16,5 +16,5 @@ HOMEPAGE="http://pypi.python.org/pypi/pybloomfiltermmap"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@ -3,3 +3,4 @@ DIST requests-0.13.6.tar.gz 520031 SHA256 3cca63908f1b941d2da61ef0e8baf7bf014cc0
 DIST requests-0.13.9.tar.gz 522477 SHA256 d887bb1c06948a8930d6e73a1f942f9febe9157a299a984994c20c84b2c21e20 SHA512 6c83e5c82b4b737db1fee63dbb5997a2cf28d79445b2c5d3ca11a43221a3e79f20731c120960a90d144cfd138c110cab024aacd76c7d6ba9299b5da99a2c95d1 WHIRLPOOL fdcf06724b753d4537778aab811421c60fc8d6279e730ead1b4b3f75fa16c33426e0629cbbcad413d8585b078ed069b3c5b7fe89482ead8eeaf167c53c812707
 DIST requests-0.14.0.tar.gz 523133 SHA256 4e690ba0275ab4a8c9a5c7a6eb14e79e1adad0f84331fc638a18d7751f41ac3b SHA512 e7133e1d465f53dc5817b1dba5199f6e0bf1ca55a6280796630c8eddd73a04932d89d257803bcba5a0bf49b965dc70b170769a17825061dafac41be13ca37b00 WHIRLPOOL cbc55c151aa6e46331babec5693e8605c1864a7b7d91c263bbe682060c56d94db5a3d07308eaf466da9eecc6976a204d771df4c96d88b7750b9bd8dcd054631f
 DIST requests-0.14.1.tar.gz 523254 SHA256 4f563b907782b2c95dd2cbaf882a96133e567d46290a0e7aafa0c6f3efad19ba SHA512 84b1828e5e7d597cb308a53fb6df6e133e80aeecae53224ed578f01fbfc2f06d0e015d3bd0e2fe9efb443222bd1bfc07c147dfbce2250d69e49e34ed02738714 WHIRLPOOL 5194f63da07c69c04e819e7d5a8d6a3a1b9828b057967af35aed7df3d0ba7a2b7184d13a798a880db7c4aac3221416d2ae1cdfa38b2fa885e1615d21170a531a
+DIST requests-0.14.2.tar.gz 361488 SHA256 0e3345a8ac0d712bf17bd9d3276415050c5f972265ab62993cd4540a3a1aaaef SHA512 d791f68b2fdc46ad6abaf2bcd49a038a335fddb476f89c6b7023370c716f0165a8ad09e8d0d1f3d145255d604c2d10f810e4090facd2381515b43f2306ca0365 WHIRLPOOL ed71a4a4db8279e1587d32dfb3dc2c219a87267e484bf23915db158c8843eea4d396d439e12919c29cb37677bb0b2615c87cabbd602a7de25a0273aca302c6ba
--- a/dev-python/requests/requests-0.14.2.ebuild
+++ b/dev-python/requests/requests-0.14.2.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.14.2.ebuild,v 1.1 2012/10/30 09:37:14 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="*:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils eutils
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/ http://pypi.python.org/pypi/requests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="app-misc/ca-certificates
+	dev-python/chardet
+	dev-python/oauthlib
+	dev-python/urllib3"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+src_prepare() {
+	# use system libs for chardet, oauthlib, and urllib3
+	rm -r requests/packages || die
+	epatch "${FILESDIR}"/${PN}-0.14.1-system-libs.patch
+
+	# use system ca-certificates
+	rm requests/cacert.pem || die
+	epatch "${FILESDIR}"/${PN}-0.14.1-system-cacerts.patch
+
+	# Different packages are installed depending on the python version.
+	# Need to remove stale egg-info data and build in separate directories.
+	rm -r requests.egg-info || die
+
+	distutils_src_prepare
+}
+
+src_test() {
+	echoit() { echo "$@"; "$@"; }
+	testing() {
+		echoit nosetests --verbosity=1 tests/*.py
+	}
+	python_execute_function testing
+}
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@ -3,3 +3,4 @@ DIST SQLAlchemy-0.7.5.tar.gz 2562719 SHA256 7e31190a15753694dcb6f4399ce7d02091b0
 DIST SQLAlchemy-0.7.6.tar.gz 2597214 SHA256 606a48a2d53ad959043347dec1d9f9cc561d9b66d79f463a7a8fe302058119e5 SHA512 1e5b2274a87542160c65cd6a09272e6dd45aef8f9499c29e5b0eef5cde961fcabbffb1ebe801d2815f480866816e71a3b0dabda8b77e74a778fac0541a379d47 WHIRLPOOL f820e86f5db896d7f0d51787f9c9e1f6f12b8aa9e292ecb0dc4f4821dc3293e06fbcc321bb7a7d53b16aa91fe91a083e3c0791bde43f2dc1c00755d385b4240a
 DIST SQLAlchemy-0.7.7.tar.gz 2602780 SHA256 b405621bba1b2c1e760e670a9b06d7315aea5f2921b3270bd417a45b415c0502 SHA512 02ee0d77a54d1fd12993d29264f3f03f29a0fc18a10ea19e03ac7860f853954ca9ba45a6550591d76b729cc635cd562c02e8fcca23ec356c3af829b547a8bb62 WHIRLPOOL 32ae95fae63d3bac010be2f6b0e678a3d03555817ff6c0deeef92a72faf5a303dc506d9eb9415df4f00ac9d3a4cf5aabad4df1bd9186e1d97e338228407c0420
 DIST SQLAlchemy-0.7.8.tar.gz 2611374 SHA256 13daccf34a660ab4708766bb18f49b50368bdbd6a1a8b409104f725f7f562dc8 SHA512 976ffd18ca4c824debbbdb7c66d6eed377a7eda0850873334f8b238318a321556303353a2abd03fae2e82c6abb9fb79b8eb46102cfd6ac7932bcfd9a9864f381 WHIRLPOOL 1d0c690fec18adbbd747f3d9dd922aaaa43e94a14c74054b82991371634ff75fd6d72f8885f130f5bd6bf735576a589b711b32b139d1729fbf8a6f1c9af55f02
+DIST SQLAlchemy-0.7.9.tar.gz 2649932 SHA256 4a89556cb55275d1af694dc4d5700d8bf0f83690bac16ab30340092ff25bb4d7 SHA512 b221bd854d33c6d59386c060e39594947761248108b8f7ddad16d243a70171bce93f6fa30e8d563d058f969fb2bd9f4c1b6bd5b8a2d097f0bbba8de860cb0e0f WHIRLPOOL a532e07e27fc676d32e184fc7ff0074dad44918985dbac82da404521e851cd2839785a2762826d47141c0091d3f84a938ae3aa074eb37c572fe08af1e30b3ca7
--- a/dev-python/sqlalchemy/sqlalchemy-0.7.9.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.7.9.ebuild
@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.7.9.ebuild,v 1.1 2012/10/30 09:43:19 patrick Exp $
+
+EAPI="4"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_TESTS_RESTRICTED_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit distutils
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples firebird mssql mysql postgres +sqlite test"
+
+RDEPEND="dev-python/setuptools
+	firebird? ( dev-python/kinterbasdb )
+	mssql? ( dev-python/pymssql )
+	mysql? ( dev-python/mysql-python )
+	postgres? ( >=dev-python/psycopg-2 )
+	sqlite? (
+		>=dev-db/sqlite-3.3.13
+		|| ( >=dev-lang/python-2.5[sqlite] dev-python/pysqlite )
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-db/sqlite-3.3.13
+		>=dev-python/nose-0.10.4
+		|| ( >=dev-lang/python-2.5[sqlite] dev-python/pysqlite )
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+DISTUTILS_GLOBAL_OPTIONS=("2.*-cpython --with-cextensions")
+PYTHON_MODNAME="sqlalchemy"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -fr test/aaa_profiling
+}
+
+src_test() {
+	testing() {
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" sqla_nose.py
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		pushd doc > /dev/null
+		rm -fr build
+		dohtml -r [a-z]* _images _static
+		popd > /dev/null
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
--- a/dev-python/sqlobject/Manifest
+++ b/dev-python/sqlobject/Manifest
@ -5,3 +5,4 @@ DIST SQLObject-1.2.0.tar.gz 258950 SHA256 2fcc271871045ba9b0547d8457555cf1e410a5
 DIST SQLObject-1.2.2.tar.gz 259182 SHA256 34b9cbbe1cdb78d9855ef25ddd079288afe0cee7876be97285a860e43b7a3bc8 SHA512 d99cb4a0178abd50ea2528c2a5615cd8a34d1aea06c91ec4bf7d3843d9096499c1566cdc0d0ce4d132eaff3aff66d364b8fc0ade77d000c3dc2937cacb033323 WHIRLPOOL fd797ff4ccbe9d0fe463a4853c00f1bc5fa22aac74df58527ef23d7e254d5e67ad4e667dc1060a1aff92875250be96c6b6b7cb2022de404c2cdfa728d32384fa
 DIST SQLObject-1.3.0.tar.gz 261577 SHA256 725ef05c633f2aa2fd897c4799139cb7764caee2af149561b399824a4fbcf927 SHA512 b5e1bad068098773a8d3b69cf3747220bb39a2f9cc4886e011a152498c3327d3fd827a6b832d77fd10d4b3aff911871a86767e65668bc3a686ea5db952eeae93 WHIRLPOOL ac0d4d91ff99682d98ab95e74c75befd0d1f2a6694b60304678bd4cc22780362b513b37bece0df2eae74ee798e6faa0ff4df9a8d78b37a64fb161738f68cc649
 DIST SQLObject-1.3.1.tar.gz 261767 SHA256 a3a33eb6fb2c683c8a379f5a51a45505b8c4b2153b61114a4708f868366abcb3 SHA512 fd98f5a100f78aed920924739e17736fe5f38e0b327a629bfa5986542553ad5f5b3cf7cbbd424bd970c24c4e6e34f1c254559ec31068f241882859c041381c78 WHIRLPOOL 519dfce93e2e696614f63c1277e19f8b1d9107e0c3f3b95f138e8d2032044c90d4adcc95db3deb18d23c81e352008a192aef2b5651710d849d14e811cc178d82
+DIST SQLObject-1.3.2.tar.gz 261984 SHA256 f45ab1ef285b32e83732d5a2539245353fcf89e107e087713cb1e2f0aaeb0b89 SHA512 10f706b2baa611e0ff4262f3ff4b63300cbd6e1c6cbb7b5eb43d2cc9c15a25a8d65bf07273278c78ea5b0fd086d9e78de72223e86ba46cf4a07837ce44a61d73 WHIRLPOOL ab0021890ef18893eccbdfab8b26bf0698a1816a16495fb2e9044bb1e87f920707f5efe2b6216d95c0a0d2f28b02c4afd5b7b7e5380db81edad624236cf9787d
--- a/dev-python/sqlobject/sqlobject-1.3.2.ebuild
+++ b/dev-python/sqlobject/sqlobject-1.3.2.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-1.3.2.ebuild,v 1.1 2012/10/30 10:00:21 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils
+
+MY_PN="SQLObject"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Object-Relational Manager, aka database wrapper"
+HOMEPAGE="http://sqlobject.org/ http://pypi.python.org/pypi/SQLObject"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc firebird mysql postgres sqlite"
+
+RDEPEND=">=dev-python/formencode-0.2.2
+		firebird? ( >=dev-python/kinterbasdb-3.0.2 )
+		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
+		postgres? ( dev-python/psycopg )
+		sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite ) )"
+DEPEND="${RDEPEND}
+		dev-python/setuptools"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		pushd docs
+		dodoc *.txt || die "dodoc failed"
+		dohtml -r presentation-2004-11 || die "dohtml failed"
+		insinto /usr/share/doc/${PF}
+		doins -r europython || die "doins failed"
+		popd
+	fi
+}
--- a/dev-python/vatnumber/Manifest
+++ b/dev-python/vatnumber/Manifest
@ -0,0 +1 @@
+DIST vatnumber-1.0.tar.gz 21693 SHA256 6ef6103f7ecf09cdf32b87bb1c87616b72b9546e4b364a3b66d2b0b4b340665a SHA512 b21a4afd63e2070b7934d19bf28e5f722a3135e165e438ff68080c1a66719d4dfe7da7b33880d684be6d872ef6bc3aab77a05c3cd7ed5790c3d04f26d563ec10 WHIRLPOOL 42efc62182c8037c1ff44c68e5052d33a50c356d1b71833843f292e444b68b78cecb091bda4c179bb2c7c87a9c852851d5472e21a1a5d76d759ccf4a07871739
--- a/dev-python/vatnumber/metadata.xml
+++ b/dev-python/vatnumber/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<longdescription lang="en">
+		Python module to validate VAT numbers
+	</longdescription>
+	<use>
+		<flag name="vies">Enable VIES</flag>
+	</use>
+</pkgmetadata>
+
--- a/dev-python/vatnumber/vatnumber-1.0.ebuild
+++ b/dev-python/vatnumber/vatnumber-1.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/vatnumber/vatnumber-1.0.ebuild,v 1.1 2012/10/30 09:09:36 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+DISTUTILS_SRC_TEST="setup.py"
+
+inherit distutils
+
+DESCRIPTION="Module to validate VAT numbers"
+HOMEPAGE="http://code.google.com/p/vatnumber/"
+SRC_URI="http://vatnumber.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test vies"
+
+RDEPEND="vies? ( dev-python/suds )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+	test? ( dev-python/suds )"
+
+PYTHON_MODNAME="vatnumber"
+
+src_install() {
+	distutils_src_install
+	dodoc COPYRIGHT README CHANGELOG
+}
--- a/games-action/bzflag/bzflag-2.4.2.ebuild
+++ b/games-action/bzflag/bzflag-2.4.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/bzflag-2.4.2.ebuild,v 1.4 2012/10/22 12:43:40 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/bzflag/bzflag-2.4.2.ebuild,v 1.5 2012/10/30 12:01:01 ago Exp $

 EAPI=4
 inherit autotools eutils flag-o-matic games
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE="dedicated sdl upnp"

 UIDEPEND="virtual/opengl
--- a/games-board/domination/domination-1.1.1.1.ebuild
+++ b/games-board/domination/domination-1.1.1.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/domination/domination-1.1.1.1.ebuild,v 1.1 2012/09/14 07:06:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/domination/domination-1.1.1.1.ebuild,v 1.2 2012/10/30 12:01:28 ago Exp $

 inherit eutils java-pkg-2 java-ant-2 games

@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/domination/Domination_${PV}.zip"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~x86 ~x86-fbsd"
 IUSE=""

 RDEPEND=">=virtual/jre-1.4"
--- a/games-emulation/fbzx/fbzx-2.10.0.ebuild
+++ b/games-emulation/fbzx/fbzx-2.10.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/fbzx/fbzx-2.10.0.ebuild,v 1.3 2012/10/17 03:05:30 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/fbzx/fbzx-2.10.0.ebuild,v 1.4 2012/10/30 11:11:44 ago Exp $

 EAPI=2
 inherit eutils games
@ -11,7 +11,7 @@ SRC_URI="http://www.rastersoft.com/descargas/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""

 RDEPEND="media-libs/libsdl[video]
--- a/games-rpg/egoboo/egoboo-2.8.1.ebuild
+++ b/games-rpg/egoboo/egoboo-2.8.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/egoboo-2.8.1.ebuild,v 1.5 2012/10/17 03:06:16 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/egoboo-2.8.1.ebuild,v 1.6 2012/10/30 11:11:59 ago Exp $

 EAPI=2
 inherit eutils games
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

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

 DEPEND="virtual/opengl
--- a/games-strategy/asc/asc-2.5.0.0.ebuild
+++ b/games-strategy/asc/asc-2.5.0.0.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/asc-2.5.0.0.ebuild,v 1.3 2012/06/22 07:45:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/asc-2.5.0.0.ebuild,v 1.4 2012/10/30 15:07:24 tupone Exp $

-EAPI=2
+EAPI=4
 WX_GTK_VER=2.8
-inherit toolchain-funcs flag-o-matic wxwidgets games
+inherit eutils toolchain-funcs flag-o-matic wxwidgets games

 DESCRIPTION="turn based strategy game designed in the tradition of the Battle Isle series"
 HOMEPAGE="http://www.asc-hq.org/"
@ -19,7 +19,6 @@ KEYWORDS="amd64 x86"
 IUSE=""

 RDEPEND="app-arch/bzip2
-	virtual/jpeg
 	media-libs/libsdl
 	media-libs/libpng
 	media-libs/sdl-image[gif,jpeg,png]
@ -27,18 +26,20 @@ RDEPEND="app-arch/bzip2
 	media-libs/sdl-sound
 	dev-libs/boost
 	dev-games/physfs
-	media-libs/libvorbis
 	media-libs/xvid
 	dev-libs/expat
 	media-libs/freetype
 	dev-lang/lua
 	x11-libs/wxGTK:2.8[X]
 	dev-libs/libsigc++:1.2"
+
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	virtual/pkgconfig
 	app-arch/zip"

+PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
+
 src_unpack() {
 	local f

@ -61,15 +62,13 @@ src_configure() {
 		replace-flags -O3 -O2
 	fi
 	egamesconf \
-		--disable-dependency-tracking \
 		--disable-paraguitest \
 		--disable-paragui \
 		--datadir="${GAMES_DATADIR_BASE}"
 }

 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
+	default
 	dohtml -r doc/*
 	prepgamesdirs
 }
--- a/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch
+++ b/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch
@ -0,0 +1,41 @@
+--- source/graphics/drawing.h.old	2012-10-30 10:33:47.617844756 +0100
+++ source/graphics/drawing.h	2012-10-30 10:46:23.444784874 +0100
+@@ -169,7 +169,7 @@
+          PixelType* pix = (PixelType*)( surf.pixels() );
+          pix += pos.y * surf.pitch()/pixelsize + pos.x;
+ 
+-         assign ( src, pix );
+         this->assign ( src, pix );
+       };
+ };
+ 
+--- source/graphics/blitter.h.old	2012-10-30 12:21:14.767021349 +0100
+++ source/graphics/blitter.h	2012-10-30 12:22:18.492472029 +0100
+@@ -928,6 +928,7 @@
+       ;
+ };
+ 
+#include "drawing.h"
+ 
+ 
+ extern const int ColorMerger_Alpha_XLAT_Table_shadings[8]; 
+--- source/itemrepository.cpp.old	2012-10-30 10:32:06.771697823 +0100
+++ source/itemrepository.cpp	2012-10-30 12:23:42.973448933 +0100
+@@ -88,7 +88,7 @@
+    t->filename = fileName;
+    t->location = location;
+    t->archive = prc.getArchive();
+-   add ( t );
+   this->add ( t );
+ }
+ 
+ 
+@@ -110,7 +110,7 @@
+       t->archive = stream.readString();
+       dataLoaderTicker();
+ 
+-      add ( t );
+      this->add ( t );
+       // add ( T::newFromStream(stream ));
+    }
+ }
--- a/mail-filter/anubis/Manifest
+++ b/mail-filter/anubis/Manifest
@ -1 +1 @@
-DIST anubis-4.1.1.tar.gz 1104272 RMD160 4c21b871c4a8c486783184a4400dce8bfd6757a8 SHA1 d2960606bf8bda3438a75d668fc12a711f70d353 SHA256 93ef7a2d8bc3b50cd2e228cfe27e296ee14accadf8533bad9b2beee88a96e8fa
+DIST anubis-4.1.1.tar.gz 1104272 SHA256 93ef7a2d8bc3b50cd2e228cfe27e296ee14accadf8533bad9b2beee88a96e8fa SHA512 51e9c3a4cc4f217348522ba196daf26908f5ebed1abbe8c3f4c876847284e1f43f19d5cc68cde3cae5aacc55d42b7a6786f9afb23856c647ddf6d6c4b6c0a7a7 WHIRLPOOL 316e6d19b87b80f4f7c97899972deb31ca6d1797abb28d9a5eb4b8792f324bd69bf84a1f978e37cd4d98cbeead01a27cdb53a670a7e25d8ac2ed7860492a5b86
--- a/mail-filter/anubis/anubis-4.1.1-r1.ebuild
+++ b/mail-filter/anubis/anubis-4.1.1-r1.ebuild
@ -0,0 +1,95 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/anubis/anubis-4.1.1-r1.ebuild,v 1.1 2012/10/30 09:46:15 eras Exp $
+
+EAPI=4
+inherit eutils autotools pam toolchain-funcs user
+
+DESCRIPTION="GNU Anubis is an outgoing mail processor."
+HOMEPAGE="http://www.gnu.org/software/anubis/"
+
+SRC_URI="mirror://gnu/anubis/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="crypt guile mysql postgres nls pam pcre sasl socks5 +gnutls tcpd test"
+
+RDEPEND="sys-libs/gdbm
+	crypt? ( >=app-crypt/gpgme-0.9.0 )
+	guile? ( >=dev-scheme/guile-1.8 )
+	mysql? ( virtual/mysql )
+	pam?   ( virtual/pam )
+	postgres? ( dev-db/postgresql-server )
+	nls? ( sys-devel/gettext )
+	pcre? ( >=dev-libs/libpcre-3.9 )
+	sasl? ( virtual/gsasl )
+	gnutls?   ( net-libs/gnutls )
+	tcpd?  ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )"
+
+REQUIRED_USE="mysql? ( sasl )
+	postgres? ( sasl )"
+
+pkg_setup() {
+	enewuser anubis
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gnutls.patch
+	epatch "${FILESDIR}"/${PV}-gpgme.patch
+	epatch "${FILESDIR}"/${PV}-testsuite.patch
+	epatch "${FILESDIR}"/${PV}-gnutls3.patch
+	sed -i -e "s/1024-bit ELG-E/1024-bit ELG/" \
+		testsuite/etc/{gpgcrypt.pat,gpgse.pat}
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use crypt ; then
+		myconf="--with-gpgme --with-gpgme-prefix=$(gpgme-config --prefix)"
+	else
+		myconf="--without-gpgme"
+	fi
+	econf --with-unprivileged-user=anubis \
+		--disable-rpath \
+		$(use_with mysql) \
+		$(use_with postgres) \
+		$(use_with pam) \
+		$(use_with pcre) \
+		$(use_enable nls) \
+		$(use_with guile) \
+		$(use_with sasl gsasl) \
+		$(use_with gnutls) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_with socks5 socks-proxy) \
+		${myconf}
+}
+
+src_compile() {
+	# parallel make fails
+	emake AR=$(tc-getAR) -j1
+}
+
+src_test() {
+	cd "${S}/testsuite"
+	emake -j1 check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README* THANKS TODO
+	docinto examples
+	dodoc examples/*anubis*
+	docinto guile
+	dodoc guile/*.scm
+
+	if use pam ; then
+		pamd_mimic system-auth anubis auth account session
+	fi
+
+	rm -rf "${D}"/usr/share/anubis
+}
--- a/mail-filter/anubis/files/4.1.1-gnutls3.patch
+++ b/mail-filter/anubis/files/4.1.1-gnutls3.patch
@ -0,0 +1,14 @@
+--- src/tls.c	2008-12-16 16:21:54.000000000 +0000
+++ src/tls.c	2012-10-30 09:06:37.387243098 +0000
+@@ -294,7 +294,10 @@
+ static void
+ verify_certificate (gnutls_session session)
+ {
+-  int status = gnutls_certificate_verify_peers (session);
+  int status, verify_ret;
+  verify_ret = gnutls_certificate_verify_peers2 (session, &status);
+  if (!verify_ret)
+    return status;
+ 
+   if (status == GNUTLS_E_NO_CERTIFICATE_FOUND)
+     {
--- a/mail-filter/opendkim/opendkim-2.6.7-r1.ebuild
+++ b/mail-filter/opendkim/opendkim-2.6.7-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.6.7-r1.ebuild,v 1.2 2012/10/24 11:59:45 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.6.7-r1.ebuild,v 1.3 2012/10/30 12:00:42 ago Exp $

 EAPI=4
 inherit eutils db-use autotools user
@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"

 LICENSE="Sendmail-Open-Source BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="asyncdns +berkdb ldap lua opendbx poll sasl +ssl static-libs unbound"

 # FUTURE: diffheaders (libtre error) - bug #296813
--- a/media-libs/fnlib/fnlib-0.5-r1.ebuild
+++ b/media-libs/fnlib/fnlib-0.5-r1.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fnlib/fnlib-0.5-r1.ebuild,v 1.29 2012/10/29 03:43:04 jer Exp $
-
-DESCRIPTION="Font Library for enlightenment"
-HOMEPAGE="http://www.enlightenment.org/"
-SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND="media-libs/imlib"
-
-src_compile() {
-	econf --sysconfdir=/etc/fnlib || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog HACKING NEWS README
-	dodoc doc/fontinfo.README
-}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 30 Oct 2012 09:07:00 +0000
+Tue, 30 Oct 2012 15:37:00 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Tue, 30 Oct 2012 09:07:00 +0000
+Tue, 30 Oct 2012 15:37:00 +0000
--- a/metadata/md5-cache/app-backup/duplicity-0.6.20
+++ b/metadata/md5-cache/app-backup/duplicity-0.6.20
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=net-libs/librsync app-crypt/gnupg =dev-lang/python-2*
+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
+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	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=9cc5dbb501e10a18cf2fc7e57abff72b
--- a/metadata/md5-cache/app-emulation/libvirt-0.10.2-r3
+++ b/metadata/md5-cache/app-emulation/libvirt-0.10.2-r3
@ -4,11 +4,11 @@ DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=4
 HOMEPAGE=http://www.libvirt.org/
 IUSE=audit avahi +caps debug iscsi +libvirtd lvm +lxc +macvtap nfs nls numa openvz parted pcap phyp policykit python qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 dev-libs/libgcrypt >=dev-libs/libxml2-2.7.6 dev-libs/libnl:3 >=net-libs/gnutls-1.0.25 net-libs/libssh2 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) lxc? ( sys-power/pm-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl sys-power/pm-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-misc/radvd net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 REQUIRED_USE=libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-0.10.2.tar.gz ftp://libvirt.org/libvirt/libvirt-0.10.2.tar.gz http://dev.gentoo.org/~cardoe/distfiles/libvirt-0.10.2-85e8c146.tar.xz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	f01ffb28843e2de3ea571f80f07e5078	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0d5ee88050c0d7937931f55f5fe73e05
+_md5_=7bc86c97e6b99b2685dc24ee114c7e74
--- a/metadata/md5-cache/app-misc/fslurp-2.1.2
+++ b/metadata/md5-cache/app-misc/fslurp-2.1.2
@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Read and display data from Fronius IG and IG Plus inverters
+EAPI=5
+HOMEPAGE=http://fslurp.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://sourceforge/fslurp/fslurp-2.1.2.tgz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=917b66846005aa127f933b7dc3559309
--- a/metadata/md5-cache/app-office/openerp-6.1.1
+++ b/metadata/md5-cache/app-office/openerp-6.1.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config install postinst postrm preinst prepare setup
+DEPEND=postgres? ( dev-db/postgresql-server ) dev-python/lxml dev-python/psycopg:2 dev-python/pychart dev-python/reportlab media-gfx/pydot dev-python/vobject dev-python/mako dev-python/pyyaml dev-python/Babel dev-python/gdata ldap? ( dev-python/python-ldap ) dev-python/python-openid dev-python/werkzeug dev-python/xlwt dev-python/feedparser dev-python/python-dateutil dev-python/pywebdav ssl? ( dev-python/pyopenssl ) dev-python/vatnumber dev-python/zsi =dev-lang/python-2*
+DESCRIPTION=Open Source ERP & CRM
+EAPI=3
+HOMEPAGE=http://www.openerp.com/
+IUSE=postgres ldap ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=postgres? ( dev-db/postgresql-server ) dev-python/lxml dev-python/psycopg:2 dev-python/pychart dev-python/reportlab media-gfx/pydot dev-python/vobject dev-python/mako dev-python/pyyaml dev-python/Babel dev-python/gdata ldap? ( dev-python/python-ldap ) dev-python/python-openid dev-python/werkzeug dev-python/xlwt dev-python/feedparser dev-python/python-dateutil dev-python/pywebdav ssl? ( dev-python/pyopenssl ) dev-python/vatnumber dev-python/zsi =dev-lang/python-2*
+SLOT=0
+SRC_URI=http://nightly.openerp.com/6.1/releases/openerp-6.1-1.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d8178a33144a295ce77174f51bcab642
--- a/metadata/md5-cache/app-office/openerp-6.2_pre20121029
+++ b/metadata/md5-cache/app-office/openerp-6.2_pre20121029
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile config install postinst postrm preinst prepare setup
+DEPEND=postgres? ( dev-db/postgresql-server ) dev-python/psutil dev-python/docutils dev-python/lxml dev-python/psycopg:2 dev-python/pychart dev-python/reportlab media-gfx/pydot dev-python/vobject dev-python/mako dev-python/pyyaml dev-python/Babel dev-python/gdata ldap? ( dev-python/python-ldap ) dev-python/python-openid dev-python/werkzeug dev-python/xlwt dev-python/feedparser dev-python/python-dateutil dev-python/pywebdav ssl? ( dev-python/pyopenssl ) dev-python/vatnumber dev-python/zsi =dev-lang/python-2*
+DESCRIPTION=Open Source ERP & CRM
+EAPI=3
+HOMEPAGE=http://www.openerp.com/
+IUSE=postgres ldap ssl
+LICENSE=GPL-2
+RDEPEND=postgres? ( dev-db/postgresql-server ) dev-python/psutil dev-python/docutils dev-python/lxml dev-python/psycopg:2 dev-python/pychart dev-python/reportlab media-gfx/pydot dev-python/vobject dev-python/mako dev-python/pyyaml dev-python/Babel dev-python/gdata ldap? ( dev-python/python-ldap ) dev-python/python-openid dev-python/werkzeug dev-python/xlwt dev-python/feedparser dev-python/python-dateutil dev-python/pywebdav ssl? ( dev-python/pyopenssl ) dev-python/vatnumber dev-python/zsi =dev-lang/python-2*
+SLOT=0
+SRC_URI=http://nightly.openerp.com/trunk/nightly/src/openerp-6.2dev-20121029-000101.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=93eb90eaacb37ce0ac89c397f87ea649
--- a/metadata/md5-cache/app-text/lcdf-typetools-2.97
+++ b/metadata/md5-cache/app-text/lcdf-typetools-2.97
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=kpathsea? ( virtual/tex-base )
+DESCRIPTION=Font utilities for eg manipulating OTF
+EAPI=2
+HOMEPAGE=http://www.lcdf.org/type/#typetools
+IUSE=+kpathsea
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=kpathsea? ( virtual/tex-base )
+SLOT=0
+SRC_URI=http://www.lcdf.org/type/lcdf-typetools-2.97.tar.gz
+_md5_=7881823d95d9b235b2ff3b16bb495270
--- a/metadata/md5-cache/dev-libs/confuse-2.7
+++ b/metadata/md5-cache/dev-libs/confuse-2.7
@ -4,9 +4,9 @@ DESCRIPTION=a configuration file parser library
 EAPI=3
 HOMEPAGE=http://www.nongnu.org/confuse/
 IUSE=nls static-libs
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=ISC
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://nongnu/confuse/confuse-2.7.tar.gz
-_md5_=5c41b7089fbfd099eda08c8895b60944
+_md5_=a59ddc30dfbbc6b419807c3da9ba889c
--- a/metadata/md5-cache/dev-libs/starpu-1.0.2
+++ b/metadata/md5-cache/dev-libs/starpu-1.0.2
@ -3,11 +3,11 @@ DEPEND=sys-apps/hwloc sci-mathematics/glpk blas? ( virtual/blas ) cuda? ( x11-dr
 DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
 EAPI=4
 HOMEPAGE=http://runtime.bordeaux.inria.fr/StarPU/
-IUSE=blas cuda doc examples fftw gcc-plugin mpi opencl qt4 static-libs test
+IUSE=blas cuda debug doc examples fftw gcc-plugin mpi opencl qt4 static-libs test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sys-apps/hwloc sci-mathematics/glpk blas? ( virtual/blas ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) qt4? ( >=x11-libs/qt-gui-4.7:4 >=x11-libs/qt-opengl-4.7:4 >=x11-libs/qt-sql-4.7:4 x11-libs/qwt )
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/31334/starpu-1.0.2.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	b65ac5ba56a20f3d7a01c67b7b3c9b01	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b9dd15a89901ea36a43398c7bc60839a
+_md5_=65e00ef1ece87e7074d3b2af5cda2df7
--- a/metadata/md5-cache/dev-libs/starpu-1.0.4
+++ b/metadata/md5-cache/dev-libs/starpu-1.0.4
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-apps/hwloc sci-mathematics/glpk blas? ( virtual/blas ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) qt4? ( >=x11-libs/qt-gui-4.7:4 >=x11-libs/qt-opengl-4.7:4 >=x11-libs/qt-sql-4.7:4 x11-libs/qwt ) virtual/pkgconfig test? ( gcc-plugin? ( dev-scheme/guile ) ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
+EAPI=4
+HOMEPAGE=http://runtime.bordeaux.inria.fr/StarPU/
+IUSE=blas cuda debug doc examples fftw gcc-plugin mpi opencl qt4 static-libs test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=sys-apps/hwloc sci-mathematics/glpk blas? ( virtual/blas ) cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) qt4? ( >=x11-libs/qt-gui-4.7:4 >=x11-libs/qt-opengl-4.7:4 >=x11-libs/qt-sql-4.7:4 x11-libs/qwt )
+SLOT=0
+SRC_URI=https://gforge.inria.fr/frs/download.php/31588/starpu-1.0.4.tar.gz
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	b65ac5ba56a20f3d7a01c67b7b3c9b01	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b6a3a8a81068c11bf9376a4e6244e6cf
--- a/metadata/md5-cache/dev-ml/ocaml-sha-1.8
+++ b/metadata/md5-cache/dev-ml/ocaml-sha-1.8
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/ocaml-3.12[ocamlopt] >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=A binding for SHA interface code in OCaml
+EAPI=4
+HOMEPAGE=http://github.com/vincenthz/ocaml-sha
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-3.12[ocamlopt]
+SLOT=0
+SRC_URI=http://nodeload.github.com/vincenthz/ocaml-sha/tarball/v1.8 -> ocaml-sha-1.8.tar.gz
+_eclasses_=findlib	9cf6020ee5481f39f1aa566a323f9868	vcs-snapshot	d7572a392e0bd8e207deae5414f6a887
+_md5_=9ee5fbe4a785393e80af1f15e7289104
--- a/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.2
+++ b/metadata/md5-cache/dev-python/pybloomfiltermmap-0.3.2
@ -3,10 +3,10 @@ DEPEND==dev-lang/python-2*
 DESCRIPTION=A Bloom filter (bloomfilter) for Python built on mmap
 EAPI=3
 HOMEPAGE=http://pypi.python.org/pypi/pybloomfiltermmap
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND==dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://pypi/p/pybloomfiltermmap/pybloomfiltermmap-0.3.2.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=04569bb0cb760d54f63b293e5e50c93e
+_md5_=a6d20e7a174b7027d4c2892b26e0cee6
--- a/metadata/md5-cache/dev-python/requests-0.14.2
+++ b/metadata/md5-cache/dev-python/requests-0.14.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=app-misc/ca-certificates dev-python/chardet dev-python/oauthlib dev-python/urllib3 dev-python/setuptools || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/nose )
+DESCRIPTION=HTTP library for human beings
+EAPI=4
+HOMEPAGE=http://python-requests.org/ http://pypi.python.org/pypi/requests
+IUSE=test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ISC
+RDEPEND=app-misc/ca-certificates dev-python/chardet dev-python/oauthlib dev-python/urllib3 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/r/requests/requests-0.14.2.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9695ee14c1cea0a9b092b6fde27b766a
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.7.9
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.7.9
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=dev-python/setuptools firebird? ( dev-python/kinterbasdb ) mssql? ( dev-python/pymssql ) mysql? ( dev-python/mysql-python ) postgres? ( >=dev-python/psycopg-2 ) sqlite? ( >=dev-db/sqlite-3.3.13 || ( >=dev-lang/python-2.5[sqlite] dev-python/pysqlite ) ) test? ( >=dev-db/sqlite-3.3.13 >=dev-python/nose-0.10.4 || ( >=dev-lang/python-2.5[sqlite] dev-python/pysqlite ) ) dev-lang/python
+DESCRIPTION=Python SQL toolkit and Object Relational Mapper
+EAPI=4
+HOMEPAGE=http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy
+IUSE=doc examples firebird mssql mysql postgres +sqlite test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=MIT
+RDEPEND=dev-python/setuptools firebird? ( dev-python/kinterbasdb ) mssql? ( dev-python/pymssql ) mysql? ( dev-python/mysql-python ) postgres? ( >=dev-python/psycopg-2 ) sqlite? ( >=dev-db/sqlite-3.3.13 || ( >=dev-lang/python-2.5[sqlite] dev-python/pysqlite ) ) dev-lang/python
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.7.9.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=1fa9fca5caaf27ed4cd0811e474fc251
--- a/metadata/md5-cache/dev-python/sqlobject-1.3.2
+++ b/metadata/md5-cache/dev-python/sqlobject-1.3.2
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=>=dev-python/formencode-0.2.2 firebird? ( >=dev-python/kinterbasdb-3.0.2 ) mysql? ( >=dev-python/mysql-python-0.9.2-r1 ) postgres? ( dev-python/psycopg ) sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite ) ) dev-python/setuptools =dev-lang/python-2*
+DESCRIPTION=Object-Relational Manager, aka database wrapper
+EAPI=3
+HOMEPAGE=http://sqlobject.org/ http://pypi.python.org/pypi/SQLObject
+IUSE=doc firebird mysql postgres sqlite
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/formencode-0.2.2 firebird? ( >=dev-python/kinterbasdb-3.0.2 ) mysql? ( >=dev-python/mysql-python-0.9.2-r1 ) postgres? ( dev-python/psycopg ) sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite ) ) =dev-lang/python-2*
+SLOT=0
+SRC_URI=mirror://pypi/S/SQLObject/SQLObject-1.3.2.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=d258317536d0fd698a67983a32e4c3e2
--- a/metadata/md5-cache/dev-python/vatnumber-1.0
+++ b/metadata/md5-cache/dev-python/vatnumber-1.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare test
+DEPEND=vies? ( dev-python/suds ) dev-python/setuptools test? ( dev-python/suds ) =dev-lang/python-2*
+DESCRIPTION=Module to validate VAT numbers
+EAPI=3
+HOMEPAGE=http://code.google.com/p/vatnumber/
+IUSE=test vies
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=vies? ( dev-python/suds ) =dev-lang/python-2*
+SLOT=0
+SRC_URI=http://vatnumber.googlecode.com/files/vatnumber-1.0.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
+_md5_=d7d9669f6f4a3a6bdf2ef560c63f69df
--- a/metadata/md5-cache/games-action/bzflag-2.4.2
+++ b/metadata/md5-cache/games-action/bzflag-2.4.2
@ -4,9 +4,9 @@ DESCRIPTION=3D tank combat simulator game
 EAPI=4
 HOMEPAGE=http://www.bzflag.org/
 IUSE=dedicated sdl upnp
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=amd64 ppc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/bzflag/bzflag-2.4.2.tar.bz2
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	e0a83e3f3f024b8c8ef7a8217d716cbf	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5a1dc62035257bc4c19b21b736132047
+_md5_=b733e035beeb0dce247dcb1ffade89fe
--- a/metadata/md5-cache/games-board/domination-1.1.1.1
+++ b/metadata/md5-cache/games-board/domination-1.1.1.1
@ -3,10 +3,10 @@ DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.1.9-r1 >=dev-ja
 DESCRIPTION=The well-known board game, written in java
 HOMEPAGE=http://domination.sourceforge.net
 IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/domination/Domination_1.1.1.1.zip
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	games	e0a83e3f3f024b8c8ef7a8217d716cbf	java-ant-2	daa6d2d0a12ebb700a69d9f1d2f02c5c	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	2d9eb3508fa5d6759e39354b74545567	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bbfef080136156b6bba6a6df4e0253ef
+_md5_=1a4d08a090ea06e6ae2c9ca6528b9d1c
--- a/metadata/md5-cache/games-emulation/fbzx-2.10.0
+++ b/metadata/md5-cache/games-emulation/fbzx-2.10.0
@ -3,10 +3,10 @@ DEPEND=media-libs/libsdl[video] media-sound/pulseaudio media-libs/alsa-lib virtu
 DESCRIPTION=A Sinclair Spectrum emulator, designed to work at full screen using the FrameBuffer
 EAPI=2
 HOMEPAGE=http://www.rastersoft.com/fbzx.html
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=media-libs/libsdl[video] media-sound/pulseaudio media-libs/alsa-lib
 SLOT=0
 SRC_URI=http://www.rastersoft.com/descargas/fbzx-2.10.0.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=175b28d2a76159b48f605ef4b507de56
+_md5_=6ea1cecd752a9581fce24190919f90b4
--- a/metadata/md5-cache/games-rpg/egoboo-2.8.1
+++ b/metadata/md5-cache/games-rpg/egoboo-2.8.1
@ -3,10 +3,10 @@ DEPEND=virtual/opengl virtual/glu media-libs/libsdl[joystick,video] media-libs/s
 DESCRIPTION=A 3d dungeon crawling adventure in the spirit of NetHack
 EAPI=2
 HOMEPAGE=http://egoboo.sourceforge.net/
-KEYWORDS=~amd64 ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[joystick,video] media-libs/sdl-image media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf net-libs/enet:0 dev-games/physfs
 SLOT=0
 SRC_URI=mirror://sourceforge/egoboo/egoboo-2.8.1.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=eded6d077d4e973cbcb066a4bfec147e
+_md5_=77cc6149e96fe7a803f234c044c84545
--- a/metadata/md5-cache/games-strategy/asc-2.5.0.0
+++ b/metadata/md5-cache/games-strategy/asc-2.5.0.0
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/bzip2 virtual/jpeg media-libs/libsdl media-libs/libpng media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound dev-libs/boost dev-games/physfs media-libs/libvorbis media-libs/xvid dev-libs/expat media-libs/freetype dev-lang/lua x11-libs/wxGTK:2.8[X] dev-libs/libsigc++:1.2 dev-lang/perl virtual/pkgconfig app-arch/zip
+DEPEND=app-arch/bzip2 media-libs/libsdl media-libs/libpng media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound dev-libs/boost dev-games/physfs media-libs/xvid dev-libs/expat media-libs/freetype dev-lang/lua x11-libs/wxGTK:2.8[X] dev-libs/libsigc++:1.2 dev-lang/perl virtual/pkgconfig app-arch/zip
 DESCRIPTION=turn based strategy game designed in the tradition of the Battle Isle series
-EAPI=2
+EAPI=4
 HOMEPAGE=http://www.asc-hq.org/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 virtual/jpeg media-libs/libsdl media-libs/libpng media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound dev-libs/boost dev-games/physfs media-libs/libvorbis media-libs/xvid dev-libs/expat media-libs/freetype dev-lang/lua x11-libs/wxGTK:2.8[X] dev-libs/libsigc++:1.2
+RDEPEND=app-arch/bzip2 media-libs/libsdl media-libs/libpng media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound dev-libs/boost dev-games/physfs media-libs/xvid dev-libs/expat media-libs/freetype dev-lang/lua x11-libs/wxGTK:2.8[X] dev-libs/libsigc++:1.2
 SLOT=0
 SRC_URI=mirror://sourceforge/asc-hq/asc-2.5.0.0.tar.bz2 http://www.asc-hq.org/music/frontiers.ogg http://www.asc-hq.org/music/time_to_strike.ogg http://www.asc-hq.org/music/machine_wars.ogg
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	games	e0a83e3f3f024b8c8ef7a8217d716cbf	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	wxwidgets	fb1a306837717dfa2af841ecdf929565
-_md5_=fec0f9e3d0585f1202fa670585f57a4f
+_md5_=3893f1ad9f2dbcf3fb90f010055f5266
--- a/metadata/md5-cache/mail-filter/anubis-4.1.1-r1
+++ b/metadata/md5-cache/mail-filter/anubis-4.1.1-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/gdbm crypt? ( >=app-crypt/gpgme-0.9.0 ) guile? ( >=dev-scheme/guile-1.8 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-server ) nls? ( sys-devel/gettext ) pcre? ( >=dev-libs/libpcre-3.9 ) sasl? ( virtual/gsasl ) gnutls? ( net-libs/gnutls ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=GNU Anubis is an outgoing mail processor.
+EAPI=4
+HOMEPAGE=http://www.gnu.org/software/anubis/
+IUSE=crypt guile mysql postgres nls pam pcre sasl socks5 +gnutls tcpd test
+KEYWORDS=~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/gdbm crypt? ( >=app-crypt/gpgme-0.9.0 ) guile? ( >=dev-scheme/guile-1.8 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-server ) nls? ( sys-devel/gettext ) pcre? ( >=dev-libs/libpcre-3.9 ) sasl? ( virtual/gsasl ) gnutls? ( net-libs/gnutls ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+REQUIRED_USE=mysql? ( sasl ) postgres? ( sasl )
+SLOT=0
+SRC_URI=mirror://gnu/anubis/anubis-4.1.1.tar.gz
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	flag-o-matic	2c938a1fe61ea9899a2b97ea1e065f5f	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3f7a43a9ac77d07b5e53c45ab461ec91
--- a/metadata/md5-cache/mail-filter/opendkim-2.6.7-r1
+++ b/metadata/md5-cache/mail-filter/opendkim-2.6.7-r1
@ -4,11 +4,11 @@ DESCRIPTION=A milter-based application to provide DKIM signing and verification
 EAPI=4
 HOMEPAGE=http://opendkim.org
 IUSE=asyncdns +berkdb ldap lua opendbx poll sasl +ssl static-libs unbound
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Sendmail-Open-Source BSD
 RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) ssl? ( >=dev-libs/openssl-0.9.8 ) berkdb? ( >=sys-libs/db-3.2 ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua ) ldap? ( net-nds/openldap ) sasl? ( dev-libs/cyrus-sasl ) unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root ) sys-process/psmisc
 REQUIRED_USE=sasl? ( ldap )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendkim/opendkim-2.6.7.tar.gz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5d3360a86779770fdc01259e0b631497
+_md5_=66f119bb1caa266527891ca6c68c5a29
--- a/metadata/md5-cache/media-libs/fnlib-0.5-r1
+++ b/metadata/md5-cache/media-libs/fnlib-0.5-r1
@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-libs/imlib
-DESCRIPTION=Font Library for enlightenment
-HOMEPAGE=http://www.enlightenment.org/
-KEYWORDS=alpha amd64 ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/imlib
-SLOT=0
-SRC_URI=mirror://sourceforge/enlightenment/fnlib-0.5.tar.gz
-_md5_=04902436126291529479dce2fc8c36cb
--- a/metadata/md5-cache/net-analyzer/w3af-1.1
+++ b/metadata/md5-cache/net-analyzer/w3af-1.1
@ -4,10 +4,10 @@ DESCRIPTION=Web Application Attack and Audit Framework
 EAPI=2
 HOMEPAGE=http://w3af.sourceforge.net/
 IUSE=doc gtk
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/fpconst-0.7.2 dev-python/lxml dev-python/nltk dev-python/pybloomfiltermmap dev-python/pyopenssl dev-python/pyPdf dev-python/pysqlite dev-python/python-cluster dev-python/pyyaml dev-python/simplejson dev-python/soappy dev-python/pysvn || ( net-analyzer/gnu-netcat net-analyzer/netcat net-analyzer/netcat6 ) >=net-analyzer/scapy-2 gtk? ( media-gfx/graphviz >dev-python/pygtk-2.0 dev-python/pygtksourceview ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 SLOT=0
 SRC_URI=mirror://sourceforge/w3af/w3af-1.1.tar.bz2
 _eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	python	3db636724bc2886c6425058e210067d2	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=4272c2dfe6f6f8dc452b8f8847d4e3e8
+_md5_=26e7f4446226bc7abe6a954a9f18dae7
--- a/metadata/md5-cache/net-fs/cvmfs-2.0.19
+++ b/metadata/md5-cache/net-fs/cvmfs-2.0.19
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup
+DEPEND=dev-db/sqlite:3 dev-libs/openssl sys-libs/zlib client? ( dev-libs/jemalloc net-misc/curl sys-fs/fuse ) server? ( >=sys-fs/redirfs-0.10.20120313 ) virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=HTTP read-only file system for distributing software
+EAPI=4
+HOMEPAGE=http://cernvm.cern.ch/portal/filesystem
+IUSE=+client doc openmp server kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-db/sqlite:3 dev-libs/openssl sys-libs/zlib client? ( dev-libs/jemalloc net-misc/curl sys-fs/fuse ) server? ( >=sys-fs/redirfs-0.10.20120313 ) client? ( net-fs/autofs ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=^^ ( client server )
+SLOT=0
+SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.0.19/cvmfs-2.0.19.tar.gz
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=67812726373e615c298559c2a166ab64
--- a/metadata/md5-cache/net-ftp/lftp-4.4.0
+++ b/metadata/md5-cache/net-ftp/lftp-4.4.0
@ -4,10 +4,10 @@ DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer
 EAPI=4
 HOMEPAGE=http://lftp.yar.ru/
 IUSE=linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_zh_CN linguas_zh_HK linguas_zh_TW gnutls nls socks5 +ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1
 SLOT=0
 SRC_URI=http://ftp.yars.free.net/pub/source/lftp/lftp-4.4.0.tar.xz
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=831ae63c74a3a06cad368de92ebffbfe
+_md5_=f80cdf24948355ce2958ebda0ed31fca
--- a/metadata/md5-cache/net-libs/libisds-0.6-r1
+++ b/metadata/md5-cache/net-libs/libisds-0.6-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Client library for accessing ISDS Soap services
-EAPI=5
-HOMEPAGE=http://xpisar.wz.cz/libisds/
-IUSE=+curl debug nls static-libs test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) >=app-crypt/gnupg-2
-SLOT=0
-SRC_URI=http://xpisar.wz.cz/libisds/dist/libisds-0.6.tar.xz
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	b65ac5ba56a20f3d7a01c67b7b3c9b01	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=407d7d1cb5770d653a39eb00542b966b
--- a/metadata/md5-cache/net-libs/libisds-0.6.1
+++ b/metadata/md5-cache/net-libs/libisds-0.6.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Client library for accessing ISDS Soap services
+EAPI=5
+HOMEPAGE=http://xpisar.wz.cz/libisds/
+IUSE=+curl debug nls static-libs test
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=LGPL-3
+RDEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) >=app-crypt/gnupg-2
+SLOT=0
+SRC_URI=http://xpisar.wz.cz/libisds/dist/libisds-0.6.1.tar.xz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=422447a8bfc01fac4520bd51490c90b6
--- a/metadata/md5-cache/net-libs/libisds-9999
+++ b/metadata/md5-cache/net-libs/libisds-9999
@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) virtual/pkgconfig nls? ( sys-devel/gettext ) dev-vcs/git
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) virtual/pkgconfig nls? ( sys-devel/gettext ) dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Client library for accessing ISDS Soap services
 EAPI=5
 HOMEPAGE=http://xpisar.wz.cz/libisds/
@ -7,5 +7,5 @@ IUSE=+curl debug nls static-libs test
 LICENSE=LGPL-3
 RDEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) >=app-crypt/gnupg-2
 SLOT=0
-_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	autotools-utils	b65ac5ba56a20f3d7a01c67b7b3c9b01	eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=624c5cc00d8357617b3bc874965482e4
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=64ab5045ceae38f851ccfdd02eaadc70
--- a/metadata/md5-cache/net-misc/shigofumi-0.2
+++ b/metadata/md5-cache/net-misc/shigofumi-0.2
@ -4,10 +4,10 @@ DESCRIPTION=Command line client for ISDS
 EAPI=5
 HOMEPAGE=http://xpisar.wz.cz/shigofumi/
 IUSE=debug doc nls xattr
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~mips ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/confuse dev-libs/libxml2 sys-libs/readline >=net-libs/libisds-0.6
 SLOT=0
 SRC_URI=http://xpisar.wz.cz/shigofumi/dist/shigofumi-0.2.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9cfc7a7940b0ece292782ef033fcb67a
+_md5_=67852ff8aa7d07407d3d09d3a2e12d5b
--- a/metadata/md5-cache/net-misc/shigofumi-9999
+++ b/metadata/md5-cache/net-misc/shigofumi-9999
@ -8,4 +8,4 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/confuse dev-libs/libxml2 sys-libs/readline >=net-libs/libisds-0.6
 SLOT=0
 _eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=11aa897b16cae8c47cbb368141b2946a
+_md5_=2bd5ddd8421af246fb591f5bd46c80d7
--- a/metadata/md5-cache/perl-core/Digest-SHA-5.710.0
+++ b/metadata/md5-cache/perl-core/Digest-SHA-5.710.0
@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build]
 DESCRIPTION=Perl extension for SHA-1/224/256/384/512
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Digest-SHA/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSHELOR/Digest-SHA-5.71.tar.gz
 _eclasses_=alternatives	7a734a903498a04a0722152a124aa3a5	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	825d3d7654c88c5c4dec7400d3612578	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=33e2da43cbf7f4bc6711da94f032b5c0
+_md5_=cda4225f51c723f59892714f50297319
--- a/metadata/md5-cache/sys-auth/openpam-20120526
+++ b/metadata/md5-cache/sys-auth/openpam-20120526
@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-devel/make dev-lang/perl =sys-devel/automake-1.9* >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Open source PAM library.
+EAPI=2
+HOMEPAGE=http://www.openpam.org/
+IUSE=debug vim-syntax
+KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD
+PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
+RDEPEND=!sys-libs/pam
+SLOT=0
+SRC_URI=mirror://sourceforge/openpam/openpam-20120526.tar.gz
+_eclasses_=autotools	f4bee52a728da1f76470f4b8d246c50f	eutils	d40dc948067bd3db1c8ebf7d51897313	libtool	2b273eea1976cfaed3449345d94331ac	multilib	9aa8a023e062fca0ba79362d9d0cc488	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=150d4054e093dd1021131f3504de2415
--- a/metadata/md5-cache/sys-devel/bmake-20121010
+++ b/metadata/md5-cache/sys-devel/bmake-20121010
@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=NetBSD's portable make
+EAPI=3
+HOMEPAGE=http://www.crufty.net/help/sjg/bmake.html
+KEYWORDS=~amd64 ~ppc ~x86 ~x64-freebsd
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20121010.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20121010.tar.gz
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4628bac60cc7c38ea6e05948064ffd5b
--- a/metadata/md5-cache/sys-fs/redirfs-0.10.20120313
+++ b/metadata/md5-cache/sys-fs/redirfs-0.10.20120313
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=Layer between virtual file system switch and file system drivers
+EAPI=4
+HOMEPAGE=http://www.redirfs.org/
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~bicatali/distfiles/redirfs-0.10.20120313.tar.bz2
+_eclasses_=eutils	d40dc948067bd3db1c8ebf7d51897313	linux-info	f01ffb28843e2de3ea571f80f07e5078	linux-mod	dbc722ed035721476f23ab7b0572985e	multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=cbc6529de6dc0b985b99879cd73f96fa
--- a/metadata/md5-cache/www-servers/monkeyd-1.1.1
+++ b/metadata/md5-cache/www-servers/monkeyd-1.1.1
@ -3,10 +3,10 @@ DESCRIPTION=A small, fast, and scalable web server
 EAPI=4
 HOMEPAGE=http://www.monkey-project.com/
 IUSE=php
-KEYWORDS=~amd64 arm ~mips ppc ppc64 ~x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=php? ( virtual/httpd-php )
 SLOT=0
 SRC_URI=http://monkey-project.com/releases/1.1/monkey-1.1.1.tar.gz
 _eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	d40dc948067bd3db1c8ebf7d51897313	multilib	9aa8a023e062fca0ba79362d9d0cc488	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=94883f31c0bae2fcbc63a14451f82c2e
+_md5_=23477a04c5f1e67f275c0bf26ac05475
--- a/metadata/md5-cache/x11-misc/xautolock-2.2
+++ b/metadata/md5-cache/x11-misc/xautolock-2.2
@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install
-DEPEND=|| ( x11-misc/alock x11-misc/i3lock x11-misc/slock x11-misc/xlockmore x11-misc/xtrlock ) x11-libs/libXScrnSaver x11-misc/imake app-text/rman x11-proto/scrnsaverproto
+DEPEND=|| ( x11-misc/alock x11-misc/i3lock x11-misc/slimlock x11-misc/slock x11-misc/xlockmore x11-misc/xtrlock ) x11-libs/libXScrnSaver x11-misc/imake app-text/rman x11-proto/scrnsaverproto
 DESCRIPTION=An automatic X screen-locker/screen-saver.
 HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=|| ( x11-misc/alock x11-misc/i3lock x11-misc/slock x11-misc/xlockmore x11-misc/xtrlock ) x11-libs/libXScrnSaver
+RDEPEND=|| ( x11-misc/alock x11-misc/i3lock x11-misc/slimlock x11-misc/slock x11-misc/xlockmore x11-misc/xtrlock ) x11-libs/libXScrnSaver
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz
 _eclasses_=multilib	9aa8a023e062fca0ba79362d9d0cc488	toolchain-funcs	134429b842a6c67254bfd76a8753e4d4
-_md5_=5a8fa6b45d6fdec420f92e0ff09c6595
+_md5_=313bac933855759815af173cb70eb952
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Tue, 30 Oct 2012 09:07:02 +0000
+Tue, 30 Oct 2012 15:37:02 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Tue Oct 30 09:07:00 UTC 2012
+Tue Oct 30 15:37:00 UTC 2012
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Tue, 30 Oct 2012 09:30:01 +0000
+Tue, 30 Oct 2012 16:00:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1351587901 Tue Oct 30 09:05:01 2012 UTC
+1351611302 Tue Oct 30 15:35:02 2012 UTC
--- a/net-analyzer/w3af/Manifest
+++ b/net-analyzer/w3af/Manifest
@ -1,3 +1,3 @@
-DIST w3af-1.0-rc5.tar.bz2 40592636 RMD160 480f8cd02981b2733167a14faf80c7a7b701da28 SHA1 0583f6fa8c2422ca701ecdc530751f6fe99ef388 SHA256 afdd6a37613b8f67cc991a864aeafc32f534399eb0c712a77d8422be363deb32
-DIST w3af-1.0-stable.tar.bz2 39909370 RMD160 58a743de9aa76f1e1d77f21df446dafa6e4ad15a SHA1 bb269d12c77fc310f8fb3cd7ae81c9a1ca6b8318 SHA256 9aaa651e706fe0c4c2cff95879d614cdcb9791e5120cccc527fcb82922d76fc8
-DIST w3af-1.1.tar.bz2 39994121 RMD160 59891bee9d2f85c15bc51dc0fd3e706de9846785 SHA1 4fa9ec52f09608901bee3bf663b88a8af33ecc40 SHA256 0bf3cec513931b9bf20e6f753dedeaab57b5cad303489ab9ff365786c04d9444
+DIST w3af-1.0-rc5.tar.bz2 40592636 SHA256 afdd6a37613b8f67cc991a864aeafc32f534399eb0c712a77d8422be363deb32
+DIST w3af-1.0-stable.tar.bz2 39909370 SHA256 9aaa651e706fe0c4c2cff95879d614cdcb9791e5120cccc527fcb82922d76fc8
+DIST w3af-1.1.tar.bz2 39994121 SHA256 0bf3cec513931b9bf20e6f753dedeaab57b5cad303489ab9ff365786c04d9444 SHA512 9a6c7d474d61f9039c150b44d4c6027451d58e925e47083262105f62b0fca718373103015e3f5bbed1cb89a40c9c057d3d54ce0c533ad3cc90e8ff24e193f868 WHIRLPOOL cb5d0d7bc9096ae27e5597e5dfd2963e03e0b7f4939fb0583ef61d2dec0c8b595ccbfb3e43f4ed170cb8ac79a74f654a5502eeb5d590138f43cfd7cdbe3e4e1f
--- a/net-analyzer/w3af/w3af-1.1.ebuild
+++ b/net-analyzer/w3af/w3af-1.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.1.ebuild,v 1.1 2012/01/19 22:44:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.1.ebuild,v 1.2 2012/10/30 11:04:08 ago Exp $

 EAPI=2

@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"

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

 RDEPEND=">=dev-python/fpconst-0.7.2
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@ -0,0 +1 @@
+DIST cvmfs-2.0.19.tar.gz 7740158 SHA256 a92ff675e16f4766d7108a2d34ccce324d83bdd720262b6574cc90a2510e580c SHA512 4456af5a883de199d8e6b6f5ba5fb25cd25c986677055a22fc1aa1d64e27fdd66ba5b406d2c4a6960af3866dbdf85b57f1ebc1a447dce6ebaca196a21aee95da WHIRLPOOL 621c59bdf52c963d528399a20af5c7c950afb300b0eaeb4dae5c7b3cc83436de897a184fffedd386921f5c84fb075f15dd42f820679d7a473ee6525b884b356f
--- a/net-fs/cvmfs/cvmfs-2.0.19.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.0.19.ebuild
@ -0,0 +1,126 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/cvmfs-2.0.19.ebuild,v 1.1 2012/10/30 14:44:26 bicatali Exp $
+
+EAPI=4
+
+inherit eutils autotools toolchain-funcs linux-mod
+
+DESCRIPTION="HTTP read-only file system for distributing software"
+HOMEPAGE="http://cernvm.cern.ch/portal/filesystem"
+SRC_URI="https://ecsft.cern.ch/dist/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="+client doc openmp server"
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/openssl
+	sys-libs/zlib
+	client? (
+		dev-libs/jemalloc
+		net-misc/curl
+		sys-fs/fuse )
+	server? ( >=sys-fs/redirfs-0.10.20120313 )"
+
+RDEPEND="${CDEPEND}
+	client? ( net-fs/autofs )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+# either client or server is required and are mutually exclusive
+REQUIRED_USE="^^ ( client server )"
+
+pkg_setup() {
+	if use server && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp
+	then
+		ewarn "You are using a gcc without OpenMP capabilities"
+		die "Need an OpenMP capable compiler"
+	fi
+	if use server; then
+		MODULE_NAMES="cvmfsflt(misc:${S}/kernel/cvmfsflt/src)"
+		BUILD_PARAMS="-C ${KERNEL_DIR} M=${S}/kernel/cvmfsflt/src"
+		BUILD_TARGETS="cvmfsflt.ko"
+		linux-mod_pkg_setup
+	fi
+}
+
+src_prepare() {
+	#	"${FILESDIR}"/${P}-system-redirfs.patch \
+	epatch \
+		"${FILESDIR}"/${P}-autotools.patch \
+		"${FILESDIR}"/${P}-no-redhat-init.patch \
+		"${FILESDIR}"/${P}-spinlock.patch \
+		"${FILESDIR}"/${P}-openrc.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-sqlite3-builtin \
+		--disable-libcurl-builtin \
+		--disable-zlib-builtin \
+		--disable-jemalloc-builtin \
+		$(use_enable client cvmfs) \
+		$(use_enable client mount-scripts) \
+		$(use_enable openmp) \
+		$(use_enable server)
+}
+
+src_compile() {
+	emake
+	if use server; then
+		ln -s "${EROOT}"/usr/include/redirfs.h "${S}"/kernel/cvmfsflt/src
+		linux-mod_src_compile
+	fi
+	use doc && doxygen doc/cvmfs.doxy
+}
+
+src_install() {
+	default
+	# NEWS file is empty
+	rm "${ED}"/usr/share/doc/${PF}/{INSTALL,NEWS,COPYING}
+
+	use client && newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	if use server; then
+		linux-mod_src_install
+		newinitd "${FILESDIR}"/${PN}d.initd ${PN}d
+		newconfd "${FILESDIR}"/${PN}d.confd ${PN}d
+	fi
+	use doc && dohtml -r doc/html/*
+}
+
+pkg_preinst() {
+	use server && linux-mod_pkg_preinst
+}
+
+pkg_postinst() {
+	use server && linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	use server && linux-mod_pkg_postrm
+}
+
+pkg_config() {
+	if use client; then
+		einfo "Setting up CernVM-FS client"
+		cvmfs_config setup
+		cat > "${EROOT}"/etc/cvmfs/default.local <<-EOF
+			# Repositories to fetch example is for ATLAS
+			CVMFS_REPOSITORIES=atlas.cern.ch,atlas-condb.cern.ch,grid.cern.ch
+			# Local proxy settings, ex: http://cernvm.cern.ch/config/proxy.cgi
+			CVMFS_HTTP_PROXY="DIRECT"
+			# Where to keep the cvmfs cache
+			CVMFS_CACHE_BASE=${EROOT}/var/scratch/cvmfs
+			# Quota limit in Mb
+			CVMFS_QUOTA_LIMIT=10000
+		EOF
+		einfo "Now edit ${EROOT}/etc/cvmfs/default.local and run"
+		einfo "  ${EROOT}/usr/init.d/cvmfs restart"
+	fi
+}
--- a/net-fs/cvmfs/files/cvmfs-2.0.19-autotools.patch
+++ b/net-fs/cvmfs/files/cvmfs-2.0.19-autotools.patch
@ -0,0 +1,194 @@
+Patch for various autotools fixes:
+* cleaner enable/disable functions
+* allow to build against system jemalloc
+* adapated to newer autoconf with standard macros
+* use LDADD instead of LDFLAGS to respect user's flags
+
+bicatali@gentoo.org 07/2012
+
+diff -Nur cvmfs-2.0.19.orig/configure.ac cvmfs-2.0.19/configure.ac
+--- cvmfs-2.0.19.orig/configure.ac	2012-07-24 17:54:17.000000000 +0100
+++ cvmfs-2.0.19/configure.ac	2012-10-30 11:00:26.000000000 +0000
+@@ -9,20 +9,22 @@
+ AC_CONFIG_HEADER([config.h])
+ AH_BOTTOM([#define CVMFS_PATCH_LEVEL "0"])
+ 
+-AC_ARG_ENABLE([cvmfs], AC_HELP_STRING([--disable-cvmfs], [Don't build the CernVM-FS FUSE module]), AC_SUBST([HAVE_CVMFS], [no]))
+-AC_ARG_ENABLE([server], AC_HELP_STRING([--disable-server], [Don't build writer's end programs]), AC_SUBST([HAVE_SERVER], [no]))
+-AC_ARG_ENABLE([sqlite3-builtin], AC_HELP_STRING([--enable-sqlite3-builtin], [Don't use system SQLite3]), AC_SUBST([USE_BUILTIN_SQLITE3], [yes]))
+-AC_ARG_ENABLE([libcurl-builtin], AC_HELP_STRING([--enable-libcurl-builtin], [Don't use system libcurl]), AC_SUBST([USE_BUILTIN_LIBCURL], [yes]))
+AC_ARG_ENABLE([cvmfs], AC_HELP_STRING([--disable-cvmfs], [Don't build the CernVM-FS FUSE module]), AC_SUBST([HAVE_CVMFS], [$enableval]),AC_SUBST([HAVE_CVMFS], [yes]))
+AC_ARG_ENABLE([server], AC_HELP_STRING([--disable-server], [Don't build writer's end programs]), AC_SUBST([HAVE_SERVER], [$enableval]),AC_SUBST([HAVE_SERVER], [yes]))
+AC_ARG_ENABLE([sqlite3-builtin], AC_HELP_STRING([--enable-sqlite3-builtin], [Don't use system SQLite3]), AC_SUBST([USE_BUILTIN_SQLITE3], [$enableval]),AC_SUBST([USE_BUILTIN_SQLITE3], [no]))
+AC_ARG_ENABLE([libcurl-builtin], AC_HELP_STRING([--enable-libcurl-builtin], [Don't use system libcurl]), AC_SUBST([USE_BUILTIN_LIBCURL], [$enableval]),AC_SUBST([USE_BUILTIN_LIBCURL], [no]))
+ dnl AC_ARG_ENABLE([libfuse-builtin], AC_HELP_STRING([--enable-libfuse-builtin], [Don't use system libfuse]), AC_SUBST([USE_BUILTIN_LIBFUSE], [yes]))
+-AC_ARG_ENABLE([zlib-builtin], AC_HELP_STRING([--enable-zlib-builtin], [Don't use system]), AC_SUBST([USE_BUILTIN_ZLIB], [yes]))
+-AC_ARG_ENABLE([kernel-module], AC_HELP_STRING([--enable-kernel-module], [Build the kernel module for the server part]), AC_SUBST([HAVE_KMODULE], [yes]))
+-AC_ARG_ENABLE([mount-scripts], AC_HELP_STRING([--enable-mount-scripts], [Install CernVM-FS mount tools in /etc and /sbin]), AC_SUBST([HAVE_MOUNTSCRIPTS], [yes]))
+AC_ARG_ENABLE([zlib-builtin], AC_HELP_STRING([--enable-zlib-builtin], [Don't use system]), AC_SUBST([USE_BUILTIN_ZLIB], [$enableval]),AC_SUBST([USE_BUILTIN_ZLIB], [no]))
+AC_ARG_ENABLE([jemalloc-builtin], AC_HELP_STRING([--enable-jemalloc-builtin], [Don't use system jemalloc]), AC_SUBST([USE_BUILTIN_JEMALLOC], [$enableval]),AC_SUBST([USE_BUILTIN_JEMALLOC], [no]))
+AC_ARG_ENABLE([kernel-module], AC_HELP_STRING([--enable-kernel-module], [Build the kernel module for the server part]), AC_SUBST([HAVE_KMODULE], [$enableval]),AC_SUBST([HAVE_KMODULE], [no]))
+AC_ARG_ENABLE([mount-scripts], AC_HELP_STRING([--enable-mount-scripts], [Install CernVM-FS mount tools in /etc and /sbin]), AC_SUBST([HAVE_MOUNTSCRIPTS], [$enableval]),AC_SUBST([HAVE_MOUNTSCRIPTS], [no]))
+ AM_CONDITIONAL([BUILD_CVMFS], [test x$HAVE_CVMFS != xno])
+ AM_CONDITIONAL([BUILD_SERVER], [test x$HAVE_SERVER != xno])
+ AM_CONDITIONAL([SYSTEM_SQLITE3], [test x$USE_BUILTIN_SQLITE3 != xyes])
+ AM_CONDITIONAL([SYSTEM_LIBCURL], [test x$USE_BUILTIN_LIBCURL != xyes])
+ AM_CONDITIONAL([SYSTEM_LIBFUSE], [test x != x])
+ AM_CONDITIONAL([SYSTEM_ZLIB], [test x$USE_BUILTIN_ZLIB != xyes])
+AM_CONDITIONAL([SYSTEM_JEMALLOC], [test x$USE_BUILTIN_JEMALLOC != xyes])
+ AM_CONDITIONAL([BUILD_KMODULE], [test x$HAVE_KMODULE == xyes])
+ AM_CONDITIONAL([BUILD_MEMCACHED], [test x$HAVE_MEMCACHED == xyes])
+ AM_CONDITIONAL([BUILD_MOUNTSCRIPTS], [test x$HAVE_MOUNTSCRIPTS == xyes])
+@@ -35,6 +37,7 @@
+ dnl AC_PROG_LIBTOOL
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ 
+ CXXFLAGS="$CXXFLAGS -g -fno-exceptions -fno-strict-aliasing -fasynchronous-unwind-tables -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wall \
+          -D_REENTRANT -D__EXTENSIONS__ -D_LARGEFILE64_SOURCE -D__LARGE64_FILES"
+@@ -70,7 +73,7 @@
+ PKG_CHECK_MODULES([OPENSSL], [libcrypto >= 0.9.7a])
+ 
+ dnl Get OpenMP Options
+-gt_OPENMP()
+AC_OPENMP
+ 
+ dnl  Checks for libraries.
+ save_LIBS=$LIBS
+@@ -86,6 +89,10 @@
+ 
+ AC_CHECK_LIB([rt], [sched_yield], ,[AC_MSG_ERROR(librt (Posix real time extensions) required)])
+ 
+if test x$USE_BUILTIN_JEMALLOC != xyes; then
+   AC_CHECK_LIB([jemalloc], [malloc],  ,[AC_MSG_ERROR(jemalloc required)])
+fi
+
+ if test x$HAVE_CVMFS != xno; then
+ dnl   if test x$USE_BUILTIN_LIBFUSE != xyes; then
+ dnl      AC_CHECK_HEADERS([fuse.h fuse/fuse_opt.h],,[AC_MSG_ERROR(fuse headers required)],[#define _FILE_OFFSET_BITS 64])
+diff -Nur cvmfs-2.0.19.orig/cvmfs/src/Makefile.am cvmfs-2.0.19/cvmfs/src/Makefile.am
+--- cvmfs-2.0.19.orig/cvmfs/src/Makefile.am	2012-07-25 08:17:28.000000000 +0100
+++ cvmfs-2.0.19/cvmfs/src/Makefile.am	2012-10-30 11:08:44.000000000 +0000
+@@ -224,6 +224,11 @@
+ cvmfs_proxy_rtt_LDADD += $(LDFLAGS_ZLIB)
+ endif
+ 
+if ! SYSTEM_JEMALLOC
+LDFLAGS_JEMALLOC = ../../jemalloc/src/lib/libjemalloc.a
+cvmfs2_debug_LDADD += $(LDFLAGS_JEMALLOC)
+cvmfs2_LDADD += $(LDFLAGS_JEMALLOC)
+endif
+ 
+ CFLAGS_CVMFS2 =
+ if ! SYSTEM_SQLITE3
+@@ -238,8 +243,8 @@
+ if ! SYSTEM_ZLIB
+ CFLAGS_CVMFS2 += -I../../zlib/src
+ endif
+-cvmfs2_debug_LDADD += ../../jemalloc/src/lib/libjemalloc.a -ldl
+-cvmfs2_LDADD += ../../jemalloc/src/lib/libjemalloc.a -ldl
+
+
+ CFLAGS_CVMFS2 += $(PTHREAD_CFLAGS) $(CURL_CFLAGS) $(SQLITE_CFLAGS) $(OPENSSL_CFLAGS) $(FUSE_CFLAGS) -DCVMFS_CLIENT -DFUSE_CLIENT
+ LDFLAGS_CVMFS2 = $(PTHREAD_CFLAGS) -rdynamic
+ LIBS_CVMFS2 = $(PTHREAD_LIBS) $(CURL_LIBS) $(SQLITE_LIBS) $(FUSE_LIBS) $(Z_LIBS) $(OPENSSL_LIBS) $(CVMFS_LIBS) -lrt
+@@ -291,11 +296,11 @@
+ endif
+ CFLAGS_PROXYRTT += $(CURL_CFLAGS) -DCVMFS_CLIENT -DNDEBUGMSG
+ cvmfs_proxy_rtt_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_PROXYRTT)
+-cvmfs_proxy_rtt_LDFLAGS = $(CVMFS_LIBS) $(CURL_LIBS)
+cvmfs_proxy_rtt_LDADD += $(CVMFS_LIBS) $(CURL_LIBS)
+ 
+ 
+ testtracer_CXXFLAGS = $(CVMFS_CXXFLAGS) $(PTHREAD_CFLAGS)
+-testtracer_LDFLAGS  = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+testtracer_LDADD  += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ 
+ CFLAGS_SYNC =
+ if ! SYSTEM_SQLITE3
+@@ -307,7 +312,7 @@
+ CFLAGS_SYNC += $(PTHREAD_CFLAGS) $(OPENMP_CFLAGS) $(SQLITE_CFLAGS) $(OPENSSL_CFLAGS) -DNDEBUGMSG
+ cvmfs_sync_bin_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_SYNC)
+ cvmfs_sync_bin_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_SYNC)
+-cvmfs_sync_bin_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(SQLITE_LIBS) $(OPENSSL_LIBS) $(Z_LIBS) $(GOMP_LIBS)
+cvmfs_sync_bin_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(SQLITE_LIBS) $(OPENSSL_LIBS) $(Z_LIBS) $(GOMP_LIBS)
+ 
+ 
+ CFLAGS_CLGCMP =
+@@ -320,7 +325,7 @@
+ CFLAGS_CLGCMP += $(SQLITE_CFLAGS) $(PTHREAD_CFLAGS) $(OPENSSL_CFLAGS) -DNDEBUGMSG
+ cvmfs_clgcmp_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_CLGCMP)
+ cvmfs_clgcmp_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_CLGCMP)
+-cvmfs_clgcmp_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS)
+cvmfs_clgcmp_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS)
+ 
+ 
+ CFLAGS_LSCAT =
+@@ -333,7 +338,7 @@
+ CFLAGS_LSCAT += $(SQLITE_CFLAGS) $(PTHREAD_CFLAGS) $(OPENSSL_CFLAGS) -DNDEBUGMSG
+ cvmfs_lscat_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_LSCAT)
+ cvmfs_lscat_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_LSCAT)
+-cvmfs_lscat_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS)
+cvmfs_lscat_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS)
+ 
+ CFLAGS_FIXINODES =
+ if ! SYSTEM_SQLITE3
+@@ -345,7 +350,7 @@
+ CFLAGS_FIXINODES += $(SQLITE_CFLAGS) $(PTHREAD_CFLAGS) $(OPENSSL_CFLAGS) -DNDEBUGMSG
+ cvmfs_fixinodes_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_FIXINODES)
+ cvmfs_fixinodes_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_FIXINODES)
+-cvmfs_fixinodes_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS)
+cvmfs_fixinodes_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS)
+ 
+ CFLAGS_SIGN =
+ if ! SYSTEM_ZLIB
+@@ -354,7 +359,7 @@
+ CFLAGS_SIGN += $(SQLITE_CFLAGS) $(PTHREAD_CFLAGS) $(OPENSSL_CFLAGS) -DNDEBUGMSG
+ cvmfs_sign_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_SIGN)
+ cvmfs_sign_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_SIGN)
+-cvmfs_sign_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(SQLITE_LIBS) $(Z_LIBS) $(OPENSSL_LIBS)
+cvmfs_sign_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(SQLITE_LIBS) $(Z_LIBS) $(OPENSSL_LIBS)
+ 
+ CFLAGS_PULL =
+ if ! SYSTEM_SQLITE3
+@@ -369,13 +374,13 @@
+ CFLAGS_PULL += $(SQLITE_CFLAGS) $(PTHREAD_CFLAGS) $(OPENSSL_CFLAGS) -DNDEBUGMSG
+ cvmfs_pull_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_PULL)
+ cvmfs_pull_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_PULL)
+-cvmfs_pull_LDFLAGS = $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS)
+cvmfs_pull_LDADD += $(CVMFS_LIBS) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(OPENSSL_LIBS) $(SQLITE_LIBS) $(Z_LIBS) $(CURL_LIBS)
+ 
+ 
+ CFLAGS_SCRUB = $(OPENSSL_CFLAGS) -DNDEBUGMSG
+ cvmfs_scrub_CXXFLAGS = $(CVMFS_CXXFLAGS) $(CFLAGS_SCRUB)
+ cvmfs_scrub_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_SCRUB)
+-cvmfs_scrub_LDFLAGS = $(CVMFS_LIBS) $(OPENSSL_LIBS)
+cvmfs_scrub_LDADD += $(CVMFS_LIBS) $(OPENSSL_LIBS)
+ 
+ 
+ CFLAGS_ZPIPE =
+@@ -383,4 +388,4 @@
+ CFLAGS_ZPIPE += -I../../zlib/src
+ endif
+ cvmfs_zpipe_CFLAGS = $(CVMFS_CFLAGS) $(CFLAGS_ZPIPE)
+-cvmfs_zpipe_LDFLAGS = $(CVMFS_LIBS) $(Z_LIBS)
+cvmfs_zpipe_LDADD += $(CVMFS_LIBS) $(Z_LIBS)
+diff -Nur cvmfs-2.0.19.orig/Makefile.am cvmfs-2.0.19/Makefile.am
+--- cvmfs-2.0.19.orig/Makefile.am	2012-02-07 17:04:54.000000000 +0000
+++ cvmfs-2.0.19/Makefile.am	2012-10-30 11:00:26.000000000 +0000
+@@ -10,10 +10,13 @@
+ if ! SYSTEM_ZLIB
+   SUBDIR_ZLIB = zlib
+ endif
+if ! SYSTEM_JEMALLOC
+  SUBDIR_JEMALLOC = jemalloc
+endif
+ if BUILD_KMODULE
+   SUBDIR_KMODULE = kernel
+ endif
+-SUBDIRS = $(SUBDIR_KMODULE) $(SUBDIR_SQLITE3) $(SUBDIR_ZLIB) $(SUBDIR_LIBCURL) $(SUBDIR_LIBFUSE) jemalloc cvmfs cvmfsd mount replica
+SUBDIRS = $(SUBDIR_KMODULE) $(SUBDIR_SQLITE3) $(SUBDIR_ZLIB) $(SUBDIR_LIBCURL) $(SUBDIR_LIBFUSE) $(SUBDIR_JEMALLOC) cvmfs cvmfsd mount replica
+ EXTRA_DIST = sign-whitelist add-ons rpm doc c-ares libcurl libfuse kernel jemalloc zlib mount replica 
+ docdir = ${datadir}/doc/${PACKAGE}-${VERSION}
+ dist_doc_DATA = NEWS README ChangeLog AUTHORS INSTALL COPYING FAQ
--- a/net-fs/cvmfs/files/cvmfs-2.0.19-no-redhat-init.patch
+++ b/net-fs/cvmfs/files/cvmfs-2.0.19-no-redhat-init.patch
@ -0,0 +1,22 @@
+* Avoid forcing install of fedora/redhat init scripts
+* Add a more general init script to adapt other distributions
+
+bicatali@gentoo.org 07/2012
+
+--- cvmfs-2.0.19.orig/mount/Makefile.am
+++ cvmfs-2.0.19/mount/Makefile.am
+@@ -2,14 +2,12 @@
+ install-exec-hook:
+ 	test -z "$(DESTDIR)/etc" || mkdir -p "$(DESTDIR)/etc"
+ 	test -z "$(DESTDIR)/sbin" || mkdir -p "$(DESTDIR)/sbin"
+-	test -z "$(DESTDIR)/etc/rc.d/init.d" || mkdir -p "$(DESTDIR)/etc/rc.d/init.d"
+ 	test -z "$(DESTDIR)/etc/cvmfs" || mkdir -p "$(DESTDIR)/etc/cvmfs"
+ 	test -z "$(DESTDIR)/etc/cvmfs/config.d" || mkdir -p "$(DESTDIR)/etc/cvmfs/config.d"	
+ 	test -z "$(DESTDIR)/etc/cvmfs/domain.d" || mkdir -p "$(DESTDIR)/etc/cvmfs/domain.d"
+ 	test -z "$(DESTDIR)/etc/cvmfs/keys" || mkdir -p "$(DESTDIR)/etc/cvmfs/keys"
+ 	install -c auto.cvmfs "$(DESTDIR)/etc/auto.cvmfs"
+ 	install -c mount.cvmfs "$(DESTDIR)/sbin/mount.cvmfs"
+-	install -c cvmfs.initd "$(DESTDIR)/etc/rc.d/init.d/cvmfs"
+ 	install -c -m 0644 config.sh "$(DESTDIR)/etc/cvmfs/config.sh"
+ 	install -c -m 0644 default.conf "$(DESTDIR)/etc/cvmfs/default.conf"
+ 	install -c -m 0644 domain.d/cern.ch.conf "$(DESTDIR)/etc/cvmfs/domain.d/cern.ch.conf"
--- a/net-fs/cvmfs/files/cvmfs-2.0.19-openrc.patch
+++ b/net-fs/cvmfs/files/cvmfs-2.0.19-openrc.patch
@ -0,0 +1,82 @@
+diff -Nur cvmfs-2.0.19.orig/cvmfs/src/cvmfs_config cvmfs-2.0.19/cvmfs/src/cvmfs_config
+--- cvmfs-2.0.19.orig/cvmfs/src/cvmfs_config	2012-05-05 15:16:19.000000000 +0100
+++ cvmfs-2.0.19/cvmfs/src/cvmfs_config	2012-07-23 23:16:06.000000000 +0100
+@@ -16,9 +16,15 @@
+ 
+ if [ -x /sbin/service ]; then
+   service="/sbin/service"
+-else
+  chkconfig="/sbin/chkconfig"
+elif [ -x /usr/sbin/service ]; then
+   # Ubuntu
+   service="/usr/sbin/service"
+  chkconfig="/usr/sbin/chkconfig"
+elif [ -x /sbin/rc-service ]; then
+  # OpenRC
+  service="/sbin/rc-service"
+  chkconfig="/usr/bin/rc-config"
+ fi
+ 
+ var_list="CVMFS_USER CVMFS_NFILES CVMFS_CACHE_BASE CVMFS_MOUNT_DIR CVMFS_QUOTA_LIMIT \
+@@ -116,9 +122,9 @@
+    fi
+ 
+    if [ $noservice -eq 0 ]; then
+-      /sbin/chkconfig --list cvmfs > /dev/null 2>&1
+      $chkconfig --list cvmfs > /dev/null 2>&1
+       if [ $? -ne 0 ]; then
+-         /sbin/chkconfig --add cvmfs
+         $chkconfig --add cvmfs
+       fi
+    fi
+ 
+@@ -580,8 +586,8 @@
+    for cmd in 'uname -a' 'cat /etc/issue' 'hostname -f' 'ifconfig -a' 'cvmfs2 --version' \
+               'grep cvmfs2 /var/log/messages' 'grep cvmfs2 /var/log/syslog' \
+               "eval find ${CVMFS_CACHE_BASE} -maxdepth 1 -exec ls -lah \{\} \;" \
+-              'service cvmfs probe' 'mount' 'df -h' 'ps -ef' \
+-              'service cvmfs status' 'cvmfs_config showconfig' \
+              "${service}\ cvmfs\ probe" 'mount' 'df -h' 'ps -ef' \
+              "${service}\ cvmfs\ status" 'cvmfs_config showconfig' \
+               'cvmfs_config chksetup' 'cvmfs_config stat -v' \
+               'cat /etc/fuse.conf'  'ls -la /usr/bin/fusermount' 'ls -la /bin/fusermount' \
+               'cat /etc/auto.master' 'cat /etc/sysconfig/autofs' 'cat /etc/fstab'
+diff -Nur cvmfs-2.0.19.orig/cvmfs/src/cvmfs_server cvmfs-2.0.19/cvmfs/src/cvmfs_server
+--- cvmfs-2.0.19.orig/cvmfs/src/cvmfs_server	2011-11-30 11:26:55.000000000 +0000
+++ cvmfs-2.0.19/cvmfs/src/cvmfs_server	2012-07-23 23:31:32.000000000 +0100
+@@ -1,5 +1,13 @@
+ #!/bin/bash
+ 
+service=$(type -P service)
+chconfig=$(type -P chkconfig)
+if [ -n ${service} ]; then
+  # OpenRC
+  service="rc-service"
+  chkconfig="echo > /dev/null"
+fi
+
+ create_master_key() {
+    local name; name=$1
+    master_key="/etc/cvmfs/keys/$name.masterkey"
+@@ -161,8 +169,8 @@
+    create_whitelist $name
+    
+    echo -n "Starting services... "
+-   service cvmfsd start > /dev/null
+-   chkconfig cvmfsd on
+   $service cvmfsd start > /dev/null
+   $chkconfig cvmfsd on
+    echo "New CernVM-FS repository for $name" > /cvmfs/${name}/empty
+    usermod -s /bin/bash cvmfs
+    publish $name > /dev/null
+@@ -182,8 +190,8 @@
+    
+    echo -n "Stopping services... "
+    usermod -s /sbin/nologin cvmfs
+-   service cvmfsd stop > /dev/null
+-   chkconfig cvmfsd off
+   $service cvmfsd stop > /dev/null
+   $chkconfig cvmfsd off
+    echo "done"
+    
+    echo -n "Unmounting CernVM-FS Area... "
--- a/net-fs/cvmfs/files/cvmfs-2.0.19-spinlock.patch
+++ b/net-fs/cvmfs/files/cvmfs-2.0.19-spinlock.patch
@ -0,0 +1,15 @@
+Use macro since SPIN_LOCK_UNLOCKED has been obsolete in kernel since 2007
+
+bicatali@gentoo.org 07/2012
+
+--- cvmfs-2.0.19.orig/kernel/cvmfsflt/src/cvmfsflt_data.c
+++ cvmfs-2.0.19/kernel/cvmfsflt/src/cvmfsflt_data.c
+@@ -5,7 +5,7 @@
+ int rbuf_head, rbuf_tail; /* Current positions in ring buffer */
+ struct semaphore rbuf_full, rbuf_empty;   /* semaphores for producer-consumer synchronization */
+ struct cvmfsflt_logline *ll_current = NULL;
+-static spinlock_t rbuf_wlock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(rbuf_wlock);
+ atomic_t cvmfsflt_noll = ATOMIC_INIT(0);  /* number of loglines in the ring buffer */
+ 
+ 
--- a/net-fs/cvmfs/files/cvmfs.initd
+++ b/net-fs/cvmfs/files/cvmfs.initd
@ -0,0 +1,195 @@
+#!/sbin/runscript
+
+extra_commands="probe status"
+extra_started_commands="reload flush restart_clean"
+description="The CernVM-FS init script"
+
+init() {
+    # Initialization, read config
+    [ -x /etc/cernvm/config ] && /etc/cernvm/config    
+    if [ -f /etc/cvmfs/config.sh ];  then
+	. /etc/cvmfs/config.sh
+    else
+	exit 1
+    fi
+
+    cvmfs_readconfig    
+    [ -f /etc/cernvm/repositories.sh ] && . /etc/cernvm/repositories.sh    
+    export LANG=C LC_ALL=C    
+    [ -f /etc/cernvm/custom/init.sh ] && . /etc/cernvm/custom/init.sh
+}
+
+depend() {
+    need net fuse autofs
+    after logger
+}
+
+list_mounts() {
+    mount -t fuse | grep "^cvmfs2[[:space:]]"
+}
+
+repository_status() {
+    local fqrn=$1 ret=0 pid
+    if list_mounts | grep ${CVMFS_MOUNT_DIR}/${fqrn} > /dev/null; then
+	pid=$(cvmfs-talk -c "${CVMFS_CACHE_BASE}" -i "${fqrn}" pid)
+	ret=$(echo ${pid} | grep ^[0-9]*$ > /dev/null)
+	if [ ${ret} -eq 0 ]; then
+	    einfo "CernVM-FS mounted on ${CVMFS_MOUNT_DIR}/${fqrn} with pid ${pid}"
+	else
+	    ewarn "CernVM-FS running with process ${pid}"
+	fi
+    else
+	einfo "CernVM-FS not mounted on ${CVMFS_MOUNT_DIR}/${fqrn}"
+    fi
+    return ${ret}
+}
+
+repository_flush() {
+    local fqrn=$1
+    ebegin "Flushing ${fqrn}"
+    stat ${CVMFS_MOUNT_DIR}/${fqrn}/. > /dev/null 2>&1 && \
+	cvmfs-talk -c "${CVMFS_CACHE_BASE}" -i "${fqrn}" cleanup 0 > /dev/null
+    eend $?
+}
+
+repository_reload() {
+    local fqrn=$1 ret=0 hosts
+    if cvmfs-talk -i ${fqrn} pid > /dev/null 2>&1; then		
+	ebegin "Reloading ${fqrn}"
+	[[ $(cvmfs-talk -i ${fqrn} timeout set ${CVMFS_TIMEOUT} ${CVMFS_TIMEOUT_DIRECT} 2>&1) == OK ]]
+	ret=$((ret + $?))
+	[[ $(cvmfs-talk -i ${fqrn} proxy set ${CVMFS_HTTP_PROXY} 2>&1) == OK ]]
+	ret=$((ret + $?))
+	hosts=$(echo ${CVMFS_SERVER_URL} | sed -e "s/@org@/$(cvmfs_getorg ${fqrn})/g" -e "s/@fqrn@/${fqrn}/g")
+	[[ $(cvmfs-talk -i ${fqrn} host set ${hosts} 2>&1) == OK ]]
+	ret=$((ret + $?))
+	[[ $(cvmfs-talk -i ${fqrn} max ttl set ${CVMFS_MAX_TTL:-0} 2>&1) == OK ]]
+	eend $?
+	ret=$((ret + $?))
+    else
+	einfo "${frqn} not mounted"
+    fi
+    return ${ret}
+}
+
+repository_wipe() {
+    local fqrn=$1
+    ebegin "Wiping out ${CVMFS_CACHE_BASE}/${fqrn}"
+    [ ! -d "${CVMFS_CACHE_BASE}/${fqrn}" ] || rm -rf "${CVMFS_CACHE_BASE}/${fqrn}"
+    eend $?
+}
+
+repository_probe() {
+    local fqrn=$1
+    ebegin "Probing ${CVMFS_MOUNT_DIR}/${fqrn}"
+    df -P "${CVMFS_MOUNT_DIR}/${fqrn}" 2>&1 | grep -q ^cvmfs2
+    eend $?
+}
+
+cvmfs_action() {
+    local action=$1 org fqrn
+    for org in ${CVMFS_REPOSITORIES/,/ /}; do
+	case ${org} in
+            none)
+		;;
+            *)
+		. /etc/cvmfs/config.sh
+		cvmfs_readconfig
+		fqrn=$(cvmfs_mkfqrn ${org})
+		cvmfs_readconfig ${fqrn}
+		[[ $(type -t "${action}") == "function" ]] && ${action} ${fqrn}
+		;;
+	esac
+    done
+}
+
+start() {
+    ebegin "Starting CernVM-FS"   
+    cvmfs_action repository_start
+    eend $?
+}
+
+stop() {
+    local m ret=0
+    # FIXME: do we need to unmount here or?
+    for m in $(list_mounts | awk '{print $3}');  do	
+	ebegin "Unmounting ${m}"
+	umount ${m} 2>/dev/null
+	eend $?
+	if [ $? -ne 0 ]; then
+            ret=$((ret + $?))
+            fuser -m -a -v ${m}
+	fi
+    done
+    if [ ${ret} -eq 0 ]; then
+	ebegin "Shutting down CernVM-FS"
+	cvmfs_action repository_stop
+	eend $?
+	ret=$((ret + $?))
+    fi
+    return ${ret}
+}
+
+status() {
+    ebegin "Checking status on CernVM-FS"
+    cvmfs_action repository_status
+        
+    local org processed repo ret=0
+
+    for org in ${CVMFS_REPOSITORIES/,/ /}; do
+	case ${org} in
+            none)
+		;;
+            *)
+		. /etc/cvmfs/config.sh # start with fresh repository_... functions
+		cvmfs_readconfig
+		fqrn=$(cvmfs_mkfqrn ${org})
+		processed="${fqrn} ${processed}"
+		cvmfs_readconfig ${fqrn}
+
+		# in an action?
+		list_mounts | grep ${CVMFS_MOUNT_DIR}/${fqrn} > /dev/null
+		if [ $? -eq 0 ]; then
+		    local pid=$(/usr/bin/cvmfs-talk -c "${CVMFS_CACHE_BASE}" -i "${fqrn}" pid)		   
+		    if echo ${pid} | grep ^[0-9]*$ > /dev/null; then
+			einfo "CernVM-FS mounted on ${CVMFS_MOUNT_DIR}/${fqrn} with pid ${pid}"
+		    else
+			ret=$((ret + $?))
+			ewarn "CernVM-FS running with process ${pid}"
+		    fi
+		else
+		    einfo "CernVM-FS not mounted on ${CVMFS_MOUNT_DIR}/${fqrn}"
+		fi
+		;;
+	esac
+    done
+    
+    for repo in $(list_mounts | awk '{print $3}'); do
+	repo=$(basename "${repo}")	
+	echo "${processed}" | grep -q "${repo}" || \
+            ewarn "CernVM-FS mounted on ${CVMFS_MOUNT_DIR}/${repo} (not in CVMFS_REPOSITORIES)"
+    done
+    eend ${ret}
+}
+
+flush() {
+    cvmfs_action repository_flush
+}
+
+reload() {
+    cvmfs_action repository_reload
+}
+
+restart_clean() {
+    stop
+    local ret=$?
+    cvmfs_action repository_wipe
+    ret=$((ret + $?))
+    [[ ${ret} == 0 ]] && start
+    ret=$((ret + $?))
+    return ${ret}
+}
+
+probe() {    
+    cvmfs_action repository_probe
+}
--- a/net-fs/cvmfs/files/cvmfsd.confd
+++ b/net-fs/cvmfs/files/cvmfsd.confd
--- a/net-fs/cvmfs/files/cvmfsd.initd
+++ b/net-fs/cvmfs/files/cvmfsd.initd
@ -0,0 +1,191 @@
+#!/sbin/runscript
+
+. /etc/cvmfs/server.conf
+[[ -f /etc/cvmfs/server.local ]] && . /etc/cvmfs/server.local
+
+extra_commands="checkconfig"
+extra_started_commands="pause flush resume"
+
+description="Background daemon that writes the cvmfs character device into a log file"
+description_checkconfig="Check configuration file validity"
+description_pause="Pause the transactions (not a full stop)"
+description_flush="Flush the CernVM-FS change log"
+description_resume="Resume transactions after a pause"
+
+pidfile="/var/run/cvmfsd.pid"
+subsysfile="/var/lock/subsys/cvmfsd"
+
+checkconfig() {
+    local var ret=0
+    for var in SHADOW_DIR PUB_DIR LOG_FILE;  do
+	eval value=\$$var
+	if [[ -z ${value} ]]; then
+	    eerror "You need to set a value for ${var} in /etc/cvmfs/server.local"
+	    ret=$((ret + $?))
+	fi
+    done
+    return ${ret}
+}
+
+depend() {
+    after localmount
+    use net
+}
+
+# returns: 0 (stopped), 1 (running), 2 (paused)
+check_status() {
+    if [ -f ${pidfile} ]; then
+	[ $(cat /sys/fs/redirfs/filters/cvmfsflt/lockdown) -eq 1 ] && return 2
+	return 1
+    fi
+    return 0
+}
+
+# FIXME: could we use start-stop-daemon instead of listen/unlisten?
+
+listen() {
+    ebegin "Starting journal writer"
+    nohup cat /dev/cvmfs >> "${LOG_FILE}" 2>/dev/null </dev/null &
+    [ $? -eq 0 ] && echo $! > ${pidfile}
+    eend $?
+}
+
+unlisten() {
+    ebegin "Stopping journal writer"
+    local pid=$(cat ${pidfile})
+    kill ${pid}
+    local killed=0 retries=0
+    while [ ${killed} -eq 0 ]; do
+	sleep 1
+	kill -0 ${pid} 2>/dev/null
+	killed=$?
+	retries=$((retries + 1))
+	[ ${retries} -eq 3 ] && kill -9 ${pid}
+    done
+    eend $?
+}
+
+start() {
+    checkconfig || return 1
+
+    if [ ! -d ${SHADOW_DIR} ]; then
+	eerror "Missing ${SHADOW_DIR}"
+	return 1
+    fi
+    
+    if mkdir -p "$(echo "${LOG_FILE}" | grep -o '\([^\/]*\/\)*')"; then
+	eerror "Could not create file system journal in ${LOG_FILE}"
+	return 1
+    fi
+    
+    ebegin "Loading cvmfsflt kernel module"
+    modprobe -q redirfs && modprobe -q cvmfsflt
+    eend $? || return 1
+   
+    ebegin "Linking to character device"
+    rm -f /dev/cvmfs
+    mknod /dev/cvmfs c $(awk '/cvmfs/ {print $1}' /proc/devices) 0 > /dev/null 2>&1
+    chmod 0600 /dev/cvmfs
+    eend $? || return 1
+    
+    ebegin "Setting filter path to ${SHADOW_DIR}"
+    echo -n "a:i:${SHADOW_DIR}" > /sys/fs/redirfs/filters/cvmfsflt/paths
+    eend $? || return 1
+    
+    listen || return 1
+    ebegin "Starting CernVM-FS daemon"
+    touch ${subsysfile}
+    eend $?
+}
+
+
+pause() {
+    check_status
+    local ret=$?
+    if [ ${ret} -eq 0 ]; then
+	eerror "CernVM-FS daemon is stopped"
+	return 1
+    fi
+    if [ ${ret} -eq 2 ]; then
+	ewarn "CernVM-FS daemon is already paused"
+	return 1
+    fi
+   
+   ebegin "Locking down ${SHADOW_DIR}"
+   echo -n "1" > /sys/fs/redirfs/filters/cvmfsflt/lockdown
+   eend $? || return 1
+
+   ebegin "Waiting for pending operations on ${SHADOW_DIR}"
+   local nowops noll
+   while true;  do
+       nowops=$(cat /sys/fs/redirfs/filters/cvmfsflt/nowops)
+       [ $? -ne 0 ] && eend 1 && return 1
+       [ ${nowops} -eq 0 ] && break
+       sleep 1
+   done
+   eend $?
+   
+   ebegin "Waiting for pending messages in call buffer"
+   local noll
+   while true; do
+       noll=$(cat /sys/fs/redirfs/filters/cvmfsflt/noll)
+       [ $? -ne 0 ] && eend 1 && return 1
+       [ ${noll} -eq 0 ] && break
+       sleep 1
+   done
+   eend $? || return 1
+   unlisten || return 1
+   mark_service_stopped cvmfsd
+}
+
+resume() {
+   check_status
+   local ret=$?
+   if [ ${ret} -eq 0 ]; then
+       eerror "CernVM-FS daemon is stopped"
+       return 1
+   fi
+   if [ $retval -eq 1 ]; then
+       ewarn "CernVM-FS daemon is already running"
+       return 1
+   fi
+   
+   listen || return 1
+   
+   ebegin "Open up ${SHADOW_DIR}"
+   echo -n "0" > /sys/fs/redirfs/filters/cvmfsflt/lockdown
+   eend $? || return 1
+   mark_service_started cvmfsd
+}
+
+
+stop() {
+    check_status
+    local ret=$?
+    if [ ${ret} -eq 0 ]; then
+	ewarn "CernVM-FS daemon is already stopped"
+	return 2
+    fi
+   
+    if [ ${ret} -eq 1 ]; then
+	pause
+	ret=$?
+	[ ${ret} -ne 0 ] && return ${ret}
+    fi
+   
+    ebegin "Unloading cvmfsflt kernel module"
+    echo -n "c\0" > /sys/fs/redirfs/filters/cvmfsflt/paths || ret=$((ret + 1))
+    echo -n "1\0" > /sys/fs/redirfs/filters/cvmfsflt/unregister || ret=$((ret + 1))
+    rmmod cvmfsflt || ret=$((ret + 1))
+    eend ${ret} || return 1
+   
+    ebegin "Shutting down CernVM-FS daemon"
+    rm -f ${pidfile} ${subsysfile}
+    eend $?
+}
+
+flush() {
+   ebegin "Flushing CernVM-FS server file system change log"
+   cat /dev/null > "${LOG_FILE}"
+   eend $?
+}
--- a/net-fs/cvmfs/metadata.xml
+++ b/net-fs/cvmfs/metadata.xml
@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>bicatali@gentoo.org</email>
+</maintainer>
+<longdescription lang='en'>
+  The CernVM File System is a client-server file system developed to
+  deliver software stacks onto virtual machines in a fast, scalable,
+  and reliable way. CernVM-FS is implemented as a FUSE module. It
+  makes a specially prepared directory tree stored on a web server
+  look like a local read-only file system on the virtual
+  machine. CernVM-FS uses outgoing HTTP connections only, thereby it
+  avoids most of the firewall issues of other network file systems. It
+  transfers data file by file on demand, verifying the content by
+  SHA-1 keys.
+</longdescription>
+<use>
+  <flag name='client'>Install the cvmfs client programs and init script</flag>
+  <flag name='server'>Install the cvmfsd program and init script</flag>
+</use>
+</pkgmetadata>
--- a/net-ftp/lftp/lftp-4.4.0.ebuild
+++ b/net-ftp/lftp/lftp-4.4.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.4.0.ebuild,v 1.1 2012/09/29 16:37:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-4.4.0.ebuild,v 1.2 2012/10/30 12:02:10 blueness Exp $

 EAPI=4
 inherit autotools eutils
@ -11,7 +11,7 @@ SRC_URI="http://ftp.yars.free.net/pub/source/${PN}/${P}.tar.xz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"

 LFTP_LINGUAS="cs de es fr it ja ko pl pt_BR ru zh_CN zh_HK zh_TW"

--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST vatnumber-1.0.tar.gz 21693 SHA256 6ef6103f7ecf09cdf32b87bb1c87616b72b9546e4b364a3b66d2b0b4b340665a SHA512 b21a4afd63e2070b7934d19bf28e5f722a3135e165e438ff68080c1a66719d4dfe7da7b33880d684be6d872ef6bc3aab77a05c3cd7ed5790c3d04f26d563ec10 WHIRLPOOL 42efc62182c8037c1ff44c68e5052d33a50c356d1b71833843f292e444b68b78cecb091bda4c179bb2c7c87a9c852851d5472e21a1a5d76d759ccf4a07871739`
				`@ -0,0 +1 @@`
				`DIST cvmfs-2.0.19.tar.gz 7740158 SHA256 a92ff675e16f4766d7108a2d34ccce324d83bdd720262b6574cc90a2510e580c SHA512 4456af5a883de199d8e6b6f5ba5fb25cd25c986677055a22fc1aa1d64e27fdd66ba5b406d2c4a6960af3866dbdf85b57f1ebc1a447dce6ebaca196a21aee95da WHIRLPOOL 621c59bdf52c963d528399a20af5c7c950afb300b0eaeb4dae5c7b3cc83436de897a184fffedd386921f5c84fb075f15dd42f820679d7a473ee6525b884b356f`