diff --git a/app-accessibility/espeak/espeak-1.45.04.ebuild b/app-accessibility/espeak/espeak-1.45.04.ebuild
index 3e23e6b13938..2a1f4f096094 100644
--- a/app-accessibility/espeak/espeak-1.45.04.ebuild
+++ b/app-accessibility/espeak/espeak-1.45.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.45.04.ebuild,v 1.4 2011/12/04 14:45:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeak/espeak-1.45.04.ebuild,v 1.5 2011/12/04 16:06:46 armin76 Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Speech synthesizer for English and other languages"
 HOMEPAGE="http://espeak.sourceforge.net/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="portaudio pulseaudio"
 REQUIRED_USE="portaudio? ( !pulseaudio )
 	pulseaudio? ( !portaudio )"
diff --git a/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild b/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild
index 3036dbc81248..d71d62280c9a 100644
--- a/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild
+++ b/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild,v 1.3 2011/11/28 11:52:23 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild,v 1.4 2011/12/04 18:16:04 armin76 Exp $
 
 IUSE="linguas_de linguas_es linguas_fr linguas_it linguas_la linguas_pl
 	linguas_ro linguas_sv"
@@ -45,7 +45,7 @@ QA_PREBUILT="/usr/bin/mbrola"
 
 SLOT="0"
 LICENSE="MBROLA"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 
 src_unpack () {
 	unpack ${A}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 581bd6e5a66b..84874f368c1f 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,4 +1,2 @@
-DIST puppet-2.6.11.gem 1545728 RMD160 ee9672ace49bcc8d08ebec61428feefe8f0c9dd5 SHA1 ed55d1338b774c8ca1201092aefedeb68160cc04 SHA256 ce86eba1c2804d9459aa4f461b04cba3bfc78fe7e488244c34a7cd2dd200746e
 DIST puppet-2.6.12.gem 1530880 RMD160 283875f708d07e1b8acbf8cbe8fb6e1f1a67b5bf SHA1 75e6978b13a88b3498e3f79f467a19802ec83672 SHA256 d4dbfb48c42e73fd22d1f3605d6794756f7cd0873e57b3ffde00d81e5ccfa732
-DIST puppet-2.7.5.gem 1732608 RMD160 a29be8c85c498c99158be743127383ca718e7eea SHA1 db1b63bf1d1ac63d2be76103f636d3d1c5788b1c SHA256 24e476e414b278e55b27f7690d5eb6ec3b667d9dae39f65400d5a576b6752eb5
 DIST puppet-2.7.6.gem 1738240 RMD160 16dba3d477624ee04f8a433ade15555a28d0a919 SHA1 650e7c6f0560f7bd4e4c520737a6844e50cd0df3 SHA256 566d28f471cb65ffe278c1d6ec69147441db5f811b94d44527e9211915ed4bcd
diff --git a/app-admin/puppet/files/puppetmaster-2.7.6.confd b/app-admin/puppet/files/puppetmaster-2.7.6.confd
new file mode 100644
index 000000000000..afecf479a6a1
--- /dev/null
+++ b/app-admin/puppet/files/puppetmaster-2.7.6.confd
@@ -0,0 +1,18 @@
+# Location of PID files
+PUPPETMASTER_PID_DIR="/var/run/puppet"
+
+# Where to log general messages to.
+# Specify syslog to send log messages to the system log.
+#PUPPETMASTER_LOG="syslog"
+
+# You may specify other parameters to the puppetmaster here
+#PUPPETMASTER_EXTRA_OPTS="--noca"
+
+# You may specify an alternate port on which puppetmaster should listen.
+# Default is: 8140
+#PUPPETMASTER_PORT="8140"
+
+# To start multiple servers:
+# # cp /etc/conf.d/puppetmaster /etc/conf.d/puppetmaster.master_8141
+# # ln -s puppetmaster /etc/init.d/puppetmaster.master_8141
+# # ${EDITOR} /etc/conf.d/puppetmaster.master_8141 (set 8141 to PUPPETMASTER_PORT)
diff --git a/app-admin/puppet/files/puppetmaster-2.7.6.init b/app-admin/puppet/files/puppetmaster-2.7.6.init
new file mode 100644
index 000000000000..05ed1eb30878
--- /dev/null
+++ b/app-admin/puppet/files/puppetmaster-2.7.6.init
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "puppetmaster" ] ; then
+	PUPPETMASTER_PID="master"
+else
+	PUPPETMASTER_PID="${SVCNAME#*.}"
+fi
+pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
+
+command_args="--pidfile ${pidfile}"
+if [ -n "${PUPPETMASTER_PORT}" ] ; then
+	command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
+fi
+command_args="${command_args} ${PUPPETMASTER_EXTRA_OPTS}"
+
+command="/usr/bin/puppetmasterd"
+extra_started_commands="reload"
+
+depend() {
+	need localmount net
+	use dns logger slapd netmount nfsmount
+}
+
+start_pre() {
+	checkpath --dir --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $? "Failed to stop ${SVCNAME}"
+}
diff --git a/app-admin/puppet/puppet-2.6.11.ebuild b/app-admin/puppet/puppet-2.6.11.ebuild
deleted file mode 100644
index 952f2b4074ba..000000000000
--- a/app-admin/puppet/puppet-2.6.11.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.6.11.ebuild,v 1.6 2011/10/09 17:44:00 xarthisius Exp $
-
-EAPI="3"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
-
-inherit elisp-common xemacs-elisp-common eutils ruby-fakegem
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://puppetlabs.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs"
-KEYWORDS="amd64 hppa ppc sparc x86"
-
-ruby_add_rdepend "
-	>=dev-ruby/facter-1.5.1
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite3? ( dev-ruby/sqlite3-ruby )
-	virtual/ruby-ssl"
-#	couchdb? ( dev-ruby/couchrest )
-#	mongrel? ( www-servers/mongrel )
-#	rack? ( >=dev-ruby/rack-1 )
-#	rails? (
-#		dev-ruby/rails
-#		>=dev-ruby/activerecord-2.1
-#	)
-#	stomp? ( dev-ruby/stomp )
-
-DEPEND="${DEPEND}
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )"
-RDEPEND="${RDEPEND}
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? ( sys-libs/libselinux[ruby] )
-	>=app-portage/eix-0.18.0"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
-	fi
-
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs || die
-		cp ext/emacs/* ext/xemacs/ || die
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el || die "xemacs-elisp-compile failed"
-	fi
-}
-
-each_fakegem_install() {
-	${RUBY} install.rb --destdir="${D}" install || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newinitd "${FILESDIR}"/puppetmaster.init puppetmaster || die
-	doconfd conf/gentoo/conf.d/puppetmaster || die
-	newinitd "${FILESDIR}"/puppet.init puppet || die
-	doconfd conf/gentoo/conf.d/puppet || die
-
-	# Initial configuration files
-	keepdir /etc/puppet/manifests || die
-	keepdir /etc/puppet/modules || die
-	insinto /etc/puppet
-
-	# Bug #338439
-	#doins conf/gentoo/puppet/* || die
-	doins conf/redhat/*.conf || die
-	doins conf/auth.conf || die
-
-	# Location of log and data files
-	keepdir /var/run/puppet || die
-	keepdir /var/log/puppet || die
-	keepdir /var/lib/puppet/ssl || die
-	keepdir /var/lib/puppet/facts || die
-	keepdir /var/lib/puppet/files || die
-	fowners -R puppet:puppet /var/{run,log,lib}/puppet || die
-
-	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* || die "xemacs-elisp-install failed"
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema || die
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim || die
-		insinto /usr/share/vim/vimfiles/ftplugin; doins ext/vim/ftplugin/puppet.vim || die
-		insinto /usr/share/vim/vimfiles/indent; doins ext/vim/indent/puppet.vim || die
-		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim || die
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}" || die
-	done
-	docinto conf; dodoc conf/namespaceauth.conf || die
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Puppet uses eix to get information about currently installed packages,"
-	elog "so please keep the eix metadata cache updated so puppet is able to properly"
-	elog "handle package installations."
-	elog
-	elog "Currently puppet only supports adding and removing services to the default"
-	elog "runlevel, if you want to add/remove a service from another runlevel you may"
-	elog "do so using symlinking."
-	elog
-
-	if [ \
-		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
-	] ; then
-		elog
-		elog "Please remove deprecated config files."
-		elog "	/etc/puppet/puppetca.conf"
-		elog "	/etc/puppet/puppetd.conf"
-		elog "	/etc/puppet/puppetmasterd.conf"
-		elog
-	fi
-
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-2.7.5.ebuild b/app-admin/puppet/puppet-2.7.6-r1.ebuild
similarity index 66%
rename from app-admin/puppet/puppet-2.7.5.ebuild
rename to app-admin/puppet/puppet-2.7.6-r1.ebuild
index 3b489a0b8bb3..a972b08dcb48 100644
--- a/app-admin/puppet/puppet-2.7.5.ebuild
+++ b/app-admin/puppet/puppet-2.7.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.5.ebuild,v 1.1 2011/09/30 23:58:51 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.6-r1.ebuild,v 1.1 2011/12/04 17:11:02 matsuu Exp $
 
-EAPI="3"
+EAPI="4"
 # ruby19: dev-ruby/ruby-ldap has no ruby19
 USE_RUBY="ruby18"
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://puppetlabs.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 
 ruby_add_rdepend "
@@ -59,72 +59,81 @@ all_ruby_compile() {
 	all_fakegem_compile
 
 	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el || die "elisp-compile failed"
+		elisp-compile ext/emacs/puppet-mode.el
 	fi
 
 	if use xemacs ; then
 		# Create a separate version for xemacs to be able to install
 		# emacs and xemacs in parallel.
-		mkdir ext/xemacs || die
-		cp ext/emacs/* ext/xemacs/ || die
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el || die "xemacs-elisp-compile failed"
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
 	fi
 }
 
 each_fakegem_install() {
-	${RUBY} install.rb --destdir="${D}" install || die
+	${RUBY} install.rb --destdir="${D}" install
 }
 
 all_ruby_install() {
 	all_fakegem_install
 
-	newinitd "${FILESDIR}"/puppetmaster.init puppetmaster || die
-	doconfd conf/gentoo/conf.d/puppetmaster || die
-	newinitd "${FILESDIR}"/puppet.init puppet || die
-	doconfd conf/gentoo/conf.d/puppet || die
+	newinitd "${FILESDIR}"/puppet.init puppet
+	doconfd conf/gentoo/conf.d/puppet
 
 	# Initial configuration files
-	keepdir /etc/puppet/manifests || die
-	keepdir /etc/puppet/modules || die
 	insinto /etc/puppet
-
 	# Bug #338439
-	#doins conf/gentoo/puppet/* || die
-	doins conf/redhat/*.conf || die
-	doins conf/auth.conf || die
+	#doins conf/gentoo/puppet/*
+	doins conf/redhat/puppet.conf
 
 	# Location of log and data files
-	keepdir /var/run/puppet || die
-	keepdir /var/log/puppet || die
-	keepdir /var/lib/puppet/ssl || die
-	keepdir /var/lib/puppet/facts || die
-	keepdir /var/lib/puppet/files || die
-	fowners -R puppet:puppet /var/{run,log,lib}/puppet || die
+	keepdir /var/{run,log}/puppet
+	fowners -R puppet:puppet /var/{run,log}/puppet
+
+	if use minimal ; then
+		rm "${ED}/usr/bin/puppetmasterd"
+		rm "${ED}/etc/puppet/auth.conf"
+	else
+		newinitd "${FILESDIR}"/puppetmaster-2.7.6.init puppetmaster
+		newconfd "${FILESDIR}"/puppetmaster-2.7.6.confd puppetmaster
+
+		insinto /etc/puppet
+		doins conf/redhat/fileserver.conf
+
+		keepdir /etc/puppet/manifests
+		keepdir /etc/puppet/modules
+
+		keepdir /var/lib/puppet/ssl
+		keepdir /var/lib/puppet/facts
+		keepdir /var/lib/puppet/files
+		fowners -R puppet:puppet /var/{run,log,lib}/puppet
+	fi
 
 	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el* || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		elisp-install ${PN} ext/emacs/puppet-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
 	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* || die "xemacs-elisp-install failed"
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
 	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema || die
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
 	fi
 
 	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim || die
-		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim || die
+		insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
 	fi
 
 	# ext and examples files
 	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}" || die
+		docinto "$(dirname ${f})"; dodoc "${f}"
 	done
-	docinto conf; dodoc conf/namespaceauth.conf || die
+	docinto conf; dodoc conf/namespaceauth.conf
 }
 
 pkg_postinst() {
diff --git a/app-emacs/browse-kill-ring/Manifest b/app-emacs/browse-kill-ring/Manifest
index 91a65c9c9357..b0ad9025bfb7 100644
--- a/app-emacs/browse-kill-ring/Manifest
+++ b/app-emacs/browse-kill-ring/Manifest
@@ -1 +1,2 @@
 DIST browse-kill-ring-1.3.el.bz2 9225 RMD160 557e9abbda55edf2e2ecec64b83bd527c64f2414 SHA1 f948cd0de149ee1fe7e9266e376a30078ffc946d SHA256 2805f8d512720e14ebeb57bad0b6c9383a4a24fa4d547da99f17594ecdf1ec97
+DIST browse-kill-ring-1.3c.el.bz2 9757 RMD160 00536f99b55a2d2f585b8c08286dcaf0b1613761 SHA1 bda2afa1e2384368cabfa49cd2ff7eb725d84a73 SHA256 daa4784c160fd3f03d7e310a965b06da87732728591306d15c1c050cb75f3d18
diff --git a/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild b/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
new file mode 100644
index 000000000000..94c3d30899f8
--- /dev/null
+++ b/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild,v 1.1 2011/12/04 23:35:32 ulm Exp $
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="An improved interface to kill-ring"
+HOMEPAGE="http://www.emacswiki.org/emacs/BrowseKillRing
+	https://github.com/T-J-Teru/browse-kill-ring"
+# taken from upstream git repo
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/python-mode/python-mode-5.2.0.ebuild b/app-emacs/python-mode/python-mode-5.2.0.ebuild
index 95856ffd2e45..2678cb4d229d 100644
--- a/app-emacs/python-mode/python-mode-5.2.0.ebuild
+++ b/app-emacs/python-mode/python-mode-5.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-5.2.0.ebuild,v 1.4 2011/12/03 23:47:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-5.2.0.ebuild,v 1.5 2011/12/04 15:49:44 armin76 Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild
index 2af127c3841b..1b459a9e6422 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild,v 1.3 2011/08/27 18:53:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.14.1-r2.ebuild,v 1.4 2011/12/04 16:47:10 hwoarang Exp $
 
 BACKPORTS=2
 
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
 	${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-i18n/scim-prime/scim-prime-1.0.1.ebuild b/app-i18n/scim-prime/scim-prime-1.0.1.ebuild
index 803794f40aa3..8e38e6d2cd2c 100644
--- a/app-i18n/scim-prime/scim-prime-1.0.1.ebuild
+++ b/app-i18n/scim-prime/scim-prime-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-prime/scim-prime-1.0.1.ebuild,v 1.1 2008/09/23 16:55:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-prime/scim-prime-1.0.1.ebuild,v 1.2 2011/12/04 16:43:50 hwoarang Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge.jp/scim-imengine/29156/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=app-i18n/scim-1.0
diff --git a/app-misc/vlock/vlock-2.2.3.ebuild b/app-misc/vlock/vlock-2.2.3.ebuild
index 8e3f829bd275..ef27c222edc6 100644
--- a/app-misc/vlock/vlock-2.2.3.ebuild
+++ b/app-misc/vlock/vlock-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/vlock-2.2.3.ebuild,v 1.3 2011/12/02 16:07:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/vlock-2.2.3.ebuild,v 1.4 2011/12/04 18:12:06 armin76 Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://cthulhu.c3d2.de/~toidinamai/vlock/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="pam test"
 
 RDEPEND="pam? ( sys-libs/pam )"
diff --git a/app-office/abiword/abiword-2.8.6-r2.ebuild b/app-office/abiword/abiword-2.8.6-r2.ebuild
new file mode 100644
index 000000000000..e8bd5e4a0eb3
--- /dev/null
+++ b/app-office/abiword/abiword-2.8.6-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6-r2.ebuild,v 1.1 2011/12/04 20:03:03 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit alternatives eutils gnome2 versionator autotools
+
+MY_MAJORV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Fully featured yet light and fast cross platform word processor"
+HOMEPAGE="http://www.abisource.com/"
+SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="collab cups gnome grammar latex math ots openxml plugins readline spell wordperfect wmf thesaurus" # svg
+
+# libgsf raised to make sure it provides gio backend
+# not enabling telepathy backend for collab, it depends on libempathy-gtk which
+# has be removed from empathy-2.30 already
+RDEPEND="
+	>=app-text/wv-1.2
+	>=dev-libs/fribidi-0.10.4
+	>=dev-libs/glib-2.16:2
+	>=gnome-base/librsvg-2.16:2
+	>=gnome-extra/libgsf-1.14.15
+	>=media-libs/libpng-1.2
+	virtual/jpeg
+	>=x11-libs/cairo-1.8[X]
+	>=x11-libs/gtk+-2.14:2[cups?]
+	gnome? (
+		>=gnome-extra/gucharmap-2
+		>=x11-libs/goffice-0.8:0.8 )
+	plugins? (
+		collab? (
+			>=dev-libs/boost-1.33.1
+			>=dev-libs/libxml2-2.4
+			>=net-libs/loudmouth-1
+			net-libs/libsoup:2.4
+			net-libs/gnutls )
+		grammar? ( >=dev-libs/link-grammar-4.2.1 )
+		latex? ( dev-libs/libxslt )
+		math? ( >=x11-libs/gtkmathview-0.7.5 )
+		openxml? ( dev-libs/boost )
+		ots? ( >=app-text/ots-0.5 )
+		readline? ( sys-libs/readline )
+		thesaurus? ( >=app-text/aiksaurus-1.2[gtk] )
+		wordperfect? (
+			app-text/libwpd:0.9
+			app-text/libwpg:0.2 )
+		wmf? ( >=media-libs/libwmf-0.2.8 )
+	)
+	spell? ( >=app-text/enchant-1.2 )
+	!<app-office/abiword-plugins-2.8"
+#		svg? ( >=gnome-base/librsvg-2 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	collab? ( dev-cpp/asio )"
+
+pkg_setup() {
+	# do not enable gnome-vfs
+	G2CONF="${G2CONF}
+		--enable-shave
+		--disable-static
+		--disable-default-plugins
+		--disable-builtin-plugins
+		--disable-collab-backend-telepathy
+		--enable-clipart
+		--enable-statusbar
+		--enable-templates
+		--with-gio
+		--without-gnomevfs
+		$(use_with gnome goffice)
+		$(use_enable cups print)
+		$(use_enable collab collab-backend-xmpp)
+		$(use_enable collab collab-backend-tcp)
+		$(use_enable collab collab-backend-service)
+		$(use_enable spell)"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+	epatch "${FILESDIR}"/${P}-gcc46.patch
+	epatch "${FILESDIR}"/${P}-libwpd.patch
+
+	# install icon to pixmaps (bug #220097)
+	sed 's:$(datadir)/icons:$(datadir)/pixmaps:' \
+		-i Makefile.am Makefile.in || die "sed 1 failed"
+	# readme.txt will be installed using dodoc
+	sed '/readme\.txt\|abw/d' \
+		-i user/wp/Makefile.am user/wp/Makefile.in || die "sed 2 failed"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local plugins=""
+
+	if use plugins; then
+		# Plugins depending on libgsf
+		plugins="t602 docbook clarisworks wml kword hancom openwriter pdf
+			loadbindings mswrite garble pdb applix opendocument sdw xslfo"
+
+		# Plugins not depending on anything
+		plugins="${plugins} gimp bmp freetranslation iscii s5 babelfish opml eml
+			wikipedia gdict passepartout google presentation urldict hrtext mif"
+
+		# inter7eps: eps.h
+		# libtidy: gsf + tidy.h
+		# paint: windows only ?
+		use collab && plugins="${plugins} collab"
+		use gnome && plugins="${plugins} goffice"
+		use latex && plugins="${plugins} latex"
+		use math && plugins="${plugins} mathview"
+		use openxml && plugins="${plugins} openxml"
+		use ots && plugins="${plugins} ots"
+		# psion: >=psiconv-0.9.4
+		use readline && plugins="${plugins} command"
+		# plugin doesn't build
+		#use svg && plugins="${plugins} rsvg"
+		use thesaurus && plugins="${plugins} aiksaurus"
+		use wmf && plugins="${plugins} wmf"
+		# wordperfect: >=wpd-0.9 >=wpg-0.2
+		use wordperfect && plugins="${plugins} wpg"
+	fi
+
+	gnome2_src_configure --enable-plugins="$(echo ${plugins})"
+}
+
+src_install() {
+	gnome2_src_install
+
+	sed "s:Exec=abiword:Exec=abiword-${MY_MAJORV}:" \
+		-i "${ED}"/usr/share/applications/abiword.desktop || die "sed 3 failed"
+
+	mv "${ED}/usr/bin/abiword" "${ED}/usr/bin/AbiWord-${MY_MAJORV}"
+	dosym AbiWord-${MY_MAJORV} /usr/bin/abiword-${MY_MAJORV}
+
+	dodoc AUTHORS user/wp/readme.txt
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
+}
diff --git a/app-office/abiword/files/abiword-2.8.6-libwpd.patch b/app-office/abiword/files/abiword-2.8.6-libwpd.patch
new file mode 100644
index 000000000000..a3f4a474e5a5
--- /dev/null
+++ b/app-office/abiword/files/abiword-2.8.6-libwpd.patch
@@ -0,0 +1,391 @@
+--- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	(revision 29401)
++++ plugins/wordperfect/xp/ie_imp_WordPerfect.cpp	(revision 29403)
+@@ -60,7 +60,7 @@
+ 
+ // Stream class
+ 
+-#include <libwpd/WPXStream.h>
++#include <libwpd-stream/libwpd-stream.h>
+ 
+ #include <gsf/gsf-input.h>
+ #include <gsf/gsf-infile.h>
+@@ -70,12 +70,7 @@
+ #include <libwps/libwps.h>
+ #endif
+ 
+-class AbiWordperfectInputStream :
+-#ifdef HAVE_LIBWPS
+-	public WPSInputStream
+-#else
+-    public WPXInputStream
+-#endif
++class AbiWordperfectInputStream : public WPXInputStream
+ {
+ public:
+ 	AbiWordperfectInputStream(GsfInput *input);
+@@ -86,7 +81,7 @@
+ 
+ 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
+ 
+-	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
++	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
+ 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
+ 	virtual long tell();
+ 	virtual bool atEOS();
+@@ -98,11 +93,7 @@
+ };
+ 
+ AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
+-#ifdef HAVE_LIBWPS
+-	WPSInputStream(),
+-#else
+-	WPXInputStream(true),
+-#endif
++	WPXInputStream(),
+ 	m_input(input),
+ 	m_ole(NULL)
+ {
+@@ -117,9 +108,9 @@
+ 	g_object_unref(G_OBJECT(m_input));
+ }
+ 
+-const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead)
++const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
+ {
+-	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
++	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
+ 
+ 	if (buf == NULL)
+ 		numBytesRead = 0;
+@@ -256,19 +247,12 @@
+ {
+ 	AbiWordperfectInputStream gsfInput(input);
+ 
+-	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true);
++	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
+ 
+ 	switch (confidence)
+ 	{
+ 		case WPD_CONFIDENCE_NONE:
+-		// libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document)
+-		// however, we'll let the text importer handle such cases
+-		case WPD_CONFIDENCE_POOR: 
+ 			return UT_CONFIDENCE_ZILCH;
+-		case WPD_CONFIDENCE_LIKELY:
+-			return UT_CONFIDENCE_SOSO;
+-		case WPD_CONFIDENCE_GOOD:
+-			return UT_CONFIDENCE_GOOD;
+ 		case WPD_CONFIDENCE_EXCELLENT:
+ 			return UT_CONFIDENCE_PERFECT;
+ 		default:
+@@ -328,7 +312,7 @@
+ UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
+ {
+ 	AbiWordperfectInputStream gsfInput(input);
+-	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
++	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
+ 
+ 	if (error != WPD_OK)
+ 	{
+@@ -381,9 +365,9 @@
+ 	float marginLeft = 1.0f, marginRight = 1.0f;
+ 
+ 	if (propList["fo:margin-left"])
+-		marginLeft = propList["fo:margin-left"]->getFloat();
++		marginLeft = propList["fo:margin-left"]->getDouble();
+ 	if (propList["fo:margin-right"])
+-		marginRight = propList["fo:margin-right"]->getFloat();
++		marginRight = propList["fo:margin-right"]->getDouble();
+ 
+ 	if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */
+ 		/* marginTop != m_marginBottom || marginBottom != m_marginBottom */ )
+@@ -456,15 +440,15 @@
+ 	float marginTop = 0.0f, marginBottom = 0.0f;
+ 	float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f;
+ 	if (propList["fo:margin-top"])
+-	    marginTop = propList["fo:margin-top"]->getFloat();
++	    marginTop = propList["fo:margin-top"]->getDouble();
+ 	if (propList["fo:margin-bottom"])
+-	    marginBottom = propList["fo:margin-bottom"]->getFloat();
++	    marginBottom = propList["fo:margin-bottom"]->getDouble();
+ 	if (propList["fo:margin-left"])
+-	    marginLeft = propList["fo:margin-left"]->getFloat();
++	    marginLeft = propList["fo:margin-left"]->getDouble();
+ 	if (propList["fo:margin-right"])
+-	    marginRight = propList["fo:margin-right"]->getFloat();
++	    marginRight = propList["fo:margin-right"]->getDouble();
+ 	if (propList["fo:text-indent"])
+-	    textIndent = propList["fo:text-indent"]->getFloat();
++	    textIndent = propList["fo:text-indent"]->getDouble();
+ 
+ 	m_topMargin = marginTop;
+ 	m_bottomMargin = marginBottom;
+@@ -487,7 +471,7 @@
+ 
+ 	float lineSpacing = 1.0f;
+ 	if (propList["fo:line-height"])
+-		lineSpacing = propList["fo:line-height"]->getFloat();
++		lineSpacing = propList["fo:line-height"]->getDouble();
+ 	
+ 	UT_String tmpBuffer;
+ 	UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f",
+@@ -504,7 +488,7 @@
+ 			propBuffer += tmpBuffer;
+ 			if (i()["style:position"])
+ 			{
+-				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat());
++				UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble());
+ 				propBuffer += tmpBuffer;
+ 			}
+ 
+@@ -520,10 +504,10 @@
+ 			else // Left aligned is default
+ 				propBuffer += "/L";
+ 
+-			if (i()["style:leader-char"])
+-				if (i()["style:leader-char"]->getStr() == "-")
++			if (i()["style:leader-text"])
++				if (i()["style:leader-text"]->getStr() == "-")
+ 					propBuffer += "2";
+-				else if (i()["style:leader-char"]->getStr() == "_")
++				else if (i()["style:leader-text"]->getStr() == "_")
+ 					propBuffer += "3";
+ 				else // default to dot leader if the given leader is dot or is not supported by AbiWord
+ 					propBuffer += "1";
+@@ -586,12 +570,12 @@
+ 			propBuffer += "subscript";
+ 	}
+ 
+-	if (propList["style:text-underline"] || propList["style:text-crossing-out"])
++	if (propList["style:text-underline-type"] || propList["style:text-line-through-type"])
+ 	{
+ 		propBuffer += "; text-decoration:";
+-		if (propList["style:text-underline"])
++		if (propList["style:text-underline-type"])
+ 			propBuffer += "underline ";
+-		if (propList["style:text-crossing-out"])
++		if (propList["style:text-line-through-type"])
+ 			propBuffer += "line-through";
+ 
+ 	}
+@@ -615,10 +599,10 @@
+ 		propBuffer += propList["fo:color"]->getStr().cstr();
+ 	}
+ 
+-	if (propList["style:text-background-color"])
++	if (propList["fo:background-color"])
+ 	{
+ 		propBuffer += "; bgcolor:";
+-		propBuffer += propList["style:text-background-color"]->getStr().cstr();
++		propBuffer += propList["fo:background-color"]->getStr().cstr();
+ 	}
+ 
+ 	UT_DEBUGMSG(("AbiWordPerfect: Appending span format: %s\n", propBuffer.c_str()));
+@@ -639,10 +623,10 @@
+ 	int columnsCount = ((columns.count() == 0) ? 1 : columns.count());
+ 
+ 	// TODO: support spaceAfter
+-	if (propList["fo:margin-left"])
+-		marginLeft = propList["fo:margin-left"]->getFloat();
+-	if (propList["fo:margin-right"])
+-		marginRight = propList["fo:margin-right"]->getFloat();
++	if (propList["fo:start-indent"])
++		marginLeft = propList["fo:start-indent"]->getDouble();
++	if (propList["fo:end-indent"])
++		marginRight = propList["fo:end-indent"]->getDouble();
+ 
+ 	if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount)
+ 		m_bSectionChanged = true;
+@@ -709,9 +693,9 @@
+ 	if (propList["style:num-format"])
+ 		listType = propList["style:num-format"]->getStr().cstr()[0];
+ 	if (propList["text:space-before"])
+-		listLeftOffset = propList["text:space-before"]->getFloat();
++		listLeftOffset = propList["text:space-before"]->getDouble();
+ 	if (propList["text:min-label-width"])
+-		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
++		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
+ 
+ 	if (!m_pCurrentListDefinition || 
+ 		m_pCurrentListDefinition->getOutlineHash() != listID ||
+@@ -749,9 +733,9 @@
+ 	if (propList["libwpd:level"])
+ 		level = propList["libwpd:level"]->getInt();
+ 	if (propList["text:space-before"])
+-		listLeftOffset = propList["text:space-before"]->getFloat();
++		listLeftOffset = propList["text:space-before"]->getDouble();
+ 	if (propList["text:min-label-width"])
+-		listMinLabelWidth = propList["text:min-label-width"]->getFloat();
++		listMinLabelWidth = propList["text:min-label-width"]->getDouble();
+ 
+ 	if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID)
+ 	{
+@@ -871,10 +855,10 @@
+ 
+ 	UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel)
+ 					+ m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
+-					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
++					- (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
+ 	propBuffer += tempBuffer;
+ 	UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
+-					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
++					+ (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
+ 	propBuffer += tempBuffer;
+ 
+ 	listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME;
+@@ -1263,7 +1247,7 @@
+     virtual UT_Error _loadFile(GsfInput * input)
+ 	{
+ 		AbiWordperfectInputStream gsfInput(input);
+-		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
++		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
+ 
+ 		if (error != WPS_OK)
+ 			{
+@@ -1302,18 +1286,12 @@
+ {
+ 	AbiWordperfectInputStream gsfInput(input);
+ 
+-	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true);
++	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
+ 
+ 	switch (confidence)
+ 	{
+ 		case WPS_CONFIDENCE_NONE:
+ 			return UT_CONFIDENCE_ZILCH;
+-		case WPS_CONFIDENCE_POOR: 
+-			return UT_CONFIDENCE_POOR;
+-		case WPS_CONFIDENCE_LIKELY:
+-			return UT_CONFIDENCE_SOSO;
+-		case WPS_CONFIDENCE_GOOD:
+-			return UT_CONFIDENCE_GOOD;
+ 		case WPS_CONFIDENCE_EXCELLENT:
+ 			return UT_CONFIDENCE_PERFECT;
+ 		default:
+--- plugins/wordperfect/xp/ie_imp_WordPerfect.h	(revision 29401)
++++ plugins/wordperfect/xp/ie_imp_WordPerfect.h	(revision 29403)
+@@ -30,13 +30,7 @@
+ #define IE_IMP_WP_H
+ 
+ #include <stdio.h>
+-#ifdef _WIN32
+-#define POINT WPX_POINT
+-#endif
+ #include <libwpd/libwpd.h>
+-#ifdef _WIN32
+-#undef POINT
+-#endif
+ #include "ie_imp.h"
+ #include "ut_string.h"
+ #include "ut_string_class.h"
+@@ -98,7 +92,7 @@
+ 					IE_Imp ** ppie);
+ };
+ 
+-class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl
++class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
+ {
+ public:
+     IE_Imp_WordPerfect(PD_Document * pDocument);
+@@ -154,6 +148,21 @@
+     virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {}
+     virtual void closeTable();
+ 
++    virtual void definePageStyle(const WPXPropertyList&) {}
++    virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
++    virtual void defineCharacterStyle(const WPXPropertyList&) {}
++    virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
++    virtual void insertSpace() {}
++    virtual void insertField(const WPXString&, const WPXPropertyList&) {}
++    virtual void openComment(const WPXPropertyList&) {}
++    virtual void closeComment() {}
++    virtual void openTextBox(const WPXPropertyList&) {}
++    virtual void closeTextBox() {}
++    virtual void openFrame(const WPXPropertyList&) {}
++    virtual void closeFrame() {}
++    virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
++    virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
++
+     
+ protected:
+ 	virtual UT_Error _loadFile(GsfInput * input);
+--- plugins/wordperfect/plugin.m4	(revision 29401)
++++ plugins/wordperfect/plugin.m4	(revision 29403)
+@@ -1,6 +1,6 @@
+ 
+-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
+-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
++wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
++wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
+ wordperfect_deps="no"
+ 
+ WORDPERFECT_CFLAGS=
+--- plugins/wpg/xp/ie_impGraphic_WPG.cpp	(revision 29401)
++++ plugins/wpg/xp/ie_impGraphic_WPG.cpp	(revision 29403)
+@@ -31,11 +31,10 @@
+ #include <gsf/gsf-input-memory.h>
+ #include <gsf/gsf-input-stdio.h>
+ #include <gsf/gsf-infile-msole.h>
+-#include <libwpd/WPXStream.h>
++#include <libwpd-stream/libwpd-stream.h>
+ #include "xap_Module.h"
+ 
+ using libwpg::WPGraphics;
+-using libwpg::WPGString;
+ 
+ ABI_PLUGIN_DECLARE("WPG")
+ 
+@@ -48,7 +47,7 @@
+ 	virtual bool isOLEStream();
+ 	virtual WPXInputStream * getDocumentOLEStream();
+ 	virtual WPXInputStream * getDocumentOLEStream(const char * name);
+-	virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
++	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
+ 	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
+ 	virtual long tell();
+ 	virtual bool atEOS();
+@@ -60,7 +59,7 @@
+ };
+ 
+ AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
+-	WPXInputStream(true),
++	WPXInputStream(),
+ 	m_input(input),
+ 	m_ole(NULL)
+ {
+@@ -75,9 +74,9 @@
+ 	g_object_unref(G_OBJECT(m_input));
+ }
+ 
+-const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead)
++const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
+ {
+-	const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
++	const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
+ 
+ 	if (buf == NULL)
+ 		numBytesRead = 0;
+@@ -245,10 +244,10 @@
+ UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
+ {
+ 	AbiWordPerfectGraphicsInputStream gsfInput(input);
+-	WPGString svgOutput;
++	WPXString svgOutput;
+ 	if (WPGraphics::generateSVG(&gsfInput, svgOutput))
+ 	{
+-		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false);
++		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
+ 		UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
+ 		g_object_unref(svgInput);
+ 		return result;
+--- plugins/wpg/plugin.m4	(revision 29401)
++++ plugins/wpg/plugin.m4	(revision 29403)
+@@ -1,5 +1,5 @@
+ 
+-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
+ wpg_deps="no"
+ 
+ if test "$enable_wpg" != ""; then
+
+
diff --git a/app-office/gnucash/gnucash-2.4.8.ebuild b/app-office/gnucash/gnucash-2.4.8.ebuild
index 903f2e59804d..6d5cd46e55b2 100644
--- a/app-office/gnucash/gnucash-2.4.8.ebuild
+++ b/app-office/gnucash/gnucash-2.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.8.ebuild,v 1.1 2011/11/30 15:13:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.8.ebuild,v 1.2 2011/12/04 20:11:34 pacho Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -88,6 +88,7 @@ pkg_setup() {
 
 	if use python ; then
 		python_set_active_version 2
+		python_pkg_setup
 	fi
 }
 
diff --git a/app-office/libreoffice/libreoffice-3.5.0.0.ebuild b/app-office/libreoffice/libreoffice-3.5.0.0.ebuild
index 62d473596199..0562586b47be 100644
--- a/app-office/libreoffice/libreoffice-3.5.0.0.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.0.ebuild,v 1.2 2011/11/30 10:29:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.0.ebuild,v 1.4 2011/12/04 15:53:40 scarabeus Exp $
 
 EAPI=4
 
@@ -69,7 +69,7 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk
+IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3
 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
 +webdav +xmlsec"
 LICENSE="LGPL-3"
@@ -117,10 +117,8 @@ COMMON_DEPEND="
 		gnome-base/gconf:2
 		gnome-base/orbit
 	)
-	gtk? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/gtk+-3.2:3
-	)
+	gtk? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.2:3 )
 	graphite? ( media-gfx/graphite2 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10
@@ -217,10 +215,10 @@ pkg_pretend() {
 	# ensure pg version
 	if use postgres; then
 		 pgslot=$(postgresql-config show)
-		 if [[ ${pgslot//.} < 84 ]] ; then
-		 	eerror "PostgreSQL slot must be set to 8.4 or higher."
-			eerror "    postgresql-config set 8.4"
-			die "PostgreSQL slot is not set to 8.4 or higher."
+		 if [[ ${pgslot//.} < 90 ]] ; then
+		 	eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
 		 fi
 	fi
 }
@@ -434,7 +432,7 @@ src_configure() {
 		$(use_enable graphite) \
 		$(use_enable gstreamer) \
 		$(use_enable gtk) \
-		$(use_enable gtk gtk3) \
+		$(use_enable gtk3) \
 		$(use_enable gtk systray) \
 		$(use_enable java ext-scripting-beanshell) \
 		$(use_enable kde kde4) \
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 39d95f00f840..74952b0be850 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.10 2011/11/30 10:29:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.12 2011/12/04 15:53:40 scarabeus Exp $
 
 EAPI=4
 
@@ -69,7 +69,7 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk
+IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3
 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
 +webdav +xmlsec"
 LICENSE="LGPL-3"
@@ -117,10 +117,8 @@ COMMON_DEPEND="
 		gnome-base/gconf:2
 		gnome-base/orbit
 	)
-	gtk? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/gtk+-3.2:3
-	)
+	gtk? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.2:3 )
 	graphite? ( media-gfx/graphite2 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10
@@ -217,10 +215,10 @@ pkg_pretend() {
 	# ensure pg version
 	if use postgres; then
 		 pgslot=$(postgresql-config show)
-		 if [[ ${pgslot//.} < 84 ]] ; then
-		 	eerror "PostgreSQL slot must be set to 8.4 or higher."
-			eerror "    postgresql-config set 8.4"
-			die "PostgreSQL slot is not set to 8.4 or higher."
+		 if [[ ${pgslot//.} < 90 ]] ; then
+		 	eerror "PostgreSQL slot must be set to 9.0 or higher."
+			eerror "    postgresql-config set 9.0"
+			die "PostgreSQL slot is not set to 9.0 or higher."
 		 fi
 	fi
 }
@@ -434,7 +432,7 @@ src_configure() {
 		$(use_enable graphite) \
 		$(use_enable gstreamer) \
 		$(use_enable gtk) \
-		$(use_enable gtk gtk3) \
+		$(use_enable gtk3) \
 		$(use_enable gtk systray) \
 		$(use_enable java ext-scripting-beanshell) \
 		$(use_enable kde kde4) \
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index fec5e3c492a8..d9e38ea4eaf8 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -10,6 +10,7 @@ version</longdescription>
 	<use>
 		<flag name="binfilter">Enable support for legacy StarOffice 5.x and earlier file formats</flag>
 		<flag name="graphite">Enable support for non-Roman fonts via <pkg>media-gfx/graphite2</pkg></flag>
+		<flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
 		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
 		<flag name="odk">Build the Office Development Kit</flag>
 		<flag name="pdfimport">Build pdf-import extension using <pkg>app-text/poppler</pkg>. Note that you don't need this for pdf-export!</flag>
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index ca2a29d5a86f..beb7dac66867 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.17 2011/07/18 21:27:16 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-9999.ebuild,v 1.18 2011/12/04 20:21:56 mgorny Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -21,7 +21,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="minimal"
 
 KEYWORDS=""
 
@@ -31,7 +31,14 @@ RDEPEND="${DEPEND}
 	dev-python/argparse
 	|| ( app-misc/realpath sys-freebsd/freebsd-bin )
 	sys-apps/gawk
-	sys-apps/grep"
+	sys-apps/grep
+	!minimal? (
+		app-portage/diffmask
+		app-portage/eclean-kernel
+		app-portage/flaggie
+		app-portage/install-mask
+		app-portage/smart-live-rebuild
+	)"
 
 distutils_src_compile_pre_hook() {
 	echo VERSION="9999-${EGIT_VERSION}" "$(PYTHON)" setup.py set_version
diff --git a/app-portage/gentoolkit/metadata.xml b/app-portage/gentoolkit/metadata.xml
index 24c8ea0614ea..736ab87a49ea 100644
--- a/app-portage/gentoolkit/metadata.xml
+++ b/app-portage/gentoolkit/metadata.xml
@@ -9,4 +9,8 @@ the Gentoo Linux distribution. It contains rough drafts and
 implementations of features that may in time make it into Portage, or
 into full-fledged tools in their own right.
 </longdescription>
+
+<use>
+	<flag name='minimal'>Install only the gentoolkit core code.</flag>
+</use>
 </pkgmetadata>
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.76.1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.76.1.ebuild
index bf78bcd69ce8..204a12308b75 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.76.1.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.76.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.76.1.ebuild,v 1.5 2011/11/26 18:44:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.76.1.ebuild,v 1.6 2011/12/04 17:09:54 hwoarang Exp $
 
 DESCRIPTION="XSL Stylesheets for Docbook"
 HOMEPAGE="http://wiki.docbook.org/topic/DocBookXslStylesheets"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/docbook/docbook-xsl-ns-${PV}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.4"
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild
index 2c6534f25a3b..c81d130c24de 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild,v 1.5 2011/11/26 18:41:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.76.1.ebuild,v 1.6 2011/12/04 17:09:34 hwoarang Exp $
 
 DESCRIPTION="XSL Stylesheets for Docbook"
 HOMEPAGE="http://wiki.docbook.org/topic/DocBookXslStylesheets"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/docbook/docbook-xsl-${PV}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.1"
diff --git a/app-text/jadetex/jadetex-3.13-r3.ebuild b/app-text/jadetex/jadetex-3.13-r3.ebuild
index 9129bd42255b..8fb81512f879 100644
--- a/app-text/jadetex/jadetex-3.13-r3.ebuild
+++ b/app-text/jadetex/jadetex-3.13-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/jadetex/jadetex-3.13-r3.ebuild,v 1.8 2011/11/30 03:30:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/jadetex/jadetex-3.13-r3.ebuild,v 1.9 2011/12/04 16:17:38 armin76 Exp $
 
 inherit latex-package texlive-common
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/jadetex/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 RESTRICT="test"
 
diff --git a/app-vim/bash-support/Manifest b/app-vim/bash-support/Manifest
index 020d89a7146a..bb33aeffe699 100644
--- a/app-vim/bash-support/Manifest
+++ b/app-vim/bash-support/Manifest
@@ -1,2 +1,3 @@
 DIST bash-support-3.6.tar.gz 92158 RMD160 929c450b66036dbf34cbf347c54b8024d70694e6 SHA1 8a88194969fa7807bca3ae3650f6b36b0d4aea2d SHA256 6b839dea89598ae871fa589aac80bbe126cdfa7560d787376cb2f0932fc87cbe
 DIST bash-support-3.7.tar.gz 92583 RMD160 79fd948f4d1d8579bf44eb4543004d2eb33bec71 SHA1 b3a1b52b330e5dbc25373044e280d7c06d3828b3 SHA256 fe4ecc356aef177076ef5a0dd6be8fe8a79ea29f80e93628ed5eb1916ec9f4a3
+DIST bash-support-3.8.tar.gz 95983 RMD160 ea4f84b4ef5b9d872c520b7b91209e488151cc05 SHA1 881df7455ef96ba2f0f9f677cab3ae5f82dbac8f SHA256 93a9a2c40c60b832352202a44da2a97c152b870c9321300264aaaaf5cd7f2231
diff --git a/app-vim/bash-support/bash-support-3.8.ebuild b/app-vim/bash-support/bash-support-3.8.ebuild
new file mode 100644
index 000000000000..036b4218613c
--- /dev/null
+++ b/app-vim/bash-support/bash-support-3.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/bash-support/bash-support-3.8.ebuild,v 1.1 2011/12/04 19:58:07 radhermit Exp $
+
+EAPI=4
+
+inherit vim-plugin
+
+MY_PN="bash-support.vim"
+DESCRIPTION="vim plugin: Bash-IDE - Write and run bash scripts using menus and hotkeys"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=365"
+SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_unpack() {
+	unpack ${A}
+	mv *-${MY_PN}-* "${S}"
+}
+
+src_prepare() {
+	# Remove unnecessary files
+	rm README* || die
+}
+
+src_install() {
+	dodoc doc/{ChangeLog,bash-hot-keys.pdf}
+	rm -rf doc/{ChangeLog,bash-hot-keys.*}
+
+	vim-plugin_src_install
+}
diff --git a/app-vim/gtk-syntax/gtk-syntax-20110214-r1.ebuild b/app-vim/gtk-syntax/gtk-syntax-20110214-r1.ebuild
index 89d631da4296..6cbfb9c53003 100644
--- a/app-vim/gtk-syntax/gtk-syntax-20110214-r1.ebuild
+++ b/app-vim/gtk-syntax/gtk-syntax-20110214-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/gtk-syntax/gtk-syntax-20110214-r1.ebuild,v 1.4 2011/12/02 22:08:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/gtk-syntax/gtk-syntax-20110214-r1.ebuild,v 1.5 2011/12/04 18:27:15 armin76 Exp $
 
 EAPI=3
 
@@ -9,5 +9,5 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1000"
 LICENSE="as-is"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
diff --git a/app-vim/tagbar/Manifest b/app-vim/tagbar/Manifest
new file mode 100644
index 000000000000..ae6b2543fc78
--- /dev/null
+++ b/app-vim/tagbar/Manifest
@@ -0,0 +1 @@
+DIST tagbar-2.2.tar.gz 33517 RMD160 4a8d9c49d0d216f7979a822bbb03560d1cf7fece SHA1 db9db629b84af29b16a1bb9e09315e0f3b1e84ab SHA256 b95207079af0baff0fc3c670e5fd1a064d90aa81874160ed62c5b6ca3878a4c5
diff --git a/app-vim/tagbar/metadata.xml b/app-vim/tagbar/metadata.xml
new file mode 100644
index 000000000000..d221a8d4b42c
--- /dev/null
+++ b/app-vim/tagbar/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>vim</herd>
+</pkgmetadata>
diff --git a/app-vim/tagbar/tagbar-2.2.ebuild b/app-vim/tagbar/tagbar-2.2.ebuild
new file mode 100644
index 000000000000..74dfce27d721
--- /dev/null
+++ b/app-vim/tagbar/tagbar-2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/tagbar/tagbar-2.2.ebuild,v 1.1 2011/12/04 20:25:41 radhermit Exp $
+
+EAPI="4"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display tags of the current file ordered by scope"
+HOMEPAGE="http://majutsushi.github.com/tagbar/
+	http://www.vim.org/scripts/script.php?script_id=3465"
+SRC_URI="http://github.com/majutsushi/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-util/ctags-5.5"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_unpack() {
+	unpack ${A}
+	mv *-${PN}-* "${S}"
+}
diff --git a/app-vim/zencoding-vim/Manifest b/app-vim/zencoding-vim/Manifest
index d57fd01b73ae..d589140533ea 100644
--- a/app-vim/zencoding-vim/Manifest
+++ b/app-vim/zencoding-vim/Manifest
@@ -2,3 +2,4 @@ DIST zencoding-vim-0.53.zip 21533 RMD160 16929c3735acbb6349f6397ff4af0284a773383
 DIST zencoding-vim-0.54.tar.gz 20859 RMD160 75507943f506a5d02d5c93ef8c8e88a0a7675117 SHA1 b620b5a9395b98f59164bafc6f84999f0a7f6692 SHA256 c554ae2aa8856838b91708cc8dd9231254df4dd901a80da7dff25af74b4f1dc2
 DIST zencoding-vim-0.55.tar.gz 21127 RMD160 40bc870797dbd912d9bdd8a3954d805e2ad7a1a2 SHA1 84359d1915264506582959505253dda800a45fe6 SHA256 262bf77296911bf11ebe4af1a6c6cbeb87dffea7d15c1651d67cb963aa3e9c28
 DIST zencoding-vim-0.56.tar.gz 21220 RMD160 0d585fc6237d6055fdf685d2f857b714114aff6f SHA1 9f950e2a6c3760dd54610a515f94cfbb31aa9658 SHA256 969c63d4cfff6a76b4fd3ab3175fd1ccd2dfcc221ec0d9d4770cbeb995f09e1c
+DIST zencoding-vim-0.58.tar.gz 21262 RMD160 119dddb5407e596fe012152872879262552d1574 SHA1 96028428dbbad57fdfd2b6961a0df8ee30e3485f SHA256 28088b4158ee5f037fb4e63e62bba1206ae84b3b070cf4393a4cd893281fc1cb
diff --git a/app-vim/zencoding-vim/zencoding-vim-0.58.ebuild b/app-vim/zencoding-vim/zencoding-vim-0.58.ebuild
new file mode 100644
index 000000000000..7cd26c1380d6
--- /dev/null
+++ b/app-vim/zencoding-vim/zencoding-vim-0.58.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/zencoding-vim/zencoding-vim-0.58.ebuild,v 1.1 2011/12/04 20:02:19 radhermit Exp $
+
+EAPI=4
+
+inherit vim-plugin
+
+MY_PN="ZenCoding.vim"
+DESCRIPTION="vim plugin: HTML and CSS hi-speed coding"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2981 http://mattn.github.com/zencoding-vim/"
+SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_unpack() {
+	unpack ${A}
+	mv *-${MY_PN}-* "${S}"
+}
+
+src_prepare() {
+	rm README || die
+}
diff --git a/dev-haskell/base-unicode-symbols/Manifest b/dev-haskell/base-unicode-symbols/Manifest
new file mode 100644
index 000000000000..9f433a5a979e
--- /dev/null
+++ b/dev-haskell/base-unicode-symbols/Manifest
@@ -0,0 +1 @@
+DIST base-unicode-symbols-0.2.2.2.tar.gz 5549 RMD160 d674bdc90fe05a3e54a94f82d307df388f7d9b06 SHA1 dd68f26b87364a6b72e435b90c33cc19c9e506f4 SHA256 688d89faa433a3486b04997ec9cd298ee54d4524c06784577967f291012a768d
diff --git a/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.2.ebuild b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.2.ebuild
new file mode 100644
index 000000000000..044df6e5fa76
--- /dev/null
+++ b/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/base-unicode-symbols/base-unicode-symbols-0.2.2.2.ebuild,v 1.1 2011/12/04 18:04:10 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Unicode alternatives for common functions and operators"
+HOMEPAGE="http://haskell.org/haskellwiki/Unicode-symbols"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/base-unicode-symbols/metadata.xml b/dev-haskell/base-unicode-symbols/metadata.xml
new file mode 100644
index 000000000000..3e108420f552
--- /dev/null
+++ b/dev-haskell/base-unicode-symbols/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		This package defines new symbols for a number of functions,
+		operators and types in the base package.
+		
+		All symbols are documented with their actual definition and
+		information regarding their Unicode code point. They should be
+		completely interchangeable with their definitions.
+		
+		For further Unicode goodness you can enable the @UnicodeSyntax@
+		language extension \[1\]. This extension enables Unicode characters
+		to be used to stand for certain ASCII character sequences,
+		i.e. &amp;#x2192; instead of @-&gt;@, &amp;#x2200; instead of @forall@ and many
+		others.
+		
+		Original idea by P&amp;#xE9;ter Divi&amp;#xE1;nszky.
+		
+		\[1\] &lt;http://www.haskell.org/ghc/docs/latest/html/users_guide/syntax-extns.html#unicode-syntax&gt;
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/binary/Manifest b/dev-haskell/binary/Manifest
index 75c9fdec20ec..50e5c9235da5 100644
--- a/dev-haskell/binary/Manifest
+++ b/dev-haskell/binary/Manifest
@@ -1,3 +1 @@
-DIST binary-0.4.1.tar.gz 37766 RMD160 969675ef1c4e43b55808c8433e825feae300444d SHA1 343087b5495f10f1d1ded8803720223f34fc488a SHA256 bb74824306843da25f6d97c271e2a06ee3a7e05fc529156fb81d7c576688e549
-DIST binary-0.4.2.tar.gz 39656 RMD160 a38fb67fbe11fd6ae80643a4c0f34b0a753e6e4e SHA1 a8c9bd44c32a7ecd7be8c2f889d1f5f1500ac954 SHA256 200d81da3348a1053c0f1ab5e5392dc51e9d48e26fcae609b518f9f67f22c4ef
 DIST binary-0.5.0.2.tar.gz 41494 RMD160 a4bb4be2071e33a2c43fea4c1fa6f103733c0753 SHA1 bb680c03dbae2765e14d91376440b762bb4b65a4 SHA256 e0c2dede617dc9b1611f62f2801f21d2fd48e044ee6886e77b55df10e0f2130b
diff --git a/dev-haskell/binary/binary-0.4.1.ebuild b/dev-haskell/binary/binary-0.4.1.ebuild
deleted file mode 100644
index 44c1c315fc52..000000000000
--- a/dev-haskell/binary/binary-0.4.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/binary/binary-0.4.1.ebuild,v 1.1 2007/12/15 18:37:00 dcoutts Exp $
-
-CABAL_FEATURES="lib haddock profile"
-CABAL_MIN_VERSION=1.2
-inherit haskell-cabal
-
-DESCRIPTION="Efficient, pure binary serialisation using lazy ByteStrings"
-HOMEPAGE="http://code.haskell.org/binary/"
-SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.4"
diff --git a/dev-haskell/binary/binary-0.4.2.ebuild b/dev-haskell/binary/binary-0.4.2.ebuild
deleted file mode 100644
index 84674a40c320..000000000000
--- a/dev-haskell/binary/binary-0.4.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/binary/binary-0.4.2.ebuild,v 1.1 2008/05/04 08:30:52 kolmodin Exp $
-
-CABAL_FEATURES="lib haddock profile"
-inherit haskell-cabal
-
-DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
-HOMEPAGE="http://code.haskell.org/binary/"
-SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.4
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/binary/binary-0.5.0.2.ebuild b/dev-haskell/binary/binary-0.5.0.2.ebuild
index 1a5596298d05..53e15b024b54 100644
--- a/dev-haskell/binary/binary-0.5.0.2.ebuild
+++ b/dev-haskell/binary/binary-0.5.0.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/binary/binary-0.5.0.2.ebuild,v 1.12 2011/08/01 20:24:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/binary/binary-0.5.0.2.ebuild,v 1.13 2011/12/04 16:24:20 slyfox Exp $
 
 # ebuild generated by hackport 0.2.13
 
 EAPI="3"
 
-CABAL_FEATURES="lib profile haddock hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
@@ -24,4 +24,4 @@ DEPEND="${RDEPEND}
 
 PATCHES=("${FILESDIR}/binary-0.5.0.2-ghc-7.patch")
 
-CABAL_CORE_LIB_GHC_PV="7.2.0.20110728"
+CABAL_CORE_LIB_GHC_PV="7.2.1 7.2.2"
diff --git a/dev-haskell/binary/metadata.xml b/dev-haskell/binary/metadata.xml
index 8c66906af531..1eaa016b9d05 100644
--- a/dev-haskell/binary/metadata.xml
+++ b/dev-haskell/binary/metadata.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
-<maintainer>
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Efficient, pure binary serialisation using lazy ByteStrings.
+		Haskell values may be encoded to and from binary formats,
+		written to disk as binary, or sent over the network.
+		Serialisation speeds of over 1 G\/sec have been observed,
+		so this library should be suitable for high performance
+		scenarios.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/crypto/Manifest b/dev-haskell/crypto/Manifest
new file mode 100644
index 000000000000..0efb18d3afd7
--- /dev/null
+++ b/dev-haskell/crypto/Manifest
@@ -0,0 +1 @@
+DIST Crypto-4.2.4.tar.gz 57027 RMD160 05b00b9407f7d9e5f531ea7dc0b9ead6b58debfc SHA1 e057284972efba38353f80dbd9b8508f37d4e860 SHA256 77986dd8100b678adc784e682180ba659617ff5708089847420166ead0768a17
diff --git a/dev-haskell/crypto/crypto-4.2.4.ebuild b/dev-haskell/crypto/crypto-4.2.4.ebuild
new file mode 100644
index 000000000000..444c3560e9d7
--- /dev/null
+++ b/dev-haskell/crypto/crypto-4.2.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto/crypto-4.2.4.ebuild,v 1.1 2011/12/04 17:22:41 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="Crypto"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collects together existing Haskell cryptographic functions into a package"
+HOMEPAGE="http://hackage.haskell.org/package/crypto"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.4.0.1
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
+
+S="${WORKDIR}/${MY_P}"
+
+src_test() {
+	TESTS="SymmetricTest SHA1Test RSATest QuickTest HMACTest WordListTest"
+
+	for t in $TESTS; do
+		einfo "Running test $t..."
+		# the quickcheck tests doesn't fail when the test fails...
+		"${S}/dist/build/$t/$t" || die "Test $t failed"
+	done
+}
+
+src_install() {
+	cabal_src_install
+
+	rm -rf "${D}/usr/bin" 2>/dev/null
+}
diff --git a/dev-haskell/crypto/metadata.xml b/dev-haskell/crypto/metadata.xml
new file mode 100644
index 000000000000..1f21cae0267c
--- /dev/null
+++ b/dev-haskell/crypto/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		DES, Blowfish, AES, TEA, SHA1, MD5, RSA, BubbleBabble,
+		Hexdump, Support for Word128, Word192 and Word256 and Beyond, PKCS5
+		Padding, Various Encryption Modes e.g. Cipher Block Chaining all in one package,
+		with HUnit and QuickCheck tests, and examples.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/dataenc/Manifest b/dev-haskell/dataenc/Manifest
index 57fa6ab1e82a..337f8c492c29 100644
--- a/dev-haskell/dataenc/Manifest
+++ b/dev-haskell/dataenc/Manifest
@@ -1,2 +1,2 @@
 DIST dataenc-0.13.0.2.tar.gz 12511 RMD160 1ee6f529b3a17e36fdde2a244c5bcd90d31232d6 SHA1 6a737797973441da9150d34ca91707be3c0f4570 SHA256 e3d70a3c3d94490244e05c5b11d8455eb6fdbf4849a119bd52bae644fa2b217a
-DIST dataenc-0.14.tar.gz 12975 RMD160 3b623f2915c61e55729908fbc905951bfdaa884e SHA1 dd93af534d81d0b0de3c7480f2500cd6b2bbc69a SHA256 86472a04ba237b366062be26211cfc16296b96e86225a644a2995c6eeabf2261
+DIST dataenc-0.14.0.2.tar.gz 12914 RMD160 1d01ffa4dba6f75b0d2c4d4c2e0b70df8d99f697 SHA1 42b6c269cc2de9131d7337ae11d5866dcf140548 SHA256 abf067e438a800931c076cef80dea4f125210e1539f6b5cf1a05b4540411d5ff
diff --git a/dev-haskell/dataenc/dataenc-0.14.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.2.ebuild
similarity index 77%
rename from dev-haskell/dataenc/dataenc-0.14.ebuild
rename to dev-haskell/dataenc/dataenc-0.14.0.2.ebuild
index 75394a4807b8..8a4292d82fcb 100644
--- a/dev-haskell/dataenc/dataenc-0.14.ebuild
+++ b/dev-haskell/dataenc/dataenc-0.14.0.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dataenc/dataenc-0.14.ebuild,v 1.1 2011/08/04 13:14:23 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dataenc/dataenc-0.14.0.2.ebuild,v 1.1 2011/12/04 17:03:55 slyfox Exp $
 
 # ebuild generated by hackport 0.2.13
 
 EAPI="3"
 
-CABAL_FEATURES="bin lib profile haddock hscolour"
-inherit base haskell-cabal
+CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
+inherit haskell-cabal
 
 DESCRIPTION="Data encoding library"
 HOMEPAGE="http://www.haskell.org/haskellwiki/Library/Data_encoding"
@@ -21,5 +21,3 @@ IUSE=""
 RDEPEND=">=dev-lang/ghc-6.8.2"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}/${PN}-0.14-ghc-7.2.patch")
diff --git a/dev-haskell/dataenc/files/dataenc-0.14-ghc-7.2.patch b/dev-haskell/dataenc/files/dataenc-0.14-ghc-7.2.patch
deleted file mode 100644
index 786c209314b5..000000000000
--- a/dev-haskell/dataenc/files/dataenc-0.14-ghc-7.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/dataenc.cabal b/dataenc.cabal
-index 4b0ef1d..ea1a3a0 100644
---- a/dataenc.cabal
-+++ b/dataenc.cabal
-@@ -21,7 +21,7 @@ flag BuildTests
- 
- library
-     hs-source-dirs: src
--    build-depends: array >= 0.1.0 && < 0.4, base >= 3.0.0 && < 4.4, containers >= 0.1.0 && < 0.5
-+    build-depends: array >= 0.1.0 && < 0.4, base >= 3.0.0 && < 4.5, containers >= 0.1.0 && < 0.5
-     exposed-modules:
-             Codec.Binary.Base16
-             Codec.Binary.Base32
diff --git a/dev-haskell/hs3/Manifest b/dev-haskell/hs3/Manifest
new file mode 100644
index 000000000000..f336c63a1663
--- /dev/null
+++ b/dev-haskell/hs3/Manifest
@@ -0,0 +1 @@
+DIST hS3-0.5.6.tar.gz 19626 RMD160 53c74e2ab19a09d69176cd976b7601585995f37f SHA1 1ff5380800f8fe129cbc350b4187eef755a2ed3a SHA256 ec0be701f8e46d725b2ceb5d54a1889823cb41668e53c43f05d74d07f76fa6b1
diff --git a/dev-haskell/hs3/hs3-0.5.6.ebuild b/dev-haskell/hs3/hs3-0.5.6.ebuild
new file mode 100644
index 000000000000..c53aeaec74af
--- /dev/null
+++ b/dev-haskell/hs3/hs3-0.5.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs3/hs3-0.5.6.ebuild,v 1.1 2011/12/04 18:24:28 slyfox Exp $
+
+# ebuild generated by hackport 0.2.14
+
+EAPI="3"
+
+CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+MY_PN="hS3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Interface to Amazon's Simple Storage Service (S3)"
+HOMEPAGE="http://gregheartsfield.com/hS3/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/crypto-4.1.0
+		dev-haskell/dataenc
+		>=dev-haskell/http-4000.0.0
+		=dev-haskell/hxt-9*
+		>=dev-haskell/missingh-0.18.6
+		dev-haskell/network
+		dev-haskell/regex-compat
+		dev-haskell/utf8-string
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hs3/metadata.xml b/dev-haskell/hs3/metadata.xml
new file mode 100644
index 000000000000..509887879ac2
--- /dev/null
+++ b/dev-haskell/hs3/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		This is the Haskell S3 library.  It provides an
+		interface to Amazon&#39;s Simple Storage Service (S3), allowing Haskell
+		developers to reliably store and retrieve arbitrary amounts of
+		data from anywhere on the Internet.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hslogger/Manifest b/dev-haskell/hslogger/Manifest
index af5910d79351..7d8e292e2374 100644
--- a/dev-haskell/hslogger/Manifest
+++ b/dev-haskell/hslogger/Manifest
@@ -1 +1,2 @@
 DIST hslogger-1.1.4.tar.gz 44342 RMD160 5f6df20f63a86e80956633bf1bd2c8971b844d13 SHA1 ac40ec87f3af4abd3388ccc0c1a17070a2b0e156 SHA256 c7cf96394659c3b552de85342883d26e7b199e15975ad9bf64eca826e792a820
+DIST hslogger-1.1.5.tar.gz 35632 RMD160 9a347ef1d56c1465d32ae39535d3d20ad05b9531 SHA1 bef8445b8740dd9fe169d256d5afd6ff8d118b44 SHA256 676ea4d926eeac1a930d76a3a32b921f8550e8ff973c595e93d2f7ae99316952
diff --git a/dev-haskell/hslogger/hslogger-1.1.5.ebuild b/dev-haskell/hslogger/hslogger-1.1.5.ebuild
new file mode 100644
index 000000000000..f32ed7f8c7cb
--- /dev/null
+++ b/dev-haskell/hslogger/hslogger-1.1.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hslogger/hslogger-1.1.5.ebuild,v 1.1 2011/12/04 17:29:21 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Versatile logging framework"
+HOMEPAGE="http://software.complete.org/hslogger"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/mtl
+		<dev-haskell/network-2.4
+		dev-haskell/time
+		>=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
index feccaac4ed32..ce122d37eaf8 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -1 +1,2 @@
 DIST HTTP-4000.1.1.tar.gz 59459 RMD160 c90418ef556cf833cffcb327df9b57e051ee8b25 SHA1 cdb8ae29b8524a912545059e4ec4a2b25ada88c5 SHA256 c3b7f8815f5528c88a41a4d62c4a0586edde644f83ae514f036a1cb35ce97026
+DIST HTTP-4000.1.2.tar.gz 59835 RMD160 b927af921ef198ddb824981b29b4d22b97d49fd4 SHA1 b5ee196ac334c1571980b2eba0b99999f03cc1c4 SHA256 c8725620a1566bcc6ded1304cced716b6d1f6e78da78aa580076671b3bf26ca7
diff --git a/dev-haskell/http/http-4000.1.2.ebuild b/dev-haskell/http/http-4000.1.2.ebuild
new file mode 100644
index 000000000000..68073d6722ff
--- /dev/null
+++ b/dev-haskell/http/http-4000.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild,v 1.1 2011/12/04 17:26:32 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+MY_PN="HTTP"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A library for client-side HTTP"
+HOMEPAGE="http://projects.haskell.org/http/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-haskell/mtl
+		dev-haskell/network
+		dev-haskell/parsec
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hunit/Manifest b/dev-haskell/hunit/Manifest
index 542f55228832..23e2b29859e1 100644
--- a/dev-haskell/hunit/Manifest
+++ b/dev-haskell/hunit/Manifest
@@ -1,3 +1,4 @@
 DIST HUnit-1.2.0.3.tar.gz 6849 RMD160 9c3ff1c8d086cb9aff7d27b558964ce931247c1b SHA1 558793b852d3c0e0f2025b60b4b165a80ba34dea SHA256 954f584f7c096c3ddef677e70b3811195bb4fd18dfdb4727a260ca7d7465de12
 DIST HUnit-1.2.2.1.tar.gz 22386 RMD160 9b65f62acde0affa17cc8512bda2a9ffdefb4f13 SHA1 3c270a723608b4c8b3cb1420f3f0c7c39dbe6a79 SHA256 47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853
 DIST HUnit-1.2.2.3.tar.gz 22665 RMD160 2e1249b19c08daca9a3f695838dfbfcdb485dea3 SHA1 669c1a658c667f1ecd7cad1ee35a2e2aff788f41 SHA256 bf6bb9b7ec3415c6279af5629fd0f40dd2f67110edea4fdd2a70791280361195
+DIST HUnit-1.2.4.2.tar.gz 23558 RMD160 a8a8dca99fc5f6fd37a35e7e71305d195e2a52e2 SHA1 4db75bfdc4dcb6061500cc3321e10a5a311df6ea SHA256 fdbcbc28196d616b449bf3e46c30dcd5577dc92f290458e2dbdbfc5a65de327a
diff --git a/dev-haskell/hunit/hunit-1.2.4.2.ebuild b/dev-haskell/hunit/hunit-1.2.4.2.ebuild
new file mode 100644
index 000000000000..daa3634132ad
--- /dev/null
+++ b/dev-haskell/hunit/hunit-1.2.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/hunit-1.2.4.2.ebuild,v 1.1 2011/12/04 16:31:01 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+MY_PN="HUnit"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A unit testing framework for Haskell"
+HOMEPAGE="http://hunit.sourceforge.net/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install () {
+	cabal_src_install
+	if use doc; then
+		dohtml -r "${S}/doc/"*
+	fi
+}
+
+src_install() {
+	cabal_src_install
+
+	# remove hunit self-tests, we don't want to install them
+	rm -rf "${D}/usr/bin"
+}
diff --git a/dev-haskell/hxt-charproperties/Manifest b/dev-haskell/hxt-charproperties/Manifest
new file mode 100644
index 000000000000..4c791da37ddd
--- /dev/null
+++ b/dev-haskell/hxt-charproperties/Manifest
@@ -0,0 +1 @@
+DIST hxt-charproperties-9.1.0.tar.gz 225351 RMD160 ff8d45a7eb9eb1936736f594bc0f9b4ad6843d94 SHA1 da02d32aa63c8ccc07d6810db7bfa8960dd88ed5 SHA256 4330da34a0277d292f24acac2a50bf3974c2bc776536c15ebc88aff53f3b42a8
diff --git a/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.0.ebuild b/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.0.ebuild
new file mode 100644
index 000000000000..36bbda25c2c8
--- /dev/null
+++ b/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.0.ebuild,v 1.1 2011/12/04 16:45:26 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Character properties and classes for XML and Unicode"
+HOMEPAGE="http://www.fh-wedel.de/~si/HXmlToolbox/index.html"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/hxt-charproperties/metadata.xml b/dev-haskell/hxt-charproperties/metadata.xml
new file mode 100644
index 000000000000..35a78e7a409d
--- /dev/null
+++ b/dev-haskell/hxt-charproperties/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Character proprties defined by XML and Unicode standards.
+		These modules contain predicates for Unicode blocks and char proprties
+		and character predicates defined by XML.
+		Supported Unicode version is 5.2.0.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hxt-regex-xmlschema/Manifest b/dev-haskell/hxt-regex-xmlschema/Manifest
new file mode 100644
index 000000000000..50aab7aed725
--- /dev/null
+++ b/dev-haskell/hxt-regex-xmlschema/Manifest
@@ -0,0 +1 @@
+DIST hxt-regex-xmlschema-9.0.1.tar.gz 27021 RMD160 27e347e5b1459ab0745ec5db7005e3437d7f5896 SHA1 ea4231c32b4d05217828b13152a66925787de44b SHA256 0cf8f52e64489cddd9802900967f9d9292043bc0ea173a5f928b01079413e2d5
diff --git a/dev-haskell/hxt-regex-xmlschema/files/hxt-regex-xmlschema-9.0.1-ghc-7.2.patch b/dev-haskell/hxt-regex-xmlschema/files/hxt-regex-xmlschema-9.0.1-ghc-7.2.patch
new file mode 100644
index 000000000000..a805b93ae9c0
--- /dev/null
+++ b/dev-haskell/hxt-regex-xmlschema/files/hxt-regex-xmlschema-9.0.1-ghc-7.2.patch
@@ -0,0 +1,9 @@
+--- hxt-regex-xmlschema-9.0.1-orig/hxt-regex-xmlschema.cabal	2011-08-15 23:57:32.000000000 +1000
++++ hxt-regex-xmlschema-9.0.1/hxt-regex-xmlschema.cabal	2011-08-16 11:50:27.245104305 +1000
+@@ -47,6 +47,5 @@
+   ghc-prof-options: -auto-all -caf-all
+ 
+   build-depends:     base               >= 4   && < 5,
+-                     haskell98          >= 1   && < 2,
+                      parsec             >= 2.1 && < 4,
+                      hxt-charproperties >= 9   && < 10
diff --git a/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.0.1.ebuild b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.0.1.ebuild
new file mode 100644
index 000000000000..3bf5aeb27941
--- /dev/null
+++ b/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt-regex-xmlschema/hxt-regex-xmlschema-9.0.1.ebuild,v 1.1 2011/12/04 16:55:09 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+DESCRIPTION="A regular expression library for W3C XML Schema regular expressions"
+HOMEPAGE="http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=dev-haskell/hxt-charproperties-9*
+		>=dev-haskell/parsec-2.1 <dev-haskell/parsec-4
+		>=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+PATCHES=("${FILESDIR}/${P}-ghc-7.2.patch")
diff --git a/dev-haskell/hxt-regex-xmlschema/metadata.xml b/dev-haskell/hxt-regex-xmlschema/metadata.xml
new file mode 100644
index 000000000000..578c470cff8b
--- /dev/null
+++ b/dev-haskell/hxt-regex-xmlschema/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		This library supports full W3C XML Schema regular expressions
+		inclusive all Unicode character sets and blocks.
+		The complete grammar can be found under &lt;http://www.w3.org/TR/xmlschema11-2/#regexs&gt;.
+		It is implemented by the technique of derivations of regular expressions.
+		The W3C syntax is extended to support not only union of regular sets,
+		but also intersection, set difference, exor.
+		Matching of subexpressions is also supported.
+		The library can be used for constricting lightweight scanners and tokenizers.
+		It is a standalone library, no external regex libraries are used.
+		This package is a substitute for the old regex-xmlschema package.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hxt-unicode/Manifest b/dev-haskell/hxt-unicode/Manifest
new file mode 100644
index 000000000000..2c89f1fbb1fc
--- /dev/null
+++ b/dev-haskell/hxt-unicode/Manifest
@@ -0,0 +1 @@
+DIST hxt-unicode-9.0.1.tar.gz 13980 RMD160 9848ee9da7fb7072e0f57f6a8cffdd5991c35c48 SHA1 49d1cd97137a19cd2293d274c926b89921a56e48 SHA256 d59bab6541d01e8c7e260c5084f6c2f4346c564bb2c53262d3ffdca8f8f9183d
diff --git a/dev-haskell/hxt-unicode/hxt-unicode-9.0.1.ebuild b/dev-haskell/hxt-unicode/hxt-unicode-9.0.1.ebuild
new file mode 100644
index 000000000000..2669aecd0492
--- /dev/null
+++ b/dev-haskell/hxt-unicode/hxt-unicode-9.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt-unicode/hxt-unicode-9.0.1.ebuild,v 1.1 2011/12/04 16:49:29 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Unicode en-/decoding functions for utf8, iso-latin-* and other encodings"
+HOMEPAGE="http://www.fh-wedel.de/~si/HXmlToolbox/index.html"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=dev-haskell/hxt-charproperties-9*
+		>=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/hxt-unicode/metadata.xml b/dev-haskell/hxt-unicode/metadata.xml
new file mode 100644
index 000000000000..df12b2addfcf
--- /dev/null
+++ b/dev-haskell/hxt-unicode/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Unicode encoding and decoding functions for utf8, iso-latin-* and somes other encodings,
+		used in the Haskell XML Toolbox.
+		ISO Latin 1 - 16, utf8, utf16, ASCII are supported. Decoding
+		is done with lasy functions, errors may be detected or ignored.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/hxt/Manifest b/dev-haskell/hxt/Manifest
index 7d67db3e3e9a..96b6681b4712 100644
--- a/dev-haskell/hxt/Manifest
+++ b/dev-haskell/hxt/Manifest
@@ -1 +1 @@
-DIST hxt-7.3.tar.gz 3629101 RMD160 3cb62dfed6ccbf726d2ed864129fe845fa35242d SHA1 2ec2104744ac0631496692b45a23122bad8cc7ba SHA256 998a1004a80a9353612ac0b9595855eb089e3c30ef26a0bf749aff163b3e329c
+DIST hxt-9.1.5.tar.gz 227583 RMD160 90895507d4a131fe00208189e4b865d49a739b07 SHA1 b00ea3eab96b2bbc774fa4acfccfe642bef6d469 SHA256 95adaea9164fa2ce3884e9528bff0fd5d908b47022048b770b69088cbc411470
diff --git a/dev-haskell/hxt/files/hxt-9.1.4-ghc-7.2.patch b/dev-haskell/hxt/files/hxt-9.1.4-ghc-7.2.patch
new file mode 100644
index 000000000000..85029137e66d
--- /dev/null
+++ b/dev-haskell/hxt/files/hxt-9.1.4-ghc-7.2.patch
@@ -0,0 +1,10 @@
+--- hxt-9.1.4-orig/hxt.cabal	2011-08-16 21:02:36.000000000 +1000
++++ hxt-9.1.4/hxt.cabal	2011-08-16 22:50:06.698989683 +1000
+@@ -166,7 +166,6 @@
+  extensions: MultiParamTypeClasses DeriveDataTypeable FunctionalDependencies FlexibleInstances
+ 
+  build-depends: base       >= 4   && < 5,
+-                haskell98  >= 1   && < 2,
+                 containers >= 0.2 && < 1,
+                 directory  >= 1   && < 2,
+                 filepath   >= 1   && < 2,
diff --git a/dev-haskell/hxt/hxt-7.3.ebuild b/dev-haskell/hxt/hxt-7.3.ebuild
deleted file mode 100644
index f2a393c1ac43..000000000000
--- a/dev-haskell/hxt/hxt-7.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/hxt-7.3.ebuild,v 1.3 2010/07/13 08:49:11 slyfox Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal versionator
-
-DESCRIPTION="A collection of tools for processing XML with Haskell"
-HOMEPAGE="http://www.fh-wedel.de/~si/HXmlToolbox/"
-SRC_URI="http://www.fh-wedel.de/~si/HXmlToolbox/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.6
-	>=dev-haskell/http-2006.7.7
-	>=dev-haskell/hunit-1.1
-	>=dev-haskell/network-1.0"
-
-src_unpack() {
-	unpack ${A}
-
-	# Oh ffs! The name of the licence file in the cabal file does not match
-	# the name of the file in the tarball so it fails at the install step.
-	sed -i -e 's/LICENCE/LICENSE/' "${S}/hxt.cabal"
-
-	if version_is_at_least "6.8" "$(ghc-version)"; then
-		sed -i -e '/build-depends:/a \
-			, process, containers, directory' \
-			"${S}/hxt.cabal"
-	fi
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc README
-	if use doc; then
-		cd "${S}/doc"
-		dodoc thesis.pdf
-	fi
-}
diff --git a/dev-haskell/hxt/hxt-9.1.5.ebuild b/dev-haskell/hxt/hxt-9.1.5.ebuild
new file mode 100644
index 000000000000..4671b0cdcc76
--- /dev/null
+++ b/dev-haskell/hxt/hxt-9.1.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/hxt-9.1.5.ebuild,v 1.1 2011/12/04 16:59:13 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A collection of tools for processing XML with Haskell."
+HOMEPAGE="http://www.fh-wedel.de/~si/HXmlToolbox/index.html"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/binary-0.5 <dev-haskell/binary-1
+		>=dev-haskell/deepseq-1.1 <dev-haskell/deepseq-2
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
+		=dev-haskell/hxt-charproperties-9*
+		=dev-haskell/hxt-regex-xmlschema-9*
+		=dev-haskell/hxt-unicode-9*
+		>=dev-haskell/network-2.1 <dev-haskell/network-3
+		>=dev-haskell/parsec-2.1 <dev-haskell/parsec-4
+		>=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+PATCHES=("${FILESDIR}/${PN}-9.1.4-ghc-7.2.patch")
diff --git a/dev-haskell/hxt/metadata.xml b/dev-haskell/hxt/metadata.xml
index 8c66906af531..ad9326a8c436 100644
--- a/dev-haskell/hxt/metadata.xml
+++ b/dev-haskell/hxt/metadata.xml
@@ -1,8 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
-<maintainer>
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		The Haskell XML Toolbox bases on the ideas of HaXml and HXML,
+		but introduces a more general approach for processing XML with Haskell.
+		The Haskell XML Toolbox uses a generic data model for representing XML documents,
+		including the DTD subset and the document subset, in Haskell.
+		It contains a validating XML parser, a HTML parser, namespace support,
+		an XPath expression evaluator, an XSLT library, a RelaxNG schema validator
+		and funtions for serialization and deserialization of user defined data.
+		The library makes extensive use of the arrow approach for processing XML.
+		Since version 9 the toolbox is partitioned into various (sub-)packages.
+		This package contains the core functionality,
+		hxt-curl, hxt-tagsoup, hxt-relaxng, hxt-xpath, hxt-xslt, hxt-regex-xmlschema contain the extensions.
+		hxt-unicode contains encoding and decoding functions,
+		hxt-charproperties char properties for unicode and XML.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/missingh/Manifest b/dev-haskell/missingh/Manifest
index 08ebfb0370b5..a443a3f8dd1d 100644
--- a/dev-haskell/missingh/Manifest
+++ b/dev-haskell/missingh/Manifest
@@ -1 +1 @@
-DIST MissingH-1.1.0.3.tar.gz 122038 RMD160 1c260087edbb3bd7f52417e8750d7a9b093fb480 SHA1 1064de9d936cd5acf4c2b5792fc8b3bcd5b9863e SHA256 2d566511e8a347189cf864188d97f8406c6958c6f0a6fcf8cb1593c6bae13dbf
+DIST MissingH-1.1.1.0.tar.gz 115901 RMD160 16c223376f4a071f3de23f2fe5ace843e49c349b SHA1 14721d50925835bfe1c09534d201c66fe20dc216 SHA256 3e87293e00c57f28e1df8425d7b6ddb92abd2063f2d962104fd64a704d6e4ec4
diff --git a/dev-haskell/missingh/missingh-1.1.0.3.ebuild b/dev-haskell/missingh/missingh-1.1.1.0.ebuild
similarity index 60%
rename from dev-haskell/missingh/missingh-1.1.0.3.ebuild
rename to dev-haskell/missingh/missingh-1.1.1.0.ebuild
index ccbe43f1c83d..3fe1f8911ce4 100644
--- a/dev-haskell/missingh/missingh-1.1.0.3.ebuild
+++ b/dev-haskell/missingh/missingh-1.1.1.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/missingh-1.1.0.3.ebuild,v 1.2 2010/08/09 17:46:14 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/missingh-1.1.1.0.ebuild,v 1.1 2011/12/04 18:20:14 slyfox Exp $
 
-CABAL_FEATURES="bin lib profile haddock"
-inherit haskell-cabal
+EAPI="3"
+
+CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
+inherit eutils haskell-cabal
 
 MY_PN="MissingH"
 MY_P="${MY_PN}-${PV}"
@@ -15,7 +17,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
+IUSE="test"
 
 # testpack dependency is a workaround for cabal-1.8 bug, which pulls
 # depends even for 'Buildable: false' target
@@ -29,18 +31,37 @@ RDEPEND=">=dev-lang/ghc-6.10
 
 DEPEND=">=dev-haskell/cabal-1.2.3
 		virtual/libiconv
-		${RDEPEND}"
+		${RDEPEND}
+		test? ( dev-haskell/testpack
+			dev-haskell/quickcheck:1
+			dev-haskell/hunit )"
 
 # libiconv is needed for the trick below to make it compile with ghc-6.12
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack $A
-	cd "${S}"
-
+src_prepare() {
 	# (non-ASCII non-UTF-8 source breaks hscolour)
 	cd src/System/Time
 	mv ParseDate.hs ParseDate.hs.ISO-8859-1
 	iconv -f ISO-8859-1 -t UTF-8 -c ParseDate.hs.ISO-8859-1 > ParseDate.hs || die "unable to recode ParseDate.hs to UTF-8"
 }
+
+src_configure() {
+	cabal_src_configure $(cabal_flag test buildtests)
+}
+
+src_test() {
+	# default tests
+	haskell-cabal_src_test || die "cabal test failed"
+
+	# built custom tests
+	"${S}/dist/build/runtests/runtests" || die "unit tests failed"
+}
+
+src_install() {
+	cabal_src_install
+
+	# if tests were enabled, make sure the unit test driver is deleted
+	rm -f "${D}/usr/bin/runtests"
+}
diff --git a/dev-haskell/monad-control/Manifest b/dev-haskell/monad-control/Manifest
new file mode 100644
index 000000000000..50ca4962242b
--- /dev/null
+++ b/dev-haskell/monad-control/Manifest
@@ -0,0 +1 @@
+DIST monad-control-0.2.0.3.tar.gz 13160 RMD160 229e944dcba41786a5153fe9ac800e6a051f5f0c SHA1 955e4e57879e88a35e40791615a87ef2edc5e993 SHA256 d00e24e47be81bcf27d44d0d099104ac0e1b7c2b66f3fe84c6f09a9e6994fc7c
diff --git a/dev-haskell/monad-control/metadata.xml b/dev-haskell/monad-control/metadata.xml
new file mode 100644
index 000000000000..f5ba38a664d2
--- /dev/null
+++ b/dev-haskell/monad-control/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		This package defines the type class @MonadControlIO@, a subset of
+		@MonadIO@ into which generic control operations such as @catch@ can
+		be lifted from @IO@.  Instances are based on monad transformers in
+		@MonadTransControl@, which includes all standard monad transformers
+		in the @transformers@ library except @ContT@.  For convenience, it
+		provides a wrapped version of @Control.Exception@ with types
+		generalized from @IO@ to all monads in @MonadControlIO@.
+		
+		Note that this package is a rewrite of Anders Kaseorg&#39;s @monad-peel@ library.
+		The main difference is that this package provides CPS style
+		operators and exploits the @RankNTypes@ language extension to
+		simplify most definitions.
+		
+		The package includes a copy of the @monad-peel@ testsuite written by Anders Kaseorg.
+		The tests can be performed by using @cabal test@.
+		
+		The following @critertion@ based benchmark shows that @monad-control@
+		is on average about 2.5 times faster than @monad-peel@:
+		
+		&lt;https://github.com/basvandijk/bench-monad-peel-control&gt;
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/monad-control/monad-control-0.2.0.3.ebuild b/dev-haskell/monad-control/monad-control-0.2.0.3.ebuild
new file mode 100644
index 000000000000..3a9850287a97
--- /dev/null
+++ b/dev-haskell/monad-control/monad-control-0.2.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/monad-control/monad-control-0.2.0.3.ebuild,v 1.1 2011/12/04 18:05:02 slyfox Exp $
+
+# ebuild generated by hackport 0.2.14
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit base haskell-cabal
+
+DESCRIPTION="Lift control operations, like exception catching, through monad transformers"
+HOMEPAGE="https://github.com/basvandijk/monad-control/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="<dev-haskell/base-unicode-symbols-0.3
+		=dev-haskell/transformers-0.2*
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.9.2
+		test? (
+			>=dev-haskell/cabal-1.10
+			<dev-haskell/test-framework-0.5
+			<dev-haskell/test-framework-hunit-0.3
+		)
+		"
+
+src_configure() {
+	cabal_src_configure $(use_enable test tests) $(cabal_flag test)
+}
diff --git a/dev-haskell/network/Manifest b/dev-haskell/network/Manifest
index a5a517029f3c..33131fe32405 100644
--- a/dev-haskell/network/Manifest
+++ b/dev-haskell/network/Manifest
@@ -1,2 +1,3 @@
 DIST network-2.2.1.7.tar.gz 112028 RMD160 f58c6aeee437e6e3296babc495892e74a5de0625 SHA1 69f284a1c618504e30d4118b47f51324cc68e575 SHA256 0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58
 DIST network-2.3.0.2.tar.gz 133335 RMD160 c48bbe4338bc3c1588b3ed31e5751db0f723e387 SHA1 f528933004f1f5474413671c8af12e20b1be5f99 SHA256 033cb59ac467af94a028bf4836568d81673ec55905029a598ec7344d23a890e8
+DIST network-2.3.0.7.tar.gz 133965 RMD160 57c3c5c070dd697829c98fbfdad04260da602e46 SHA1 6a702b434b062f5a40ca664fbbf8095f6d057790 SHA256 dba7c77ae023032efba8d6139f5c558af07c089f597fc617d81661f5986a9fe6
diff --git a/dev-haskell/network/network-2.3.0.7.ebuild b/dev-haskell/network/network-2.3.0.7.ebuild
new file mode 100644
index 000000000000..ffcdf2b22686
--- /dev/null
+++ b/dev-haskell/network/network-2.3.0.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.3.0.7.ebuild,v 1.1 2011/12/04 16:38:53 slyfox Exp $
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit base haskell-cabal autotools
+
+DESCRIPTION="Low-level networking interface"
+HOMEPAGE="http://github.com/haskell/network"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-haskell/parsec
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		test? ( <dev-haskell/hunit-1.3
+			<dev-haskell/test-framework-0.5
+			<dev-haskell/test-framework-hunit-0.3
+		)"
+
+src_prepare() {
+	epatch "${FILESDIR}/network-2.2.0.0-eat-configure-opts.patch"
+	eautoreconf
+}
+
+src_configure() {
+	cabal_src_configure $(use_enable test tests)
+}
diff --git a/dev-haskell/pcre-light/Manifest b/dev-haskell/pcre-light/Manifest
new file mode 100644
index 000000000000..ebb6d5f32b17
--- /dev/null
+++ b/dev-haskell/pcre-light/Manifest
@@ -0,0 +1 @@
+DIST pcre-light-0.4.tar.gz 28943 RMD160 636603e48c30535dd2619244de7b2aa102d7c460 SHA1 134d23bd00248b8b5ba4e4f2caab62b619f87cef SHA256 b37f6ffab07b56540ba4cc410f3ad3c4e0e6e226c610c33f4b7daf70559c31f6
diff --git a/dev-haskell/pcre-light/metadata.xml b/dev-haskell/pcre-light/metadata.xml
new file mode 100644
index 000000000000..764a400f58a0
--- /dev/null
+++ b/dev-haskell/pcre-light/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		A small, efficient and portable regex library for Perl 5 compatible regular expressions
+		
+		The PCRE library is a set of functions that implement regular
+		expression pattern matching using the same syntax and semantics as Perl 5.
+		
+		Test coverage data for this library is available at:
+		&lt;http://code.haskell.org/~dons/tests/pcre-light/hpc_index.html&gt;
+		
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/pcre-light/pcre-light-0.4.ebuild b/dev-haskell/pcre-light/pcre-light-0.4.ebuild
new file mode 100644
index 000000000000..f2674513f77c
--- /dev/null
+++ b/dev-haskell/pcre-light/pcre-light-0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pcre-light/pcre-light-0.4.ebuild,v 1.1 2011/12/04 17:53:07 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A small, efficient and portable regex library for Perl 5 compatible regular expressions"
+HOMEPAGE="http://code.haskell.org/~dons/code/pcre-light"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.8.2
+		dev-libs/libpcre"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2.0"
diff --git a/dev-haskell/quickcheck/Manifest b/dev-haskell/quickcheck/Manifest
index e8ddb576c0c9..6185509bfe8d 100644
--- a/dev-haskell/quickcheck/Manifest
+++ b/dev-haskell/quickcheck/Manifest
@@ -2,3 +2,4 @@ DIST QuickCheck-1.1.0.0.tar.gz 8672 RMD160 c66dce748ba9f6df7a542e446aeebbe06f584
 DIST QuickCheck-1.2.0.0.tar.gz 9012 RMD160 9183bd1551e93eadd64da6b298055085bdfc4d27 SHA1 012d080008cbbd955a0e7a785958e7bf66f1213b SHA256 21672d817913ac7ab6d3fd7f102dd5d0f115a0826c95b9604c8c0b0171e8d4ed
 DIST QuickCheck-2.1.0.3.tar.gz 18992 RMD160 2aada609094f946ff8c2b25a32508ace303f8d17 SHA1 e1c6c4741d042580bffcf6d586a16406b22d5e9c SHA256 91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1
 DIST QuickCheck-2.1.1.1.tar.gz 19486 RMD160 74730c80f83435dec7f03f1bf783e8797cefd347 SHA1 5b3aa51d62a4406b454612b12fd3d5c7d49a3df0 SHA256 626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9
+DIST QuickCheck-2.4.1.1.tar.gz 25068 RMD160 aa207e1d927605672824c58cabfd2cb8016a7bb4 SHA1 c898f5f90ab9382cf950ee87de2813d8f8806a0b SHA256 92a711d613bf0ce61b5843386923abf112bf509fa37931a893222a2324b0791b
diff --git a/dev-haskell/quickcheck/quickcheck-2.4.1.1.ebuild b/dev-haskell/quickcheck/quickcheck-2.4.1.1.ebuild
new file mode 100644
index 000000000000..b8a38fb1ca23
--- /dev/null
+++ b/dev-haskell/quickcheck/quickcheck-2.4.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-2.4.1.1.ebuild,v 1.1 2011/12/04 17:11:50 slyfox Exp $
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+MY_PN="QuickCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Automatic testing of Haskell programs"
+HOMEPAGE="http://code.haskell.org/QuickCheck"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+# would work with ghc 6.8 (6.6 too?) too if we added this dep
+# dev-haskell/extensible-exceptions. however, we'd prefer not to add more co$
+# packages, as we don't want them upgradeable (leads to trouble).
+#
+# this means that we can only support the architectures which has >=ghc-6.10
+# and unfortunately have to drop the other arches until we get proper ghc su$
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/regex-base/Manifest b/dev-haskell/regex-base/Manifest
index 4e9a3acb1ccb..d6946df0c639 100644
--- a/dev-haskell/regex-base/Manifest
+++ b/dev-haskell/regex-base/Manifest
@@ -2,3 +2,4 @@ DIST regex-base-0.71.tar.gz 6759 RMD160 61fb61b7f777732e2ae5b19229e79c14ff13781c
 DIST regex-base-0.72.0.1.tar.gz 6916 RMD160 798c0f7e2c246be4a8bc115fbda2119c89622c18 SHA1 e9baaf4ec700400a3deebeabcbc06a6449b46fc5 SHA256 22a521476775ede118f121e8ad0074022431ece6fb0bbeb43c073e7cad36ee59
 DIST regex-base-0.72.0.2.tar.gz 11139 RMD160 d26b3fcb95bac459c9e52c0dbb0810ac002509c7 SHA1 6e113b980462938a9821b0fe23a9f40b70c05cea SHA256 38a4901b942fea646a422d52c52ef14eec4d6561c258b3c54cd96a8a354141ee
 DIST regex-base-0.93.1.tar.gz 9212 RMD160 5bfaa2e4049d16cf7b98a9f0524e1cfd758dab40 SHA1 e94c4c15fd3f4b375eb854ee0b77787a03fc8a2c SHA256 24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef
+DIST regex-base-0.93.2.tar.gz 9156 RMD160 c009e193dd453666c7c3b585a25f3a8add7ec6b6 SHA1 96ceb1ca8df2397a4dffba570e24d438401e4ffd SHA256 20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278
diff --git a/dev-haskell/regex-base/regex-base-0.93.2.ebuild b/dev-haskell/regex-base/regex-base-0.93.2.ebuild
new file mode 100644
index 000000000000..9fecc6ffc553
--- /dev/null
+++ b/dev-haskell/regex-base/regex-base-0.93.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-base/regex-base-0.93.2.ebuild,v 1.1 2011/12/04 17:41:38 slyfox Exp $
+
+CABAL_FEATURES="profile haddock lib"
+inherit haskell-cabal
+
+DESCRIPTION="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
+HOMEPAGE="http://sourceforge.net/projects/lazy-regex"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.6
+		dev-haskell/mtl"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/regex-compat/Manifest b/dev-haskell/regex-compat/Manifest
index 18cd14d3d869..e9c8c7782c71 100644
--- a/dev-haskell/regex-compat/Manifest
+++ b/dev-haskell/regex-compat/Manifest
@@ -2,3 +2,4 @@ DIST regex-compat-0.71.0.1.tar.gz 3601 RMD160 1f017c1fa1ca9dfcccf3da4760bcc8f999
 DIST regex-compat-0.71.tar.gz 3560 RMD160 f35756d4955051dc0c3eece664086faf54d10e93 SHA1 da341d389c0507bf861e62235f817f07931d4116 SHA256 d04d120ddf6cd1793a3e0df6fa7f7a19162030855cdc2ca20705d85a929eaa5b
 DIST regex-compat-0.91.tar.gz 3647 RMD160 da238ed52c33bd971031f0a051ae7ae1d32c7d39 SHA1 c87d8f0c2c448f39912f7bd5c7559d2891fbd8bc SHA256 46963ca8a17a2828232fe598cab00af6a1b44f123142f9094a63063d852a63b0
 DIST regex-compat-0.92.tar.gz 4138 RMD160 329563696e391c95b95aeaacfa6412f6dc64b165 SHA1 6d9f9f0c5b8c9c18243a7d3038ae07aba284996d SHA256 430d251bd704071fca1e38c9b250543f00d4e370382ed552ac3d7407d4f27936
+DIST regex-compat-0.95.1.tar.gz 3968 RMD160 b2fe02ca3c4e9027b2d433c8a265b19a85c8bd17 SHA1 a2f9745bd396018e7f8ba644baad4a55e7c70d54 SHA256 d57cb1a5a4d66753b18eaa37a1621246f660472243b001894f970037548d953b
diff --git a/dev-haskell/regex-compat/regex-compat-0.95.1.ebuild b/dev-haskell/regex-compat/regex-compat-0.95.1.ebuild
new file mode 100644
index 000000000000..3c2ffec3476f
--- /dev/null
+++ b/dev-haskell/regex-compat/regex-compat-0.95.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-compat/regex-compat-0.95.1.ebuild,v 1.1 2011/12/04 17:44:28 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Replaces/Enhances Text.Regex"
+HOMEPAGE="http://sourceforge.net/projects/lazy-regex"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-haskell/regex-base-0.93
+		>=dev-haskell/regex-posix-0.95.1
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/regex-posix/Manifest b/dev-haskell/regex-posix/Manifest
index 8ddedc8f4aed..c837d536bb1c 100644
--- a/dev-haskell/regex-posix/Manifest
+++ b/dev-haskell/regex-posix/Manifest
@@ -3,3 +3,4 @@ DIST regex-posix-0.72.0.2.tar.gz 42874 RMD160 3d4974412e5bc7413071cd1f9dd66d31f3
 DIST regex-posix-0.72.0.3.tar.gz 43718 RMD160 f2da6d572e89a81632d8e5e71b45a3bafd967db1 SHA1 b75f5bc6957dcb7a6dddc024ccb282d36fae28a7 SHA256 327ab87f3d4f5315a9414331eb382b8b997de8836d577c3f7d232c574606feb1
 DIST regex-posix-0.93.1.tar.gz 12922 RMD160 14749aef4a601ac974094d58b5f3434b042e84b9 SHA1 34f48cd9a0698c9c124932e7ae2eb1cd3179b425 SHA256 95b9a2cea46517b4f4afe7c274e13ff9692eace9184aa0656b3a643f7d79e48f
 DIST regex-posix-0.94.1.tar.gz 13015 RMD160 7987b622800e79ce77634c983bbc177d71198acd SHA1 4d0c820246da25735438c96c4392dd043a38bbfb SHA256 63e76de0610d35f1b576ae65a25a38e04e758ed64b9b3512de95bdffd649485c
+DIST regex-posix-0.95.1.tar.gz 42808 RMD160 eee72b352cc887d919d179969b3d9535805d235d SHA1 a0b809584e21cb692ff5835b04059c833ec3d1f6 SHA256 74ed145b1a5b3c766a2694a58661f1d5e03a8dee283c5ddb9d689cff16efef0a
diff --git a/dev-haskell/regex-posix/regex-posix-0.95.1.ebuild b/dev-haskell/regex-posix/regex-posix-0.95.1.ebuild
new file mode 100644
index 000000000000..fb30037b3b77
--- /dev/null
+++ b/dev-haskell/regex-posix/regex-posix-0.95.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-posix/regex-posix-0.95.1.ebuild,v 1.2 2011/12/04 17:39:20 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Replaces/Enhances Text.Regex"
+HOMEPAGE="http://sourceforge.net/projects/lazy-regex"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-haskell/regex-base-0.93
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/sha/Manifest b/dev-haskell/sha/Manifest
new file mode 100644
index 000000000000..1e36c44b3bb7
--- /dev/null
+++ b/dev-haskell/sha/Manifest
@@ -0,0 +1 @@
+DIST SHA-1.5.0.0.tar.gz 2714032 RMD160 c0347e52366c50116dbb3e7e17ac3439e6ee0ff2 SHA1 397a1ff44b098d22f862ccae1a34e861d94b3b86 SHA256 9361cf9dffb8640e435b7b61bc4922c7bdf4c26d96bb42de423ede4a570b5f8b
diff --git a/dev-haskell/sha/metadata.xml b/dev-haskell/sha/metadata.xml
new file mode 100644
index 000000000000..b3a30d785b5d
--- /dev/null
+++ b/dev-haskell/sha/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		This library implements the SHA suite of message digest functions,
+		according to NIST FIPS 180-2 (with the SHA-224 addendum), as well
+		as the SHA-based HMAC routines. The functions have been tested
+		against most of the NIST and RFC test vectors for the various
+		functions. While some attention has been paid to performance,
+		these do not presently reach the speed of well-tuned libraries,
+		like OpenSSL.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/sha/sha-1.5.0.0.ebuild b/dev-haskell/sha/sha-1.5.0.0.ebuild
new file mode 100644
index 000000000000..ec6b422aaf3b
--- /dev/null
+++ b/dev-haskell/sha/sha-1.5.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/sha/sha-1.5.0.0.ebuild,v 1.1 2011/12/04 17:49:25 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="SHA"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Implementations of the SHA suite of message digest functions"
+HOMEPAGE="http://hackage.haskell.org/package/sha"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/binary
+		>=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/testpack/Manifest b/dev-haskell/testpack/Manifest
index d87eae28f1be..1ed5aebc99ab 100644
--- a/dev-haskell/testpack/Manifest
+++ b/dev-haskell/testpack/Manifest
@@ -1 +1 @@
-DIST testpack-2.1.0.tar.gz 14882 RMD160 da387a31205a2cc812304d0be0aa58058c277fa8 SHA1 c4ed2ceb1bb2fe71cb98810a25794598dcedc117 SHA256 8128f3a409855fca1d431391b2cbf6a9f4dec32dd6f26825960b936fe578c476
+DIST testpack-2.1.1.tar.gz 14861 RMD160 6ad30812e5cc875653cab812bddd28a0c3ebdf69 SHA1 661a7eb44767ee9e61c645ca41c54e8e15b5ef70 SHA256 afc2cd992263112e08beaebf3c75b47d885574659ce093e7810124bf611f0ffd
diff --git a/dev-haskell/testpack/testpack-2.1.0.ebuild b/dev-haskell/testpack/testpack-2.1.1.ebuild
similarity index 86%
rename from dev-haskell/testpack/testpack-2.1.0.ebuild
rename to dev-haskell/testpack/testpack-2.1.1.ebuild
index c384aab0c2fc..656f321dd64f 100644
--- a/dev-haskell/testpack/testpack-2.1.0.ebuild
+++ b/dev-haskell/testpack/testpack-2.1.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/testpack/testpack-2.1.0.ebuild,v 1.1 2011/06/12 12:22:55 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/testpack/testpack-2.1.1.ebuild,v 1.1 2011/12/04 18:07:09 slyfox Exp $
 
 # ebuild generated by hackport 0.2.13
 
 EAPI="3"
 
-CABAL_FEATURES="lib profile haddock hscolour"
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
 inherit haskell-cabal
 
 DESCRIPTION="Test Utililty Pack for HUnit and QuickCheck"
diff --git a/dev-haskell/transformers/Manifest b/dev-haskell/transformers/Manifest
new file mode 100644
index 000000000000..1d809f877bd6
--- /dev/null
+++ b/dev-haskell/transformers/Manifest
@@ -0,0 +1 @@
+DIST transformers-0.2.2.0.tar.gz 17148 RMD160 1b0f20324b5ceb3e9c8073d7f18c2e2b2cdbff3e SHA1 69361d6afeef9eb7cc0c759c34844db367a64f89 SHA256 bf2d197dbcad9cf964f537b926719b41510b286134bc6d4e5385832b7cff6ada
diff --git a/dev-haskell/transformers/metadata.xml b/dev-haskell/transformers/metadata.xml
new file mode 100644
index 000000000000..d7201866d4c0
--- /dev/null
+++ b/dev-haskell/transformers/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Haskell 98 part of a monad transformer library, inspired by the paper
+		\&quot;Functional Programming with Overloading and Higher-Order Polymorphism\&quot;,
+		by Mark P Jones, in /Advanced School of Functional Programming/, 1995
+		(&lt;http://web.cecs.pdx.edu/~mpj/pubs/springschool.html&gt;).
+		
+		This part contains the monad transformer class, the concrete monad
+		transformers, operations and liftings.  It can be used on its own
+		in Haskell 98 code, or with the monad classes in the @monads-fd@ or
+		@monads-tf@ packages, which automatically lift operations introduced
+		by monad transformers through other transformers.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-haskell/transformers/transformers-0.2.2.0.ebuild b/dev-haskell/transformers/transformers-0.2.2.0.ebuild
new file mode 100644
index 000000000000..86f3f1c36dfe
--- /dev/null
+++ b/dev-haskell/transformers/transformers-0.2.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/transformers/transformers-0.2.2.0.ebuild,v 1.1 2011/12/04 17:56:19 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Concrete functor and monad transformers"
+HOMEPAGE="http://hackage.haskell.org/package/transformers"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.5.5"
diff --git a/dev-haskell/utf8-string/Manifest b/dev-haskell/utf8-string/Manifest
index df5a2df8d9bf..90e026428d13 100644
--- a/dev-haskell/utf8-string/Manifest
+++ b/dev-haskell/utf8-string/Manifest
@@ -1 +1,2 @@
 DIST utf8-string-0.3.6.tar.gz 8871 RMD160 9c09a826a933c998d710a38b3bdb9f68fef242e5 SHA1 06c5b38dbf60952d8a9767186984164f638dce7f SHA256 c8c74555174edfb96145585c9b80780d0fc55ba249282b8a4c5968cca7c09d69
+DIST utf8-string-0.3.7.tar.gz 8845 RMD160 31b890cf3759dfe775a42238644c35326a594eee SHA1 2e9978a9623312e331b7760652449a4963067bf9 SHA256 785b4b31476adab9d4ea553a9a6b590acb0b906836abb3facd218c18b8eea9e8
diff --git a/dev-haskell/utf8-string/utf8-string-0.3.7.ebuild b/dev-haskell/utf8-string/utf8-string-0.3.7.ebuild
new file mode 100644
index 000000000000..fb6f310a45a9
--- /dev/null
+++ b/dev-haskell/utf8-string/utf8-string-0.3.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/utf8-string/utf8-string-0.3.7.ebuild,v 1.1 2011/12/04 17:32:07 slyfox Exp $
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Support for reading and writing UTF8 Strings"
+HOMEPAGE="http://github.com/glguy/utf8-string/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.6.1
+		>=dev-haskell/cabal-1.2"
diff --git a/dev-java/byaccj/byaccj-1.15.ebuild b/dev-java/byaccj/byaccj-1.15.ebuild
index 31234b36110d..f853187afb71 100644
--- a/dev-java/byaccj/byaccj-1.15.ebuild
+++ b/dev-java/byaccj/byaccj-1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/byaccj/byaccj-1.15.ebuild,v 1.5 2011/12/01 19:51:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/byaccj/byaccj-1.15.ebuild,v 1.6 2011/12/04 16:49:51 hwoarang Exp $
 
 EAPI="3"
 DESCRIPTION="A java extension of BSD YACC-compatible parser generator"
@@ -9,7 +9,7 @@ MY_P="${PN}${PV}_src"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE=""
 DEPEND=""
 RDEPEND=""
@@ -17,7 +17,7 @@ RDEPEND=""
 S="${WORKDIR}/${PN}${PV}"
 
 src_compile() {
-	cp "${FILESDIR}/Makefile" src/Makefile
+	cp "${FILESDIR}/Makefile" src/Makefile || die
 	emake -C src linux || die "Failed too build"
 }
 
diff --git a/dev-libs/lzo/lzo-2.06.ebuild b/dev-libs/lzo/lzo-2.06.ebuild
index d5175a288b7a..0ea1bcdb0ad1 100644
--- a/dev-libs/lzo/lzo-2.06.ebuild
+++ b/dev-libs/lzo/lzo-2.06.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-2.06.ebuild,v 1.8 2011/12/03 20:18:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-2.06.ebuild,v 1.9 2011/12/04 18:20:31 armin76 Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index 3b66730f3f9c..e3be0a88509d 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1 +1,2 @@
 DIST redland-1.0.14.tar.gz 1581695 RMD160 1c58f81106682da3174c05e66a0c77567587be35 SHA1 2561bf73f00f88e39f5c7b3a9b78f8d4ce7da955 SHA256 130c3f0290868df1aa82f7648aee73677271a7e0867109cba16751fd120686c4
+DIST redland-1.0.15.tar.gz 1600090 RMD160 5cd4eca23faf05348c2327f356980aa2f18accea SHA1 e93d6fafaeebdf9f15a1044be6f4a88270f007af SHA256 0e1f5825b6357c9b490da866c95ae1d895dbb5f445013d2511c37df822ee9ec6
diff --git a/dev-libs/redland/redland-1.0.15.ebuild b/dev-libs/redland/redland-1.0.15.ebuild
new file mode 100644
index 000000000000..6d92e95c3aa5
--- /dev/null
+++ b/dev-libs/redland/redland-1.0.15.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.15.ebuild,v 1.1 2011/12/04 22:03:12 ssuominen Exp $
+
+EAPI=4
+inherit libtool
+
+DESCRIPTION="High-level interface for the Resource Description Framework"
+HOMEPAGE="http://librdf.org/"
+SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+IUSE="berkdb iodbc mysql odbc postgres sqlite ssl static-libs +xml"
+
+# NOTE: libtool is required for libltdl at runtime
+RDEPEND=">=sys-devel/libtool-2.2.6b
+	mysql? ( virtual/mysql )
+	sqlite? ( =dev-db/sqlite-3* )
+	berkdb? ( sys-libs/db )
+	xml? ( dev-libs/libxml2 )
+	!xml? ( dev-libs/expat )
+	ssl? ( dev-libs/openssl )
+	media-libs/raptor:2[xml?]
+	>=dev-libs/rasqal-0.9.26
+	postgres? ( dev-db/postgresql-base )
+	iodbc? ( dev-db/libiodbc )
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	elibtoolize # NOTE: this is for fbsd .so version
+}
+
+src_configure() {
+	local parser=expat
+	use xml && parser=libxml
+
+	local myconf="--without-virtuoso"
+	if use iodbc; then
+		myconf="--with-virtuoso --with-iodbc --without-unixodbc"
+	elif use odbc; then
+		myconf="--with-virtuoso --with-unixodbc --without-iodbc"
+	fi
+
+	# FIXME: upstream doesn't test with --with-threads and testsuite fails
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with berkdb bdb) \
+		--with-xml-parser=${parser} \
+		$(use_with ssl openssl-digests) \
+		$(use_with mysql) \
+		$(use_with sqlite) \
+		$(use_with postgres postgresql) \
+		--without-threads \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		${myconf}
+}
+
+src_test() {
+	if ! use berkdb; then
+		export REDLAND_TEST_CLONING_STORAGE_TYPE=hashes
+		export REDLAND_TEST_CLONING_STORAGE_NAME=test
+		export REDLAND_TEST_CLONING_STORAGE_OPTIONS="hash-type='memory',dir='.',write='yes',new='yes',contexts='yes'"
+	fi
+	default
+}
+
+src_install() {
+	default
+	dohtml {FAQS,NEWS,README,RELEASE,TODO}.html
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
diff --git a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.530.0.ebuild b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.530.0.ebuild
index e36b0a133940..8037122235cb 100644
--- a/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.530.0.ebuild
+++ b/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.530.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.530.0.ebuild,v 1.1 2011/10/21 13:47:44 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-wxWidgets/Alien-wxWidgets-0.530.0.ebuild,v 1.2 2011/12/04 17:36:31 hwoarang Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ inherit wxwidgets perl-module
 DESCRIPTION="Building, finding and using wxWidgets binaries"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.00.ebuild b/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.00.ebuild
index 3bfd2f265a7b..895794ec009b 100644
--- a/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.00.ebuild
+++ b/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.00.ebuild,v 1.6 2008/03/19 02:41:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.00.ebuild,v 1.7 2011/12/04 17:56:16 armin76 Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://search.cpan.orga/~adamk/"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ~ppc sparc x86"
+KEYWORDS="amd64 hppa ~mips ~ppc x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.60.0.ebuild b/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.60.0.ebuild
index c0dc213bd6e0..a22a2e0c5644 100644
--- a/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.60.0.ebuild
+++ b/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.60.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.60.0.ebuild,v 1.3 2011/12/01 19:39:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.60.0.ebuild,v 1.4 2011/12/04 17:56:16 armin76 Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Implements an algorithm to find good values for chart axis"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~mips ~ppc ~sparc x86"
+KEYWORDS="~amd64 hppa ~mips ~ppc x86"
 IUSE=""
 
 RDEPEND=">=virtual/perl-Math-BigInt-1.70
diff --git a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.160.200.ebuild b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.160.200.ebuild
index b670c701d7a1..d606ee2676b6 100644
--- a/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.160.200.ebuild
+++ b/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.160.200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.160.200.ebuild,v 1.1 2011/06/04 07:07:25 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.160.200.ebuild,v 1.2 2011/12/04 17:37:44 hwoarang Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="XS for C++"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 DEPEND="virtual/perl-Module-Build
diff --git a/dev-perl/File-chdir/File-chdir-0.100.200.ebuild b/dev-perl/File-chdir/File-chdir-0.100.200.ebuild
index c0578f21de90..027483251e61 100644
--- a/dev-perl/File-chdir/File-chdir-0.100.200.ebuild
+++ b/dev-perl/File-chdir/File-chdir-0.100.200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-chdir/File-chdir-0.100.200.ebuild,v 1.1 2011/02/26 09:12:42 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-chdir/File-chdir-0.100.200.ebuild,v 1.2 2011/12/04 17:58:40 armin76 Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="An alternative to File::Spec and CWD"
 
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/File-chdir/File-chdir-0.100.300.ebuild b/dev-perl/File-chdir/File-chdir-0.100.300.ebuild
index fb03b9502391..1d73dcc22650 100644
--- a/dev-perl/File-chdir/File-chdir-0.100.300.ebuild
+++ b/dev-perl/File-chdir/File-chdir-0.100.300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-chdir/File-chdir-0.100.300.ebuild,v 1.3 2011/12/04 15:00:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-chdir/File-chdir-0.100.300.ebuild,v 1.4 2011/12/04 17:58:40 armin76 Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="An alternative to File::Spec and CWD"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=virtual/perl-File-Spec-3.27"
diff --git a/dev-perl/File-chdir/File-chdir-0.100.600.ebuild b/dev-perl/File-chdir/File-chdir-0.100.600.ebuild
index 646e578b7642..e860c07b8fbf 100644
--- a/dev-perl/File-chdir/File-chdir-0.100.600.ebuild
+++ b/dev-perl/File-chdir/File-chdir-0.100.600.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-chdir/File-chdir-0.100.600.ebuild,v 1.1 2011/11/05 10:07:18 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-chdir/File-chdir-0.100.600.ebuild,v 1.2 2011/12/04 17:58:40 armin76 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="An alternative to File::Spec and CWD"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=virtual/perl-File-Spec-3.27"
diff --git a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.65.ebuild b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.65.ebuild
index 245e33145bfc..7903ff818b22 100644
--- a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.65.ebuild
+++ b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.65.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.65.ebuild,v 1.11 2007/04/16 06:17:41 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.65.ebuild,v 1.12 2011/12/04 18:02:16 armin76 Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://cpan/authors/id/A/AL/ALEXP/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 hppa ~mips ppc ppc64 x86"
 IUSE=""
 
 TDEPEND=">=dev-perl/Test-Pod-Coverage-1.04"
diff --git a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.690.0.ebuild b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.690.0.ebuild
index 44d145a4da7c..023112bd9916 100644
--- a/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.690.0.ebuild
+++ b/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.690.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.690.0.ebuild,v 1.4 2011/12/04 14:51:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Domain-TLD/Net-Domain-TLD-1.690.0.ebuild,v 1.5 2011/12/04 18:02:16 armin76 Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Current list of available top level domain names including new ICANN additions and ccTLDs"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 hppa ~mips ~ppc ~ppc64 x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/PatchReader/PatchReader-0.9.6.ebuild b/dev-perl/PatchReader/PatchReader-0.9.6.ebuild
index 7f7275939673..0ae60d752481 100644
--- a/dev-perl/PatchReader/PatchReader-0.9.6.ebuild
+++ b/dev-perl/PatchReader/PatchReader-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PatchReader/PatchReader-0.9.6.ebuild,v 1.3 2011/12/04 14:47:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PatchReader/PatchReader-0.9.6.ebuild,v 1.4 2011/12/04 17:54:03 armin76 Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="Module for reading diff-compatible patch files"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="virtual/perl-File-Temp"
diff --git a/dev-perl/SGMLSpm/SGMLSpm-1.03-r6.ebuild b/dev-perl/SGMLSpm/SGMLSpm-1.03-r6.ebuild
index 04d80b7b506a..f77f60bb4e81 100644
--- a/dev-perl/SGMLSpm/SGMLSpm-1.03-r6.ebuild
+++ b/dev-perl/SGMLSpm/SGMLSpm-1.03-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/SGMLSpm/SGMLSpm-1.03-r6.ebuild,v 1.4 2011/11/30 03:48:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SGMLSpm/SGMLSpm-1.03-r6.ebuild,v 1.5 2011/12/04 22:04:24 maekke Exp $
 
 inherit eutils perl-module
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://cpan/authors/id/D/DM/DMEGG/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/dev-perl/SVN-Mirror/SVN-Mirror-0.73.ebuild b/dev-perl/SVN-Mirror/SVN-Mirror-0.73.ebuild
index b986d79ab94e..0ad96d1689af 100644
--- a/dev-perl/SVN-Mirror/SVN-Mirror-0.73.ebuild
+++ b/dev-perl/SVN-Mirror/SVN-Mirror-0.73.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/SVN-Mirror/SVN-Mirror-0.73.ebuild,v 1.6 2010/06/22 18:35:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SVN-Mirror/SVN-Mirror-0.73.ebuild,v 1.7 2011/12/04 17:59:39 armin76 Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.cpan.org/authors/id/C/CL/CLKAO/${P}.readme"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="amd64 ia64 ppc sparc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND=">=dev-vcs/subversion-1.1.3
diff --git a/dev-perl/SVN-Mirror/SVN-Mirror-0.750.0.ebuild b/dev-perl/SVN-Mirror/SVN-Mirror-0.750.0.ebuild
index 1c3a46d01baa..a2b354faf9d4 100644
--- a/dev-perl/SVN-Mirror/SVN-Mirror-0.750.0.ebuild
+++ b/dev-perl/SVN-Mirror/SVN-Mirror-0.750.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/SVN-Mirror/SVN-Mirror-0.750.0.ebuild,v 1.1 2011/08/29 09:33:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/SVN-Mirror/SVN-Mirror-0.750.0.ebuild,v 1.2 2011/12/04 17:59:39 armin76 Exp $
 
 EAPI=4
 MODULE_AUTHOR=CLKAO
@@ -10,7 +10,7 @@ inherit perl-module eutils
 DESCRIPTION="SVN::Mirror - Mirror remote repositories to local subversion repository"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=">=dev-vcs/subversion-1.1.3[perl]
diff --git a/dev-perl/wxperl/wxperl-0.990.200.ebuild b/dev-perl/wxperl/wxperl-0.990.200.ebuild
index 25eeb181bdd0..fbbdcce42659 100644
--- a/dev-perl/wxperl/wxperl-0.990.200.ebuild
+++ b/dev-perl/wxperl/wxperl-0.990.200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/wxperl/wxperl-0.990.200.ebuild,v 1.1 2011/10/21 13:48:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/wxperl/wxperl-0.990.200.ebuild,v 1.2 2011/12/04 17:37:08 hwoarang Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ DESCRIPTION="Perl bindings for wxGTK"
 HOMEPAGE="http://wxperl.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta3.ebuild b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta3.ebuild
index 1eedc803cf1c..b6120a3a4ddc 100644
--- a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta3.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta3.ebuild,v 1.7 2011/12/03 17:58:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta3.ebuild,v 1.8 2011/12/04 15:52:20 xarthisius Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ inherit php-pear-r1
 DESCRIPTION="Database Abstraction Layer, mysqli driver"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
diff --git a/dev-python/columnize/columnize-0.3.3.ebuild b/dev-python/columnize/columnize-0.3.3.ebuild
index d761d1cd4b40..5fc234e75255 100644
--- a/dev-python/columnize/columnize-0.3.3.ebuild
+++ b/dev-python/columnize/columnize-0.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/columnize/columnize-0.3.3.ebuild,v 1.1 2010/11/07 21:15:27 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/columnize/columnize-0.3.3.ebuild,v 1.2 2011/12/04 21:17:31 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -14,7 +14,7 @@ DESCRIPTION="Format a simple (i.e. not nested) list into aligned columns."
 HOMEPAGE="http://code.google.com/p/pycolumnize/ http://pypi.python.org/pypi/columnize"
 SRC_URI="http://pycolumnize.googlecode.com/files/${P}.tar.gz"
 
-LICENSE="PSF-2.2"
+LICENSE="PSF-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
diff --git a/dev-python/python-daemon/python-daemon-1.6.ebuild b/dev-python/python-daemon/python-daemon-1.6.ebuild
index eb3aceed5722..6f7beaaa98f0 100644
--- a/dev-python/python-daemon/python-daemon-1.6.ebuild
+++ b/dev-python/python-daemon/python-daemon-1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-daemon/python-daemon-1.6.ebuild,v 1.4 2010/12/26 15:28:01 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-daemon/python-daemon-1.6.ebuild,v 1.5 2011/12/04 21:18:14 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -13,7 +13,7 @@ DESCRIPTION="Library to implement a well-behaved Unix daemon process."
 HOMEPAGE="http://pypi.python.org/pypi/python-daemon"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="PSF-2.2"
+LICENSE="PSF-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
diff --git a/dev-python/python-nss/python-nss-0.12.ebuild b/dev-python/python-nss/python-nss-0.12.ebuild
index bafb8075eff2..8b9554644c16 100644
--- a/dev-python/python-nss/python-nss-0.12.ebuild
+++ b/dev-python/python-nss/python-nss-0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nss/python-nss-0.12.ebuild,v 1.1 2011/12/04 12:42:48 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nss/python-nss-0.12.ebuild,v 1.2 2011/12/04 22:22:49 mr_bones_ Exp $
 
 EAPI="4"
 
@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}"
 DOCS="README doc/ChangeLog"
 
 src_prepare() {
-	# RHB #754750 ; bgo #390869	
+	# RHB #754750 ; bgo #390869
 	epatch "${FILESDIR}/python-nss-0.12-rsapssparams.patch"
 }
 
diff --git a/dev-ruby/bacon/bacon-1.1.0-r1.ebuild b/dev-ruby/bacon/bacon-1.1.0-r1.ebuild
index 932d92314413..cd9326c31497 100644
--- a/dev-ruby/bacon/bacon-1.1.0-r1.ebuild
+++ b/dev-ruby/bacon/bacon-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bacon/bacon-1.1.0-r1.ebuild,v 1.6 2011/10/10 17:29:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bacon/bacon-1.1.0-r1.ebuild,v 1.7 2011/12/04 23:43:14 naota Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 ree18 jruby"
@@ -15,7 +15,7 @@ HOMEPAGE="http://chneukirchen.org/repos/bacon"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES="${FILESDIR}/${P}+ruby-1.9.2.patch"
diff --git a/dev-ruby/crack/crack-0.3.1.ebuild b/dev-ruby/crack/crack-0.3.1.ebuild
index 55e8b9e61fc5..04b69fe84674 100644
--- a/dev-ruby/crack/crack-0.3.1.ebuild
+++ b/dev-ruby/crack/crack-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/crack/crack-0.3.1.ebuild,v 1.1 2011/09/22 06:03:50 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/crack/crack-0.3.1.ebuild,v 1.3 2011/12/04 18:46:36 graaff Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ RUBY_FAKEGEM_EXTRADOC="README.rdoc History"
 inherit ruby-fakegem
 
 DESCRIPTION="Really simple JSON and XML parsing, ripped from Merb and Rails."
-HOMEPAGE="http://rubyforge.org/projects/crack"
+HOMEPAGE="https://github.com/jnunemaker/crack"
 
 LICENSE="MIT"
 SLOT="0"
@@ -33,3 +33,15 @@ all_ruby_prepare() {
 	# dev-ruby/matchy.
 	sed -i -e 's:jnunemaker-matchy:mcmire-matchy:' test/test_helper.rb || die
 }
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby19)
+			# Remove test suite that is broken for ruby19.
+			# Github Issues 26, 29, 32, 33.
+			rm test/json_test.rb || die
+			;;
+		*)
+			;;
+	esac
+}
diff --git a/dev-ruby/heckle/heckle-1.4.3-r2.ebuild b/dev-ruby/heckle/heckle-1.4.3-r2.ebuild
index cfab9cd813d7..b82ad9455ce9 100644
--- a/dev-ruby/heckle/heckle-1.4.3-r2.ebuild
+++ b/dev-ruby/heckle/heckle-1.4.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/heckle/heckle-1.4.3-r2.ebuild,v 1.11 2011/09/15 04:50:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/heckle/heckle-1.4.3-r2.ebuild,v 1.12 2011/12/05 00:59:25 naota Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/ruby2ruby-1.1.6
diff --git a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.7.ebuild b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.7.ebuild
index 26e9298c3a88..0bc194f5b23b 100644
--- a/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.7.ebuild
+++ b/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.7.ebuild,v 1.1 2011/10/16 07:36:59 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe-seattlerb/hoe-seattlerb-1.2.7.ebuild,v 1.2 2011/12/05 00:32:53 naota Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -19,7 +19,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/hoe-seattlerb"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.12 )"
diff --git a/dev-ruby/i18n/i18n-0.6.0-r1.ebuild b/dev-ruby/i18n/i18n-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..3a8335e27d7b
--- /dev/null
+++ b/dev-ruby/i18n/i18n-0.6.0-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.6.0-r1.ebuild,v 1.1 2011/12/04 19:23:50 graaff Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 jruby ree18 ruby19"
+
+# doc regeneration seem to need Jeweler, which is not currently
+# available
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.textile CHANGELOG.textile"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Add Internationalization support to your Ruby application."
+HOMEPAGE="http://rails-i18n.org/"
+
+SRC_URI="http://github.com/svenfuchs/${PN}/tarball/v${PV} -> ${PN}-git-${PV}.tgz"
+RUBY_S="svenfuchs-${PN}-*"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+# The testsuite uses the activerecord gem to run some tests; they
+# require sqlite3-ruby, and that is not available on JRuby.
+#USE_RUBY="${USE_RUBY/jruby/}" \
+#	ruby_add_bdepend "
+#			test? (
+#				dev-ruby/activerecord
+#				dev-ruby/sqlite3-ruby
+#				dev-ruby/ruby2ruby
+#			)"
+
+# mocha is optionally used by the testsuite, try to increase coverage
+# of testing by depending on it.
+#
+# One further test dependency would be ruby-cldr
+# (http://rubygems.org/gems/ruby-cldr) but we don't have it in tree
+# yet.
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		dev-ruby/test_declarative
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby19)
+			# Remove tests that require a UTF-8 locale.
+			rm test/gettext/backend_test.rb || die
+
+			# Remove tests that contains a 1.9.3-specific failure.
+			# https://github.com/svenfuchs/i18n/issues/114
+			rm test/i18n/load_path_test.rb || die
+			;;
+		*)
+			;;
+	esac
+}
+
+src_compile() {
+	# permissions need to be stricter for Ruby-Inline to work properly.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+	ruby-ng_src_compile
+}
+
+src_test() {
+	# permissions need to be stricter for Ruby-Inline to work properly.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+	ruby-ng_src_test
+}
+
+each_ruby_test() {
+	# Make sure the optional activerecord tests are not run for jruby
+	# because we don't ship a compatible sqlite3
+	case ${RUBY} in
+		*jruby)
+			;;
+		*)
+			each_fakegem_test
+	esac
+}
diff --git a/dev-ruby/markaby/markaby-0.7.2.ebuild b/dev-ruby/markaby/markaby-0.7.2.ebuild
index 956064e8c162..3d8368e98f81 100644
--- a/dev-ruby/markaby/markaby-0.7.2.ebuild
+++ b/dev-ruby/markaby/markaby-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/markaby/markaby-0.7.2.ebuild,v 1.2 2011/08/28 09:29:38 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/markaby/markaby-0.7.2.ebuild,v 1.3 2011/12/04 16:48:57 hwoarang Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18"
@@ -19,7 +19,7 @@ HOMEPAGE="http://markaby.github.com/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 ruby_add_bdepend "test? ( virtual/ruby-test-unit dev-ruby/rspec:2 dev-ruby/tilt )"
diff --git a/dev-ruby/mime-types/mime-types-1.16-r3.ebuild b/dev-ruby/mime-types/mime-types-1.16-r3.ebuild
index cf2861fbb009..955c50eb79f0 100644
--- a/dev-ruby/mime-types/mime-types-1.16-r3.ebuild
+++ b/dev-ruby/mime-types/mime-types-1.16-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-1.16-r3.ebuild,v 1.3 2011/09/09 08:11:36 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mime-types/mime-types-1.16-r3.ebuild,v 1.4 2011/12/05 00:11:22 naota Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://rubyforge.org/projects/mime-types"
 
 LICENSE="Ruby Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/hoe )
diff --git a/dev-ruby/mustache/mustache-0.99.4.ebuild b/dev-ruby/mustache/mustache-0.99.4.ebuild
index 654d527af221..55e1bf6793e3 100644
--- a/dev-ruby/mustache/mustache-0.99.4.ebuild
+++ b/dev-ruby/mustache/mustache-0.99.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mustache/mustache-0.99.4.ebuild,v 1.4 2011/08/07 18:57:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mustache/mustache-0.99.4.ebuild,v 1.5 2011/12/04 23:23:34 naota Exp $
 
 EAPI=2
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://mustache.github.com/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/parsetree/parsetree-3.0.8.ebuild b/dev-ruby/parsetree/parsetree-3.0.8.ebuild
index 087704b54112..74ecb8015dab 100644
--- a/dev-ruby/parsetree/parsetree-3.0.8.ebuild
+++ b/dev-ruby/parsetree/parsetree-3.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/parsetree-3.0.8.ebuild,v 1.1 2011/10/16 09:52:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/parsetree-3.0.8.ebuild,v 1.2 2011/12/05 00:54:30 naota Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend '
diff --git a/dev-ruby/rack/rack-1.2.4-r1.ebuild b/dev-ruby/rack/rack-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..c8037cb14c2a
--- /dev/null
+++ b/dev-ruby/rack/rack-1.2.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.4-r1.ebuild,v 1.2 2011/12/05 00:02:44 naota Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog KNOWN-ISSUES README SPEC"
+
+inherit ruby-fakegem eutils versionator
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="http://rubyforge.org/projects/rack"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all. We do add the fcgi dependency because
+# that spec isn't optional.
+ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/ruby-fcgi )"
+
+# Block against versions in older slots that also try to install a binary.
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.1.0-r1:0"
+
+#USE_RUBY=ruby19 \
+#	ruby_add_bdepend "ruby_targets_ruby19 test" '=dev-ruby/test-unit-1*'
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.1-gentoo.patch
+
+	# Add missing require for Mutex use. This may show up in the tests
+	# depending on load order.
+	sed -i -e '1 irequire "thread"' lib/rack/lock.rb || die
+}
+
+each_ruby_test() {
+	# Since the Rakefile calls specrb directly rather than loading it, we
+	# cannot use it to launch the tests or only the currently-selected
+	# RUBY interpreter will be tested.
+	${RUBY} -S bacon -Ilib -w -a \
+		-q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|rackup)' \
+		|| die "test failed for ${RUBY}"
+}
diff --git a/dev-ruby/rack/rack-1.2.4.ebuild b/dev-ruby/rack/rack-1.2.4.ebuild
index fa4a6b9a2811..197cf5c6bd1a 100644
--- a/dev-ruby/rack/rack-1.2.4.ebuild
+++ b/dev-ruby/rack/rack-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.4.ebuild,v 1.1 2011/09/18 07:38:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.4.ebuild,v 1.2 2011/12/04 19:03:22 graaff Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="ChangeLog KNOWN-ISSUES README SPEC"
 inherit ruby-fakegem eutils versionator
 
 DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="http://rubyforge.org/projects/rack"
+HOMEPAGE="https://github.com/rack/rack"
 SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-ruby/rdiscount/rdiscount-1.6.8.ebuild b/dev-ruby/rdiscount/rdiscount-1.6.8.ebuild
index 9a5e0d209071..ce26f6b165b9 100644
--- a/dev-ruby/rdiscount/rdiscount-1.6.8.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-1.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdiscount/rdiscount-1.6.8.ebuild,v 1.4 2011/08/07 18:58:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdiscount/rdiscount-1.6.8.ebuild,v 1.5 2011/12/04 23:28:34 naota Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://github.com/rtomayko/rdiscount"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/ruby-inline/ruby-inline-3.9.0.ebuild b/dev-ruby/ruby-inline/ruby-inline-3.9.0.ebuild
index d0920a71c0f5..82a623d64054 100644
--- a/dev-ruby/ruby-inline/ruby-inline-3.9.0.ebuild
+++ b/dev-ruby/ruby-inline/ruby-inline-3.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-inline/ruby-inline-3.9.0.ebuild,v 1.2 2011/08/27 09:50:23 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-inline/ruby-inline-3.9.0.ebuild,v 1.3 2011/12/05 00:47:58 naota Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.zenspider.com/ZSS/Products/RubyInline/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend dev-ruby/zentest
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild
index 7826e5e075f7..cbb15520d233 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild,v 1.1 2011/11/09 06:15:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild,v 1.2 2011/12/05 00:58:07 naota Exp $
 
 EAPI=2
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/parsetree-3*
diff --git a/dev-ruby/ruby_parser/ruby_parser-2.3.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-2.3.1.ebuild
index 242248f1a03d..0dc58d83cb3b 100644
--- a/dev-ruby/ruby_parser/ruby_parser-2.3.1.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.3.1.ebuild,v 1.1 2011/10/19 17:57:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.3.1.ebuild,v 1.2 2011/12/05 00:56:48 naota Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://parsetree.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/sexp-processor-3.0.1"
diff --git a/dev-ruby/rubyzip/rubyzip-0.9.5.ebuild b/dev-ruby/rubyzip/rubyzip-0.9.5.ebuild
index 2af4cf53744c..75ceaac70a29 100644
--- a/dev-ruby/rubyzip/rubyzip-0.9.5.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-0.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyzip/rubyzip-0.9.5.ebuild,v 1.1 2011/11/27 09:06:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyzip/rubyzip-0.9.5.ebuild,v 1.2 2011/12/05 00:16:46 naota Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ RUBY_S="aussiegeek-rubyzip-*"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-ruby/sexp-processor/sexp-processor-3.0.6.ebuild b/dev-ruby/sexp-processor/sexp-processor-3.0.6.ebuild
index b1dd76ab7e54..47531a4e598b 100644
--- a/dev-ruby/sexp-processor/sexp-processor-3.0.6.ebuild
+++ b/dev-ruby/sexp-processor/sexp-processor-3.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sexp-processor/sexp-processor-3.0.6.ebuild,v 1.1 2011/08/20 09:13:45 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sexp-processor/sexp-processor-3.0.6.ebuild,v 1.2 2011/12/05 00:51:12 naota Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/tilt/tilt-1.3.2.ebuild b/dev-ruby/tilt/tilt-1.3.2.ebuild
index 4a915191a845..6e32ba086b77 100644
--- a/dev-ruby/tilt/tilt-1.3.2.ebuild
+++ b/dev-ruby/tilt/tilt-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/tilt-1.3.2.ebuild,v 1.5 2011/11/28 19:24:33 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/tilt-1.3.2.ebuild,v 1.6 2011/12/04 16:47:52 hwoarang Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://github.com/rtomayko/tilt"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RUBY_PATCHES=( "${P}-thread_id.patch" )
diff --git a/dev-ruby/zentest/zentest-4.6.2.ebuild b/dev-ruby/zentest/zentest-4.6.2.ebuild
index af5a2d4773da..83f25f12e5ed 100644
--- a/dev-ruby/zentest/zentest-4.6.2.ebuild
+++ b/dev-ruby/zentest/zentest-4.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/zentest/zentest-4.6.2.ebuild,v 1.1 2011/08/26 11:50:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/zentest/zentest-4.6.2.ebuild,v 1.2 2011/12/05 00:35:14 naota Exp $
 
 EAPI=2
 
@@ -18,7 +18,7 @@ DESCRIPTION="ZenTest provides tools to support testing: zentest, unit_diff, auto
 HOMEPAGE="http://rubyforge.org/projects/zentest/"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-tex/catdvi/catdvi-0.14.ebuild b/dev-tex/catdvi/catdvi-0.14.ebuild
deleted file mode 100644
index 9af09d8f77a8..000000000000
--- a/dev-tex/catdvi/catdvi-0.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/catdvi/catdvi-0.14.ebuild,v 1.4 2008/09/11 19:11:12 maekke Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="DVI to plain text translator"
-HOMEPAGE="http://catdvi.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="virtual/tex-base"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf || die "econf failed."
-	# Do not use plain emake here, because make tests
-	# may cache fonts and generate sandbox violations.
-	emake catdvi CC="$(tc-getCC)" || die "emake failed."
-}
-
-src_install() {
-	dobin catdvi
-	doman catdvi.1
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/dev-util/strace/strace-4.6.ebuild b/dev-util/strace/strace-4.6.ebuild
index f2fd058d4ae4..1849db027f02 100644
--- a/dev-util/strace/strace-4.6.ebuild
+++ b/dev-util/strace/strace-4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.6.ebuild,v 1.3 2011/11/25 23:39:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.6.ebuild,v 1.4 2011/12/04 22:07:32 maekke Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="static aio"
 
 # strace only uses the header from libaio
diff --git a/dev-vcs/giggle/Manifest b/dev-vcs/giggle/Manifest
index 0fd5cd994aa3..5e65327454b6 100644
--- a/dev-vcs/giggle/Manifest
+++ b/dev-vcs/giggle/Manifest
@@ -1 +1,2 @@
 DIST giggle-0.5.tar.bz2 486406 RMD160 ee2ff519d7bd29f59a5b4b26342e1dfc7916deb2 SHA1 43143e49be8f510e126c19c68ce19870448e9430 SHA256 2e2c70d25159d31c87d155c9f799e0f1feb30fe26fc8aaf207ca6b3bd9b2b259
+DIST giggle-0.6.1.tar.bz2 1908147 RMD160 56db8094dfe85f63e359c253eded811fcab7ac6e SHA1 790f3ff8eb47896a96c10e0697d17b26fbfcef45 SHA256 47d5da248aae588b69427f8726b8b7cf76701544bb0b567ef823afefe2e39f52
diff --git a/dev-vcs/giggle/giggle-0.6.1.ebuild b/dev-vcs/giggle/giggle-0.6.1.ebuild
new file mode 100644
index 000000000000..7c8e54e3af17
--- /dev/null
+++ b/dev-vcs/giggle/giggle-0.6.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.6.1.ebuild,v 1.2 2011/12/04 20:59:34 ikelos Exp $
+
+EAPI="3"
+
+inherit autotools gnome2
+
+DESCRIPTION="GTK+ Frontend for GIT"
+HOMEPAGE="http://live.gnome.org/giggle"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="eds"
+
+RDEPEND=">=dev-vcs/git-1.5
+		 >=dev-libs/glib-2.18:2
+		 >=x11-libs/gtk+-3.0:3
+		 >=x11-libs/gtksourceview-3.0:3.0
+		 gnome-base/gnome-common
+		 eds? ( gnome-extra/evolution-data-server )
+		 >=x11-libs/vte-0.26:2.90"
+DEPEND="${RDEPEND}
+		  sys-devel/gettext
+		>=dev-util/pkgconfig-0.15
+		>=dev-util/intltool-0.35
+		>=sys-devel/autoconf-2.64
+		>=sys-devel/libtool-2"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+G2CONF="$(use_enable eds evolution-data-server)"
+
+src_prepare() {
+	eautoreconf
+}
diff --git a/dev-vcs/git-annex/Manifest b/dev-vcs/git-annex/Manifest
new file mode 100644
index 000000000000..9ca1e568d87e
--- /dev/null
+++ b/dev-vcs/git-annex/Manifest
@@ -0,0 +1 @@
+DIST git-annex-3.20111203.tar.gz 442974 RMD160 b5f06d6cbffc3cab1dca5f53f2b41ef748ae6d26 SHA1 3aea68b9e00fdfcc08d6f55f7879e21b6d4844df SHA256 3b7361c9d27302f23136266ff1223b2a82c280988b3c706d518539eb577af244
diff --git a/dev-vcs/git-annex/git-annex-3.20111203.ebuild b/dev-vcs/git-annex/git-annex-3.20111203.ebuild
new file mode 100644
index 000000000000..043cae25688d
--- /dev/null
+++ b/dev-vcs/git-annex/git-annex-3.20111203.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-annex/git-annex-3.20111203.ebuild,v 1.1 2011/12/04 18:36:26 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="manage files with git, without checking their contents into git"
+HOMEPAGE="http://git-annex.branchable.com/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-vcs/git-1.7.7" # TODO: add more deps?
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6
+		dev-haskell/dataenc
+		dev-haskell/hs3
+		dev-haskell/hslogger
+		dev-haskell/http
+		dev-haskell/json
+		dev-haskell/missingh
+		dev-haskell/monad-control
+		dev-haskell/mtl
+		dev-haskell/network
+		dev-haskell/pcre-light
+		dev-haskell/sha
+		dev-haskell/time
+		dev-haskell/utf8-string
+		>=dev-lang/ghc-6.10.1"
diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
new file mode 100644
index 000000000000..19222bedf181
--- /dev/null
+++ b/dev-vcs/git-annex/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		git-annex allows managing files with git, without checking the file
+		contents into git. While that may seem paradoxical, it is useful when
+		dealing with files larger than git can currently easily handle, whether due
+		to limitations in memory, checksumming time, or disk space.
+		
+		Even without file content tracking, being able to manage files with git,
+		move files around and delete files with versioned directory trees, and use
+		branches and distributed clones, are all very handy reasons to use git. And
+		annexed files can co-exist in the same git repository with regularly
+		versioned files, which is convenient for maintaining documents, Makefiles,
+		etc that are associated with annexed files but that benefit from full
+		revision control.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 22f58624658d..0d14be8ed486 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1,3 +1,4 @@
 DIST gitolite-gentoo-1.5.9.1.tar.bz2 147081 RMD160 9f260abcb0e24726088e95709485e312b9aa5be3 SHA1 32557db816f1e17da8df0b2c8028c0ecd3ad91bf SHA256 10a260e2e3d2c035c4a717cd30bbe319b7760c39180cbc8d8a7c227911c1dac8
 DIST gitolite-gentoo-2.0.3.tar.bz2 182066 RMD160 260178a5292e5eb088c2d080d8f42e315e45ad88 SHA1 5ca84545e9798e55209a5c091aed62a02d882418 SHA256 c9e685023bb04a19bdaec0374b37fa18d4105cb1a50cf8d7aaddbfd0de7cd191
 DIST gitolite-gentoo-2.1.0.tar.bz2 191407 RMD160 62328cd94b0a180d718abb84c467d161cd581984 SHA1 fee8c9be8d6d79911d8772af72389c9237f86410 SHA256 431521c18d5f3b1ae12f4bed6c3ce422ac8b43242ab6a1c944801795a24ad6e8
+DIST gitolite-gentoo-2.2.tar.bz2 187769 RMD160 0f87d87b50ed30469573aa244590d236ab019151 SHA1 573fb57b91e320c13bfa676e1df2e8ba2011bfb0 SHA256 2ed4be0be6454444cbabdcd650e47697c8b838ec4e688bca7554c6a7eed17538
diff --git a/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-2.2-gl-system-setup-exit.patch b/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-2.2-gl-system-setup-exit.patch
new file mode 100644
index 000000000000..1d3e12aca05e
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/files/gitolite-gentoo-2.2-gl-system-setup-exit.patch
@@ -0,0 +1,47 @@
+From ab9d0d2f57ed84c01513053b88587dac82d9ed66 Mon Sep 17 00:00:00 2001
+From: Sitaram Chamarty <sitaram@atc.tcs.com>
+Date: Thu, 17 Nov 2011 18:49:24 +0530
+Subject: [PATCH] a couple of very minor oopsies
+
+(1) c5f342a forgot authkeys can have blank lines also
+
+(2) f0cedeb ended gl-system-install on a non-0 ret code
+
+both caught by matthewtdawson at gmail
+---
+ src/gl-system-install |    4 +++-
+ src/sshkeys-lint      |    2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/gl-system-install b/src/gl-system-install
+index 0eec005..d7df7e4 100755
+--- a/src/gl-system-install
++++ b/src/gl-system-install
+@@ -108,8 +108,10 @@ gl-setup is not in your \$PATH.
+ $path_advice"
+ 
+ which=`dirname $which`
+-[ "$which" != "$gl_bin_dir" ] && die "                ***** WARNING *****
++[ "$which" = "$gl_bin_dir" ] || die "                ***** WARNING *****
+ $which precedes $gl_bin_dir in your \$PATH,
+ and it *also* contains gl-setup.  This is almost certainly going to confuse
+ you or me later.
+ $path_advice"
++
++exit 0
+diff --git a/src/sshkeys-lint b/src/sshkeys-lint
+index bcb8f7b..96c027f 100755
+--- a/src/sshkeys-lint
++++ b/src/sshkeys-lint
+@@ -119,7 +119,7 @@ sub ak_comment {
+     $in_gl_section = 1 if /^# gitolite start/;
+     $in_gl_section = 0 if /^# gitolite end/;
+     die "gitosis?  what's that?\n" if /^#.*gitosis/;
+-    return /^\s*#/;
++    return /^\s*(#|$)/;
+ }
+ 
+ sub fprint {
+-- 
+1.7.5.4
+
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.2.ebuild
new file mode 100644
index 000000000000..9009fe907dd9
--- /dev/null
+++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.2.ebuild,v 1.1 2011/12/04 16:37:33 idl0r Exp $
+
+EAPI=3
+
+inherit eutils perl-module
+
+DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
+HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=summary"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="dev-lang/perl
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite
+	dev-perl/Net-SSH-AuthorizedKeysFile
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}-gentoo" > conf/VERSION
+
+	epatch "${FILESDIR}/${P}-gl-system-setup-exit.patch"
+}
+
+src_install() {
+	local gl_bin="${D}/usr/bin"
+
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	export PATH="${D}"/usr/bin:$PATH
+	./src/gl-system-install ${gl_bin//\/\///} \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+	ewarn
+	elog "If you use the umask feature and upgrade from <=gitolite-gentoo-1.5.9.1"
+	elog "then please check the permissions of all repositories using the umask feature"
+	ewarn
+}
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 5f03babfcd00..c145aae952ad 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -1,3 +1,4 @@
 DIST gitolite-1.5.9.1.tar.gz 180299 RMD160 d302b8ad95ec99ad0eec035583fe0327ffef44cb SHA1 100269bae00f56b6cf5266c240d15d910d382ce3 SHA256 5e0b5f0f35433c8e35ad763b13580b4e9c4501160ae74e48a2bc018ab0111077
 DIST gitolite-2.0.3.tar.bz2 180376 RMD160 0f8ccdeaa03297185afcd7e1d2c16f325854caee SHA1 d5849b8d7a745a3d3bb06f55693c7a3e8219b960 SHA256 8be9bca35aed98164cc25842199478cb5e5ec30a0210a6a5ff121300fec2c54d
 DIST gitolite-2.1.0.tar.bz2 189726 RMD160 1911d6c6b700756a0ca1141b8964a69fd91b7e7a SHA1 312532739538e7fe16fbb6de4088037dd8ee77c3 SHA256 c55ca02932893f3f6a76a2e31d53d847c2fd5ccb768831db123c2f80d1b8eaa3
+DIST gitolite-2.2.tar.bz2 186414 RMD160 3403fcde29a5a405d36cb88fdfe380b4bc1f42be SHA1 1c11de5264ecadbc4aed0f38607182dd68ee2cc1 SHA256 b43a735af62dbb2b05ed679029f3eafd8aa0c0e8041399f2c4dad796f87d6ccc
diff --git a/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch b/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch
new file mode 100644
index 000000000000..1d3e12aca05e
--- /dev/null
+++ b/dev-vcs/gitolite/files/gitolite-2.2-gl-system-setup-exit.patch
@@ -0,0 +1,47 @@
+From ab9d0d2f57ed84c01513053b88587dac82d9ed66 Mon Sep 17 00:00:00 2001
+From: Sitaram Chamarty <sitaram@atc.tcs.com>
+Date: Thu, 17 Nov 2011 18:49:24 +0530
+Subject: [PATCH] a couple of very minor oopsies
+
+(1) c5f342a forgot authkeys can have blank lines also
+
+(2) f0cedeb ended gl-system-install on a non-0 ret code
+
+both caught by matthewtdawson at gmail
+---
+ src/gl-system-install |    4 +++-
+ src/sshkeys-lint      |    2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/gl-system-install b/src/gl-system-install
+index 0eec005..d7df7e4 100755
+--- a/src/gl-system-install
++++ b/src/gl-system-install
+@@ -108,8 +108,10 @@ gl-setup is not in your \$PATH.
+ $path_advice"
+ 
+ which=`dirname $which`
+-[ "$which" != "$gl_bin_dir" ] && die "                ***** WARNING *****
++[ "$which" = "$gl_bin_dir" ] || die "                ***** WARNING *****
+ $which precedes $gl_bin_dir in your \$PATH,
+ and it *also* contains gl-setup.  This is almost certainly going to confuse
+ you or me later.
+ $path_advice"
++
++exit 0
+diff --git a/src/sshkeys-lint b/src/sshkeys-lint
+index bcb8f7b..96c027f 100755
+--- a/src/sshkeys-lint
++++ b/src/sshkeys-lint
+@@ -119,7 +119,7 @@ sub ak_comment {
+     $in_gl_section = 1 if /^# gitolite start/;
+     $in_gl_section = 0 if /^# gitolite end/;
+     die "gitosis?  what's that?\n" if /^#.*gitosis/;
+-    return /^\s*#/;
++    return /^\s*(#|$)/;
+ }
+ 
+ sub fprint {
+-- 
+1.7.5.4
+
diff --git a/dev-vcs/gitolite/gitolite-2.2.ebuild b/dev-vcs/gitolite/gitolite-2.2.ebuild
new file mode 100644
index 000000000000..db6b8cddac50
--- /dev/null
+++ b/dev-vcs/gitolite/gitolite-2.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-2.2.ebuild,v 1.1 2011/12/04 16:40:10 idl0r Exp $
+
+EAPI=4
+
+inherit eutils perl-module
+
+DESCRIPTION="Highly flexible server for git directory version tracker"
+HOMEPAGE="http://github.com/sitaramc/gitolite"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib vim-syntax"
+
+DEPEND="dev-lang/perl
+	>=dev-vcs/git-1.6.6"
+RDEPEND="${DEPEND}
+	!dev-vcs/gitolite-gentoo
+	vim-syntax? ( app-vim/gitolite-syntax )"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitolite git
+}
+
+src_prepare() {
+	rm Makefile doc/COPYING || die
+	rm -rf contrib/{gitweb,vim} || die
+
+	echo "${PF}" > conf/VERSION
+
+	epatch "${FILESDIR}/${P}-gl-system-setup-exit.patch"
+}
+
+src_install() {
+	local gl_bin="${D}/usr/bin"
+
+	dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die
+
+	# install using upstream method
+	export PATH="${D}"/usr/bin:$PATH
+	./src/gl-system-install ${gl_bin//\/\///} \
+		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
+	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
+		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
+
+	rm "${D}"/usr/bin/*.pm
+	insinto "${VENDOR_LIB}"
+	doins src/*.pm || die
+
+	dodoc README.mkd doc/*
+
+	if use contrib; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib/ || die
+	fi
+
+	keepdir /var/lib/gitolite
+	fowners git:git /var/lib/gitolite
+	fperms 750 /var/lib/gitolite
+}
+
+pkg_postinst() {
+	# bug 352291
+	ewarn
+	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
+	elog "Especially if you're migrating from gitosis."
+	ewarn
+}
diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild
index dd08ca6408c7..bf7aabdf85de 100644
--- a/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild
+++ b/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild,v 1.3 2011/11/20 11:01:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild,v 1.4 2011/12/04 16:41:54 hwoarang Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://rapidsvn.tigris.org/"
 SRC_URI="http://www.rapidsvn.org/download/release/${MY_PV}/${P}-${MY_REL}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 COMMON_DEP=">=dev-vcs/subversion-1.5.0
diff --git a/dev-vcs/svk/svk-1.08.ebuild b/dev-vcs/svk/svk-1.08.ebuild
index a9c3e649fd54..57702d19597e 100644
--- a/dev-vcs/svk/svk-1.08.ebuild
+++ b/dev-vcs/svk/svk-1.08.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svk/svk-1.08.ebuild,v 1.3 2010/06/22 18:51:20 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svk/svk-1.08.ebuild,v 1.4 2011/12/04 17:58:18 armin76 Exp $
 
 inherit eutils perl-module bash-completion
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.elixus.org/"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="crypt nls pager patch"
 
 DEPEND="
diff --git a/dev-vcs/svk/svk-2.0.2.ebuild b/dev-vcs/svk/svk-2.0.2.ebuild
index c3061e1f9eac..03873f212ba2 100644
--- a/dev-vcs/svk/svk-2.0.2.ebuild
+++ b/dev-vcs/svk/svk-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svk/svk-2.0.2.ebuild,v 1.4 2011/02/26 08:43:29 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svk/svk-2.0.2.ebuild,v 1.5 2011/12/04 17:58:18 armin76 Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.elixus.org/"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="crypt nls pager patch log4p bash-completion"
 
 DEPEND="
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 197511bc3e29..6a2be429b8a8 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.489 2011/12/03 20:45:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.493 2011/12/04 22:59:31 vapier Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
@@ -265,14 +265,6 @@ S=$(gcc_get_s_dir)
 #			for an older gcc version with a new gcc, make sure you set
 #			HTB_GCC_VER to that version of gcc.
 #
-#	MAN_VER
-#			The version of gcc for which we will download manpages. This will
-#			default to ${GCC_RELEASE_VER}, but we may not want to pre-generate man pages
-#			for prerelease test ebuilds for example. This allows you to
-#			continue using pre-generated manpages from the last stable release.
-#			If set to "none", this will prevent the downloading of manpages,
-#			which is useful for individual library targets.
-#
 gentoo_urls() {
 	local devspace="HTTP~lv/GCC/URI HTTP~eradicator/gcc/URI HTTP~vapier/dist/URI
 	HTTP~halcy0n/patches/URI HTTP~zorry/patches/gcc/URI HTTP~dirtyepic/dist/URI"
@@ -317,11 +309,6 @@ get_gcc_src_uri() {
 	[[ -n ${UCLIBC_VER} ]] && \
 		GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2)"
 
-	# PERL cannot be present at bootstrap, and is used to build the man pages.
-	# So... lets include some pre-generated ones, shall we?
-	[[ -n ${MAN_VER} ]] && \
-		GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${MAN_VER}-manpages.tar.bz2)"
-
 	# various gentoo patches
 	[[ -n ${PATCH_VER} ]] && \
 		GCC_SRC_URI="${GCC_SRC_URI} $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2)"
@@ -516,17 +503,6 @@ want_minispecs() {
 	fi
 	return 1
 }
-# This function checks whether or not glibc has the support required to build
-# Position Independant Executables with gcc.
-glibc_have_pie() {
-	if [[ ! -f ${ROOT}/usr/$(get_libdir)/Scrt1.o ]] ; then
-		echo
-		ewarn "Your glibc does not have support for pie, the file Scrt1.o is missing"
-		ewarn "Please update your glibc to a proper version or disable hardened"
-		echo
-		return 1
-	fi
-}
 
 # This function determines whether or not libc has been patched with stack
 # smashing protection support.
@@ -904,10 +880,6 @@ toolchain_src_unpack() {
 	do_gcc_PIE_patches
 	epatch_user
 
-	# fail if using pie patches, building hardened, and glibc doesnt have
-	# the necessary support
-	want_pie && use hardened && glibc_have_pie
-
 	if use hardened ; then
 		einfo "updating configuration to build hardened GCC"
 		make_gcc_hard || die "failed to make gcc hard"
@@ -1583,10 +1555,6 @@ toolchain_src_compile() {
 	mkdir -p "${WORKDIR}"/build
 	pushd "${WORKDIR}"/build > /dev/null
 
-	# Install our pre generated manpages if we do not have perl ...
-	[[ ! -x /usr/bin/perl ]] && [[ -n ${MAN_VER} ]] && \
-		unpack gcc-${MAN_VER}-manpages.tar.bz2
-
 	einfo "Configuring ${PN} ..."
 	gcc_do_configure
 
@@ -1783,16 +1751,18 @@ gcc_slot_java() {
 		rm -rf "${D}"${PREFIX}/lib*/security
 	fi
 
-	# Move libgcj.spec to compiler-specific directories
-	[[ -f ${D}${PREFIX}/lib/libgcj.spec ]] && \
-		mv -f "${D}"${PREFIX}/lib/libgcj.spec "${D}"${LIBPATH}/libgcj.spec
+	# Move random gcj files to compiler-specific directories
+	for x in libgcj.spec logging.properties ; do
+		x="${D}${PREFIX}/lib/${x}"
+		[[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}/
+	done
 
-	# SLOT up libgcj.pc (and let gcc-config worry about links)
-	local libgcj=$(find "${D}"${PREFIX}/lib/pkgconfig/ -name 'libgcj*.pc')
-	if [[ -n ${libgcj} ]] ; then
-		sed -i "/^libdir=/s:=.*:=${LIBPATH}:" "${libgcj}"
-		mv "${libgcj}" "${D}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
-	fi
+	# SLOT up libgcj.pc if it's available (and let gcc-config worry about links)
+	for x in "${D}"${PREFIX}/lib*/pkgconfig/libgcj*.pc ; do
+		[[ -f ${x} ]] || continue
+		sed -i "/^libdir=/s:=.*:=${LIBPATH}:" "${x}"
+		mv "${x}" "${D}"/usr/lib/pkgconfig/libgcj-${GCC_PV}.pc || die
+	done
 
 	# Rename jar because it could clash with Kaffe's jar if this gcc is
 	# primary compiler (aka don't have the -<version> extension)
@@ -2200,17 +2170,15 @@ setup_multilib_osdirnames() {
 }
 
 disable_multilib_libjava() {
-	if is_gcj ; then
-		# We dont want a multilib libjava, so lets use this hack taken from fedora
-		pushd "${S}" > /dev/null
-		sed -i -e 's/^all: all-redirect/ifeq (\$(MULTISUBDIR),)\nall: all-redirect\nelse\nall:\n\techo Multilib libjava build disabled\nendif/' libjava/Makefile.in
-		sed -i -e 's/^install: install-redirect/ifeq (\$(MULTISUBDIR),)\ninstall: install-redirect\nelse\ninstall:\n\techo Multilib libjava install disabled\nendif/' libjava/Makefile.in
-		sed -i -e 's/^check: check-redirect/ifeq (\$(MULTISUBDIR),)\ncheck: check-redirect\nelse\ncheck:\n\techo Multilib libjava check disabled\nendif/' libjava/Makefile.in
-		sed -i -e 's/^all: all-recursive/ifeq (\$(MULTISUBDIR),)\nall: all-recursive\nelse\nall:\n\techo Multilib libjava build disabled\nendif/' libjava/Makefile.in
-		sed -i -e 's/^install: install-recursive/ifeq (\$(MULTISUBDIR),)\ninstall: install-recursive\nelse\ninstall:\n\techo Multilib libjava install disabled\nendif/' libjava/Makefile.in
-		sed -i -e 's/^check: check-recursive/ifeq (\$(MULTISUBDIR),)\ncheck: check-recursive\nelse\ncheck:\n\techo Multilib libjava check disabled\nendif/' libjava/Makefile.in
-		popd > /dev/null
-	fi
+	# We dont want a multilib libjava, so lets use this hack taken from fedora
+	sed -i -r \
+		-e 's/^((all:) all-redirect)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
+		-e 's/^((install:) install-redirect)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
+		-e 's/^((check:) check-redirect)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
+		-e 's/^((all:) all-recursive)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
+		-e 's/^((install:) install-recursive)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
+		-e 's/^((check:) check-recursive)/ifeq (\$(MULTISUBDIR),)\n\1\nelse\n\2\n\techo Multilib libjava disabled\nendif/' \
+		"${S}"/libjava/Makefile.in || die
 }
 
 # make sure the libtool archives have libdir set to where they actually
diff --git a/kde-base/dolphin/dolphin-4.7.3.ebuild b/kde-base/dolphin/dolphin-4.7.3.ebuild
index 583212b95dc3..85a53e666921 100644
--- a/kde-base/dolphin/dolphin-4.7.3.ebuild
+++ b/kde-base/dolphin/dolphin-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.7.3.ebuild,v 1.1 2011/11/02 20:48:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.7.3.ebuild,v 1.2 2011/12/04 17:44:28 dilfridge Exp $
 
 EAPI=4
 
@@ -32,6 +32,9 @@ PDEPEND="
 
 KMLOADLIBS="libkonq"
 
+RESTRICT="test"
+# bug 393129
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
diff --git a/kde-base/kaddressbook/kaddressbook-4.7.3.ebuild b/kde-base/kaddressbook/kaddressbook-4.7.3.ebuild
index 33409e06a10d..d956c7947395 100644
--- a/kde-base/kaddressbook/kaddressbook-4.7.3.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.7.3.ebuild,v 1.2 2011/11/05 19:55:02 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.7.3.ebuild,v 1.3 2011/12/04 20:33:21 dilfridge Exp $
 
 EAPI=4
 
@@ -21,6 +21,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+RESTRICT="test"
+# bug 393127
+
 KMEXTRA="
 	plugins/kaddressbook/
 	plugins/ktexteditor/
diff --git a/kde-base/kalgebra/kalgebra-4.7.3.ebuild b/kde-base/kalgebra/kalgebra-4.7.3.ebuild
index 541eb30306a6..c2e3cb92effc 100644
--- a/kde-base/kalgebra/kalgebra-4.7.3.ebuild
+++ b/kde-base/kalgebra/kalgebra-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.7.3.ebuild,v 1.1 2011/11/02 20:48:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.7.3.ebuild,v 1.2 2011/12/04 15:47:33 dilfridge Exp $
 
 EAPI=4
 
@@ -26,6 +26,9 @@ KMEXTRA="
 	libkdeedu/qtmmlwidget/
 "
 
+RESTRICT="test"
+# bug 382561
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.5.73-solaris-graph2d.patch
 )
diff --git a/kde-base/kcalc/kcalc-4.7.3.ebuild b/kde-base/kcalc/kcalc-4.7.3.ebuild
index 2610420087eb..c1a6a19bf7c4 100644
--- a/kde-base/kcalc/kcalc-4.7.3.ebuild
+++ b/kde-base/kcalc/kcalc-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.7.3.ebuild,v 1.1 2011/11/02 20:48:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.7.3.ebuild,v 1.2 2011/12/04 16:14:59 dilfridge Exp $
 
 EAPI=4
 
@@ -24,6 +24,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+RESTRICT="test"
+# bug 393093
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3.2-solaris-knumber_priv.patch
 )
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.3.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.3.ebuild
index 6d6d9c7b7dc0..ca2710ed8b4f 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.3.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.3.ebuild,v 1.2 2011/11/05 19:57:11 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.7.3.ebuild,v 1.3 2011/12/04 17:54:05 dilfridge Exp $
 
 EAPI=4
 
@@ -33,6 +33,9 @@ add_blocker kaddressbook '<4.4.90'
 add_blocker kmail '<4.4.80'
 add_blocker korganizer '<4.5.67'
 
+RESTRICT="test"
+# bug 393131
+
 KMEXTRA="
 	akonadi_next/
 	calendarsupport/
diff --git a/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild b/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild
index d484045503c6..6b6be6eb1ab3 100644
--- a/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild
+++ b/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild,v 1.1 2011/11/02 20:47:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keditbookmarks/keditbookmarks-4.7.3.ebuild,v 1.2 2011/12/04 15:59:29 dilfridge Exp $
 
 EAPI=4
 
@@ -19,3 +19,6 @@ RDEPEND="${DEPEND}"
 KMEXTRACTONLY="
 	lib/konq/
 "
+
+RESTRICT="test"
+# bug 392703
diff --git a/kde-base/kmail/kmail-4.7.3.ebuild b/kde-base/kmail/kmail-4.7.3.ebuild
index d7991b0fb818..0a2814a9852c 100644
--- a/kde-base/kmail/kmail-4.7.3.ebuild
+++ b/kde-base/kmail/kmail-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.7.3.ebuild,v 1.2 2011/11/05 19:58:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.7.3.ebuild,v 1.3 2011/12/04 20:47:47 dilfridge Exp $
 
 EAPI=4
 
@@ -21,6 +21,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+RESTRICT="test"
+# bug 393147
+
 KMEXTRACTONLY="
 	akonadi_next/
 	calendarsupport/
diff --git a/kde-base/korganizer/korganizer-4.7.3.ebuild b/kde-base/korganizer/korganizer-4.7.3.ebuild
index b71689ba7e6d..1bc4354d0111 100644
--- a/kde-base/korganizer/korganizer-4.7.3.ebuild
+++ b/kde-base/korganizer/korganizer-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.7.3.ebuild,v 1.2 2011/11/05 19:56:10 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.7.3.ebuild,v 1.3 2011/12/04 20:50:06 dilfridge Exp $
 
 EAPI=4
 
@@ -22,6 +22,9 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep ktimezoned)
 "
 
+RESTRICT="test"
+# bug 393135
+
 KMLOADLIBS="kdepim-common-libs"
 
 KMEXTRACTONLY="
diff --git a/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild b/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild
index e7a537b09ce7..3c89c4538d03 100644
--- a/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild
+++ b/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild,v 1.1 2011/11/02 20:48:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpasswdserver/kpasswdserver-4.7.3.ebuild,v 1.2 2011/12/04 17:04:39 dilfridge Exp $
 
 EAPI=4
 
@@ -10,3 +10,6 @@ inherit kde4-meta
 DESCRIPTION="KDED Password Module"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
+
+RESTRICT="test"
+# bug 393097
diff --git a/kde-base/kscd/kscd-4.7.3.ebuild b/kde-base/kscd/kscd-4.7.3.ebuild
index 96fa4247ef9b..08d22c7c6649 100644
--- a/kde-base/kscd/kscd-4.7.3.ebuild
+++ b/kde-base/kscd/kscd-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.7.3.ebuild,v 1.1 2011/11/02 20:48:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.7.3.ebuild,v 1.2 2011/12/04 20:57:38 dilfridge Exp $
 
 EAPI=4
 
@@ -19,6 +19,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+RESTRICT="test"
+# bug 393099
+
 KMEXTRACTONLY="
 	libkcompactdisc/
 "
diff --git a/kde-base/ksysguard/ksysguard-4.7.3.ebuild b/kde-base/ksysguard/ksysguard-4.7.3.ebuild
index 8c753093b0d2..14f879e24f41 100644
--- a/kde-base/ksysguard/ksysguard-4.7.3.ebuild
+++ b/kde-base/ksysguard/ksysguard-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.7.3.ebuild,v 1.1 2011/11/02 20:47:59 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-4.7.3.ebuild,v 1.2 2011/12/04 16:06:38 dilfridge Exp $
 
 EAPI=4
 
@@ -24,6 +24,9 @@ DEPEND="${COMMONDEPEND}
 "
 RDEPEND="${COMMONDEPEND}"
 
+RESTRICT="test"
+# bug 393091
+
 KMEXTRA="
 	libs/ksysguard/
 "
diff --git a/kde-base/systemsettings/systemsettings-4.7.3.ebuild b/kde-base/systemsettings/systemsettings-4.7.3.ebuild
index df1b64f1d63b..225c764bdd2a 100644
--- a/kde-base/systemsettings/systemsettings-4.7.3.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.3.ebuild,v 1.1 2011/11/02 20:48:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.3.ebuild,v 1.2 2011/12/04 18:02:50 dilfridge Exp $
 
 EAPI=4
 
@@ -41,6 +41,9 @@ RDEPEND="${COMMONDEPEND}
 	gtk? ( kde-misc/kcm-gtk-config )
 "
 
+RESTRICT="test"
+# bug 393133
+
 KMEXTRA="
 	kcontrol/
 "
diff --git a/mail-client/mutt/mutt-1.5.21-r7.ebuild b/mail-client/mutt/mutt-1.5.21-r7.ebuild
index 39d5d3212c96..2f504a56ec87 100644
--- a/mail-client/mutt/mutt-1.5.21-r7.ebuild
+++ b/mail-client/mutt/mutt-1.5.21-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r7.ebuild,v 1.1 2011/08/26 18:04:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r7.ebuild,v 1.2 2011/12/04 21:05:40 grobian Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.mutt.org/"
 SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
 	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
 	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl selinux sidebar smime smtp ssl tokyocabinet"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -42,8 +42,9 @@ RDEPEND=">=sys-libs/ncurses-5.2
 		sasl?    ( >=dev-libs/cyrus-sasl-2 )
 	)
 	idn?     ( net-dns/libidn )
-	gpg?   ( >=app-crypt/gpgme-0.9.0 )
+	gpg?     ( >=app-crypt/gpgme-0.9.0 )
 	smime?   ( >=dev-libs/openssl-0.9.6 )
+	selinux? ( sec-policy/selinux-mutt )
 	app-misc/mime-types"
 DEPEND="${RDEPEND}
 	net-mail/mailbase
diff --git a/media-gfx/mypaint/mypaint-1.0.0.ebuild b/media-gfx/mypaint/mypaint-1.0.0.ebuild
index 0bcbbe7e2546..c845ba25671a 100644
--- a/media-gfx/mypaint/mypaint-1.0.0.ebuild
+++ b/media-gfx/mypaint/mypaint-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mypaint/mypaint-1.0.0.ebuild,v 1.1 2011/12/04 10:13:41 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mypaint/mypaint-1.0.0.ebuild,v 1.2 2011/12/04 21:19:59 hwoarang Exp $
 
 EAPI=2
 
@@ -23,7 +23,8 @@ RDEPEND="dev-python/pygtk
 	dev-libs/protobuf[python]"
 DEPEND="${RDEPEND}
 	>=dev-util/scons-1.0
-	dev-lang/swig"
+	dev-lang/swig
+	dev-util/pkgconfig"
 
 src_prepare() {
 	# multilib support
diff --git a/media-libs/libpng/libpng-1.5.6.ebuild b/media-libs/libpng/libpng-1.5.6.ebuild
index 6062b0d9c717..aa901f14a141 100644
--- a/media-libs/libpng/libpng-1.5.6.ebuild
+++ b/media-libs/libpng/libpng-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.6.ebuild,v 1.3 2011/11/30 03:57:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.6.ebuild,v 1.4 2011/12/04 17:51:38 armin76 Exp $
 
 # WARNING: media-gfx/optipng is shipping internal copy of libpng14. Look out for
 # security.
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng static-libs"
 
 RDEPEND="sys-libs/zlib"
diff --git a/media-libs/libvisio/libvisio-0.0.11.ebuild b/media-libs/libvisio/libvisio-0.0.11.ebuild
index ec7b9c89cbff..342f1bb18f0b 100644
--- a/media-libs/libvisio/libvisio-0.0.11.ebuild
+++ b/media-libs/libvisio/libvisio-0.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.11.ebuild,v 1.2 2011/11/30 12:38:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.11.ebuild,v 1.3 2011/12/04 15:59:31 scarabeus Exp $
 
 EAPI=4
 
@@ -23,6 +23,7 @@ RDEPEND="
 	app-text/libwpg:0.2
 "
 DEPEND="${DEPEND}
+	dev-util/pkgconfig
 	sys-devel/libtool
 	doc? ( app-doc/doxygen )
 "
diff --git a/media-libs/libvisio/libvisio-0.0.8.ebuild b/media-libs/libvisio/libvisio-0.0.8.ebuild
index f4500d7c3380..19919ad54bd9 100644
--- a/media-libs/libvisio/libvisio-0.0.8.ebuild
+++ b/media-libs/libvisio/libvisio-0.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.8.ebuild,v 1.2 2011/10/26 15:34:25 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.8.ebuild,v 1.3 2011/12/04 15:59:31 scarabeus Exp $
 
 EAPI=4
 
@@ -23,6 +23,7 @@ RDEPEND="
 	app-text/libwpg:0.2
 "
 DEPEND="${DEPEND}
+	dev-util/pkgconfig
 	sys-devel/libtool
 	doc? ( app-doc/doxygen )
 "
diff --git a/media-libs/libvisio/libvisio-9999.ebuild b/media-libs/libvisio/libvisio-9999.ebuild
index 4a134d6bfcd0..7c920a19c279 100644
--- a/media-libs/libvisio/libvisio-9999.ebuild
+++ b/media-libs/libvisio/libvisio-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-9999.ebuild,v 1.4 2011/08/20 14:25:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-9999.ebuild,v 1.5 2011/12/04 15:59:31 scarabeus Exp $
 
 EAPI=4
 
@@ -23,6 +23,7 @@ RDEPEND="
 	app-text/libwpg:0.2
 "
 DEPEND="${DEPEND}
+	dev-util/pkgconfig
 	sys-devel/libtool
 	doc? ( app-doc/doxygen )
 "
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 0dbec08a5795..e4ab9bd188a3 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,2 +1,3 @@
 DIST netpbm-10.51.00-libpng-1.5.patch.bz2 8120 RMD160 49ee4fe57f170ffc1fb5470440dc840f0fb5387e SHA1 a6f0c2e37a5cb051e3c9275918c7e5b34c396aa9 SHA256 260a5f0e9834e7e1aa5c2dcc292695aa43b5aa198af1cb33e5705f7cac10da7b
 DIST netpbm-10.51.00.tar.xz 1834148 RMD160 71593d33e102de72230fbc306165ecc67bbb4c4f SHA1 ae5f9393ebcc75b0914f40c93a837de98a0a71c8 SHA256 6d7bb30d1d0e7f6a23b55c6f03bbb20b539909ad84281dc944b1072656dc1d0e
+DIST netpbm-10.56.00.tar.xz 1881348 RMD160 b8eb01b9db2a91919319627335a9fc92dd5e5dad SHA1 6b1b9f8926ea7c4bc739255cf0c1d39f7751a169 SHA256 2169916c7c03bea90449f87b911a97f961565aa2b0123ab9f72b70d9429b172f
diff --git a/media-libs/netpbm/files/make-tarball.sh b/media-libs/netpbm/files/make-tarball.sh
new file mode 100755
index 000000000000..176f7b74ebe6
--- /dev/null
+++ b/media-libs/netpbm/files/make-tarball.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+. /etc/init.d/functions.sh
+
+if [[ $# -eq 0 || $# -gt 2 ]] ; then
+	exec echo "Usage: $0 <version> [netpbm svn root]"
+fi
+
+PN=netpbm
+PV=$1
+P=${PN}-${PV}
+
+SVN_ROOT=${2:-/usr/local/src}
+
+T=/tmp
+
+maint_pkg_create() {
+	local base="/usr/local/src"
+	local srcdir="${base}/netpbm/release_number"
+	if [[ -d ${srcdir} ]] ; then
+		cd "${T}" || die
+
+		rm -rf ${P}
+
+		ebegin "Exporting ${srcdir}/${PV} to ${P}"
+		svn export -q ${srcdir}/${PV} ${P}
+		eend $? || return 1
+
+		ebegin "Creating ${P}.tar.xz"
+		tar cf - ${P} | xz > ${P}.tar.xz
+		eend $?
+
+		einfo "Tarball now ready at: ${T}/${P}.tar.xz"
+	else
+		einfo "You need to run:"
+		einfo " cd ${base}"
+		einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm"
+		die "need svn checkout dir"
+	fi
+}
+maint_pkg_create
diff --git a/media-libs/netpbm/files/netpbm-10.56.00-alloca.patch b/media-libs/netpbm/files/netpbm-10.56.00-alloca.patch
new file mode 100644
index 000000000000..218b1e769c50
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.56.00-alloca.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/341565
+
+--- a/editor/specialty/pampaintspill.c
++++ b/editor/specialty/pampaintspill.c
+@@ -42,7 +42,6 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <math.h>
+-#include <alloca.h>
+ #include <time.h>
+ 
+ #include "mallocvar.h"
diff --git a/media-libs/netpbm/netpbm-10.56.00.ebuild b/media-libs/netpbm/netpbm-10.56.00.ebuild
new file mode 100644
index 000000000000..e942cbd6a694
--- /dev/null
+++ b/media-libs/netpbm/netpbm-10.56.00.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.56.00.ebuild,v 1.1 2011/12/05 00:03:07 vapier Exp $
+
+EAPI="3"
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="http://netpbm.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib"
+
+RDEPEND="jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	png? ( >=media-libs/libpng-1.4:0 )
+	rle? ( media-libs/urt )
+	svga? ( media-libs/svgalib )
+	tiff? ( >=media-libs/tiff-3.5.5:0 )
+	xml? ( dev-libs/libxml2 )
+	zlib? ( sys-libs/zlib )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex"
+
+netpbm_libtype() {
+	case ${CHOST} in
+		*-darwin*) echo dylib;;
+		*)         echo unixshared;;
+	esac
+}
+netpbm_libsuffix() {
+	local suffix=$(get_libname)
+	echo ${suffix//\.}
+}
+netpbm_ldshlib() {
+	case ${CHOST} in
+		*-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
+		*)         echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
+	esac
+}
+netpbm_config() {
+	if use $1 ; then
+		[[ $2 != "!" ]] && echo -l${2:-$1}
+	else
+		echo NONE
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/netpbm-10.31-build.patch
+	epatch "${FILESDIR}"/netpbm-10.56.00-alloca.patch #341565
+
+	# make sure we use system urt
+	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
+	rm -rf urt
+
+	# take care of the importinc stuff ourselves by only doing it once
+	# at the top level and having all subdirs use that one set #149843
+	sed -i \
+		-e '/^importinc:/s|^|importinc:\nmanual_|' \
+		-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
+		common.mk || die
+	sed -i \
+		-e '/%.c/s: importinc$::' \
+		common.mk lib/Makefile lib/util/Makefile || die
+
+	# avoid ugly depend.mk warnings
+	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
+}
+
+src_configure() {
+	cat config.mk.in - >> config.mk <<-EOF
+	# Misc crap
+	BUILD_FIASCO = N
+	SYMLINK = ln -sf
+
+	# Toolchain options
+	CC = $(tc-getCC) -Wall
+	LD = \$(CC)
+	CC_FOR_BUILD = $(tc-getBUILD_CC)
+	LD_FOR_BUILD = \$(CC_FOR_BUILD)
+	AR = $(tc-getAR)
+	RANLIB = $(tc-getRANLIB)
+
+	STRIPFLAG =
+	CFLAGS_SHLIB = -fPIC
+
+	LDRELOC = \$(LD) -r
+	LDSHLIB = $(netpbm_ldshlib)
+	LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
+	LINKERISCOMPILER = Y
+	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
+	NETPBMLIBTYPE = $(netpbm_libtype)
+
+	# Gentoo build options
+	TIFFLIB = $(netpbm_config tiff)
+	JPEGLIB = $(netpbm_config jpeg)
+	PNGLIB = $(netpbm_config png)
+	ZLIB = $(netpbm_config zlib z)
+	LINUXSVGALIB = $(netpbm_config svga vga)
+	XML2_LIBS = $(netpbm_config xml xml2)
+	JBIGLIB = -ljbig
+	JBIGHDR_DIR = $(netpbm_config jbig "!")
+	JASPERLIB = -ljasper
+	JASPERHDR_DIR = $(netpbm_config jpeg2k "!")
+	URTLIB = $(netpbm_config rle)
+	URTHDR_DIR =
+	X11LIB = $(netpbm_config X X11)
+	X11HDR_DIR =
+	EOF
+	# cannot chain the die with the heredoc above as bash-3
+	# has a parser bug in that setup #282902
+	[ $? -eq 0 ] || die "writing config.mk failed"
+}
+
+src_compile() {
+	emake -j1 pm_config.h version.h manual_importinc || die #149843
+	emake || die
+}
+
+src_install() {
+	# Subdir make targets like to use `mkdir` all over the place
+	# without any actual dependencies, thus the -j1.
+	emake -j1 package pkgdir="${D}"/usr || die
+
+	[[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
+
+	# Remove cruft that we don't need, and move around stuff we want
+	rm "${D}"/usr/bin/{doc.url,manweb} || die
+	rm -r "${D}"/usr/man/web || die
+	rm -r "${D}"/usr/link || die
+	rm "${D}"/usr/{README,VERSION,config_template,pkginfo} || die
+	dodir /usr/share
+	mv "${D}"/usr/man "${D}"/usr/share/ || die
+	mv "${D}"/usr/misc "${D}"/usr/share/netpbm || die
+
+	dodoc README
+	cd doc
+	dodoc HISTORY Netpbm.programming USERDOC
+	dohtml -r .
+}
diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest
index 93b00195ccc2..61e9ab7938fc 100644
--- a/media-libs/sdl-gfx/Manifest
+++ b/media-libs/sdl-gfx/Manifest
@@ -1 +1,2 @@
 DIST SDL_gfx-2.0.22.tar.gz 1670662 RMD160 96213169e126ea3d54e10d5b7339426df9d0cc61 SHA1 6d384d8dbf7fe56e4dfef1aaa06a106f62ef91d1 SHA256 1575e7be73fd927ff0e3567dc06095773f5ba1b47872b9aa0d0fefebfd6d2bf0
+DIST SDL_gfx-2.0.23.tar.gz 1707852 RMD160 e793cf8fea390561513e2e743e644abc11bb3f36 SHA1 aae60e7fed539f3f8a0a0bd6da3bbcf625642596 SHA256 41bd601d65bba19eeac80a62570ce120098414ece22de402a8ee81b10e07faea
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.23.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.23.ebuild
new file mode 100644
index 000000000000..d1f15b115b2f
--- /dev/null
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.23.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-gfx/sdl-gfx-2.0.23.ebuild,v 1.1 2011/12/04 23:42:23 mr_bones_ Exp $
+
+EAPI=2
+inherit autotools multilib
+
+MY_P="${P/sdl-/SDL_}"
+DESCRIPTION="Graphics drawing primitives library for SDL"
+HOMEPAGE="http://www.ferzkopp.net/joomla/content/view/19/14/"
+SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc mmx static-libs"
+
+DEPEND="media-libs/libsdl[video]"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i -e 's/-O //' configure.in || die "sed failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable mmx) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README
+	use doc && dohtml -r Docs/*
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
+}
diff --git a/media-libs/taglib/taglib-1.7.ebuild b/media-libs/taglib/taglib-1.7.ebuild
index f3294882f3c2..83edf4eacbd9 100644
--- a/media-libs/taglib/taglib-1.7.ebuild
+++ b/media-libs/taglib/taglib-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.7.ebuild,v 1.3 2011/11/29 15:34:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.7.ebuild,v 1.4 2011/12/04 16:03:05 armin76 Exp $
 
 EAPI=4
 inherit cmake-utils
@@ -10,7 +10,7 @@ HOMEPAGE="http://developer.kde.org/~wheeler/taglib.html"
 SRC_URI="http://developer.kde.org/~wheeler/files/src/${P}.tar.gz"
 
 LICENSE="LGPL-2 MPL-1.1"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 SLOT="0"
 IUSE="+asf debug examples +mp4 test"
 
diff --git a/media-sound/aacplusenc/Manifest b/media-sound/aacplusenc/Manifest
index 79712aa5709a..89b6e9b3733a 100644
--- a/media-sound/aacplusenc/Manifest
+++ b/media-sound/aacplusenc/Manifest
@@ -1,2 +1 @@
-DIST aacplusenc-0.17.1.tar.bz2 175606 RMD160 9c60013d5f6a24c1821575b69a85c8870c00a55f SHA1 47a88050adb254dd8d4fe7fc3e2585f939aa3869 SHA256 e9740f3e158ed247eb7ea8f3b2dcd3e523b05b9d138cf62232d70ec52f4ba8da
 DIST aacplusenc_0.17.5.tar.gz 547953 RMD160 c59efc3a3f8126b4650b304a043f176b80078d82 SHA1 1f862538c6f3ead4c5440d2649ecff4645c32a07 SHA256 318df58a86ac0647d6bfbcd8766fe301ad2ed08ffb4ef4e016e088f4dceb1669
diff --git a/media-sound/aacplusenc/aacplusenc-0.17.1.ebuild b/media-sound/aacplusenc/aacplusenc-0.17.1.ebuild
deleted file mode 100644
index 8c646d4e4466..000000000000
--- a/media-sound/aacplusenc/aacplusenc-0.17.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/aacplusenc-0.17.1.ebuild,v 1.3 2009/07/22 19:54:56 ssuominen Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="High-Efficiency AAC (AAC+) Encoder"
-HOMEPAGE="http://teknoraver.net/software/mp4tools/"
-SRC_URI="http://teknoraver.net/software/mp4tools/${P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sci-libs/fftw:3.0"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-# 3GPP patenting issues
-RESTRICT="mirror"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	sed \
-		-e 's:LDFLAGS:LIBRARIES:g' \
-		-e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \
-		-e 's:ar r:$(AR) r:g' \
-		-e 's:strip:true:' \
-		-e 's:-O3 -ftree-vectorize::' \
-		-i configure Makefile lib*/Makefile || die "sed failed"
-}
-
-src_configure() {
-	tc-export AR CC
-	./configure || die "./configure failed"
-}
-
-src_compile() {
-	emake EXTRACFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake INSTDIR="${D}/usr" install || die "emake install failed"
-	doman ${PN}.1
-	dodoc CHANGELOG
-}
diff --git a/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild b/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
index 76bbe2e8adac..ff4eb7b9f590 100644
--- a/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
+++ b/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild,v 1.1 2011/06/27 06:50:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild,v 1.2 2011/12/04 22:53:46 radhermit Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -25,6 +25,10 @@ S=${WORKDIR}/${PN}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-asneeded.patch
+
+	# Fix linking order (bug #393137)
+	epatch "${FILESDIR}"/${P}-libm.patch
+
 	sed \
 		-e 's:LDFLAGS:LIBRARIES:g' \
 		-e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \
diff --git a/media-sound/aacplusenc/files/aacplusenc-0.17.1-asneeded.patch b/media-sound/aacplusenc/files/aacplusenc-0.17.1-asneeded.patch
deleted file mode 100644
index 7db77f840d3c..000000000000
--- a/media-sound/aacplusenc/files/aacplusenc-0.17.1-asneeded.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ur aacplusenc-0.17.1.orig/configure aacplusenc-0.17.1/configure
---- aacplusenc-0.17.1.orig/configure	2008-02-14 18:28:24.000000000 +0200
-+++ aacplusenc-0.17.1/configure	2009-07-22 22:52:16.000000000 +0300
-@@ -8,7 +8,7 @@
- 
- echo -n 'Checking for libfftw3f...'
- 
--gcc -o test-fft -Wall -x c -lfftw3f -I/usr/local/include -L/usr/local/lib - <<'EOF'
-+cat >test-fft.c <<'EOF'
- #include <fftw3.h>
- 
- #define N 128
-@@ -29,6 +29,8 @@
- }
- EOF
- 
-+${CC} ${LDFLAGS} ${CFLAGS} -Wall -x c test-fft.c -lfftw3f -o test-fft -I/usr/local/include -L/usr/local/lib
-+
- if ./test-fft
- then
- 	echo OK
-@@ -38,7 +40,7 @@
- 
- echo -n 'Detecting endianness...'
- 
--gcc -o test-endian -Wall -x c - <<'EOF'
-+${CC} ${LDFLAGS} ${CFLAGS} -o test-endian -Wall -x c - <<'EOF'
- #include <stdint.h>
- #include <stdio.h>
- 
-@@ -76,4 +78,4 @@
- 
- echo '#endif' >> config.h
- 
--echo 'Now run make'
-\ No newline at end of file
-+echo 'Now run make'
diff --git a/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch b/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch
new file mode 100644
index 000000000000..37a3f904fea3
--- /dev/null
+++ b/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch
@@ -0,0 +1,13 @@
+--- aacplusenc/Makefile.orig
++++ aacplusenc/Makefile
+@@ -5,9 +5,8 @@
+ LIBS=libaacenc/libaacenc.a libbitbuf/libbitbuf.a libfr/libfr.a libsbrenc/libsbrenc.a libresamp/libresamp.a
+ TARGET=aacplusenc
+ 
+-LDFLAGS=-lm
+ LDFLAGS+=-L$(TOPDIR)/libaacenc -L$(TOPDIR)/libbitbuf -L$(TOPDIR)/libfr -L$(TOPDIR)/libsbrenc -L$(TOPDIR)/libresamp
+-LDFLAGS+=-laacenc -lbitbuf -lfr -lsbrenc -lresamp
++LDFLAGS+=-laacenc -lbitbuf -lfr -lsbrenc -lresamp -lm
+ 
+ ifdef FFTW3
+ 	LDFLAGS+=-lfftw3f
diff --git a/media-sound/gnomad/Manifest b/media-sound/gnomad/Manifest
index a583323a4788..624230ccdad3 100644
--- a/media-sound/gnomad/Manifest
+++ b/media-sound/gnomad/Manifest
@@ -1,2 +1 @@
-DIST gnomad2-2.9.4.tar.gz 347481 RMD160 ff884acb2425f84541b8a7ee2e86403d2509149a SHA1 51d8d89c2960a36084fc6dd007fe652224b57ce5 SHA256 7dc696b50b9bb5fcbddf67988096a989212a4f6c6a728a5b491f06c64569e380
 DIST gnomad2-2.9.6.tar.gz 318431 RMD160 8e59d0d84144eb184df5023917fc6641cc0d57c3 SHA1 5e9f6fadb6dc469c58f852c96f1904a2f4fc4590 SHA256 74d423f4df1e71933ae31eb66724bed8027d7c4ca174a0221f6a1499e3735c9a
diff --git a/media-sound/gnomad/files/gnomad-2.9.4-fix-gtk-widget-destroy.diff b/media-sound/gnomad/files/gnomad-2.9.4-fix-gtk-widget-destroy.diff
deleted file mode 100644
index 2e3369b1e705..000000000000
--- a/media-sound/gnomad/files/gnomad-2.9.4-fix-gtk-widget-destroy.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/filesystem.c.orig	2009-01-22 17:29:16.000000000 -0500
-+++ src/filesystem.c	2010-12-22 16:00:44.000000000 -0500
-@@ -633,6 +633,10 @@
-   return metalist;
- }
- 
-+void my_gtk_widget_destroy(GtkWidget *widget) {
-+ if (GTK_IS_WIDGET(widget)) gtk_widget_destroy(widget);
-+}
-+
- static gpointer dirfill_thread(gpointer thread_args)
- {
-   dirfill_thread_arg_t *args = (dirfill_thread_arg_t *) thread_args;
-@@ -653,7 +657,7 @@
-   metarg->metalist = metalist;
-   g_idle_add(update_metadata,metarg);
- 
--  g_idle_add((GSourceFunc) gtk_widget_destroy, args->dialog);
-+  g_idle_add((GSourceFunc) my_gtk_widget_destroy, args->dialog);
-   g_free(args->path);
-   g_free(args);
-   return NULL;
diff --git a/media-sound/gnomad/gnomad-2.9.4-r2.ebuild b/media-sound/gnomad/gnomad-2.9.4-r2.ebuild
deleted file mode 100644
index 2c5f4fbb0ee6..000000000000
--- a/media-sound/gnomad/gnomad-2.9.4-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomad/gnomad-2.9.4-r2.ebuild,v 1.3 2011/03/27 13:17:18 ssuominen Exp $
-
-EAPI=2
-GCONF_DEBUG=no
-inherit flag-o-matic gnome2
-
-MY_P=${PN}2-${PV}
-
-DESCRIPTION="A GNOME2 frontend for Creative Players (Zen, JukeBox, etc ...)"
-HOMEPAGE="http://gnomad2.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}2/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/dbus-glib-0.88
-	>=x11-libs/gtk+-2.6:2
-	media-libs/libnjb
-	media-libs/libmtp
-	>=media-libs/taglib-1.5
-	>=media-libs/libid3tag-0.15.1b"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext
-		dev-util/intltool )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-gtk-widget-destroy.diff
-	# Disable sys-apps/hal
-	sed -i -e '/PKG_CONFIG/s:hal:dIsAbLe&:' configure || die
-}
-
-pkg_setup() {
-	G2CONF+=" $(use_enable nls)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_configure() {
-	strip-flags
-	replace-flags -O3 -O2
-	gnome2_src_configure
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.5.8.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.5.8.ebuild
index a31238f03131..7d54fb4bf424 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.5.8.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.5.8.ebuild,v 1.3 2011/12/03 20:12:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpcpp/ncmpcpp-0.5.8.ebuild,v 1.4 2011/12/04 22:09:54 maekke Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="http://unkart.ovh.org/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 IUSE="bash-completion clock curl fftw iconv outputs taglib unicode visualizer"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 arm hppa ~ppc ~sparc ~x86"
 
 RDEPEND="
 	sys-libs/ncurses[unicode?]
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 93521553462d..b97fc43a9927 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,4 +1,2 @@
-DIST rosegarden-10.04.tar.bz2 5926499 RMD160 8a5406ec5ab0a08701748a8261410018790ec65b SHA1 dd81e94ddf43464b0f04ee421a88ae08d0a49f5a SHA256 ee48f59c32d2773413a2450607db4a89b3b4437b3c2d7f166a6997306650cfdf
 DIST rosegarden-11.02.tar.bz2 5818771 RMD160 497cd725c5c8cd1d986fad9eb88bb448d3085819 SHA1 d6f506237ae2bda2b9792e8dabcdf9c560583571 SHA256 d9aee73936c2bf5efb0dc184a8c54089bc012e8c0b7a68fd2526ef9f67098193
-DIST rosegarden-11.06.tar.bz2 5604028 RMD160 455c30f5562d216c902cd08dcfe18442edef14bf SHA1 64b16a74b73e2de4fc4e987a43f6a613b199e1db SHA256 e1e5ebf2eb0e43090670352d0394f96dcba691547d2119e4d1c6fd9c9bbf2b3e
-DIST rosegarden-11.11.tar.bz2 5819445 RMD160 2b55c93f39db2f1361d2335e1f3e8305baf694c4 SHA1 92ed8dcb242968b79b9504b71e594d84efe3946e SHA256 3d4a89060a0d8ea241f7629c3b66857b29027bb269d9e1737064d05007503c9f
+DIST rosegarden-11.11.11.tar.bz2 5826433 RMD160 016d7c87d9a9611451417b435ff55180992b7442 SHA1 e7e2a9252848da3e13a166276d5b61fd18c05b04 SHA256 76f761aaa3449212d45f95031db0a393708340a8d958e59d1c6bf3dc0255fe7f
diff --git a/media-sound/rosegarden/rosegarden-10.04.ebuild b/media-sound/rosegarden/rosegarden-10.04.ebuild
deleted file mode 100644
index 284e95bcdfca..000000000000
--- a/media-sound/rosegarden/rosegarden-10.04.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-10.04.ebuild,v 1.8 2011/05/31 06:43:41 radhermit Exp $
-
-EAPI=2
-inherit autotools fdo-mime multilib
-
-DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="http://www.rosegardenmusic.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug lirc"
-
-RDEPEND="<x11-libs/qt-gui-4.7:4
-	<x11-libs/qt-qt3support-4.7:4
-	media-libs/ladspa-sdk
-	x11-libs/libSM
-	media-sound/jack-audio-connection-kit
-	media-libs/alsa-lib
-	>=media-libs/dssi-1.0.0
-	media-libs/liblo
-	media-libs/liblrdf
-	=sci-libs/fftw-3*
-	media-libs/libsamplerate[sndfile]
-	lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-misc/makedepend"
-
-src_prepare() {
-	if ! use lirc; then
-		sed -i \
-			-e '/AC_CHECK_HEADER/s:lirc_client.h:dIsAbLe&:' \
-			-e '/AC_CHECK_LIB/s:lirc_init:dIsAbLe&:' \
-			configure.ac || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	export USER_CXXFLAGS="${CXXFLAGS}"
-
-	local myconf
-	use debug && myconf="--enable-debug"
-
-	econf \
-		--with-qtdir=/usr \
-		--with-qtlibdir=/usr/$(get_libdir)/qt4 \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS CONTRIBUTING README
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-}
diff --git a/media-sound/rosegarden/rosegarden-11.06.ebuild b/media-sound/rosegarden/rosegarden-11.11.11.ebuild
similarity index 86%
rename from media-sound/rosegarden/rosegarden-11.06.ebuild
rename to media-sound/rosegarden/rosegarden-11.11.11.ebuild
index 4dda51eff2c2..b286224d1213 100644
--- a/media-sound/rosegarden/rosegarden-11.06.ebuild
+++ b/media-sound/rosegarden/rosegarden-11.11.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-11.06.ebuild,v 1.1 2011/05/20 20:14:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-11.11.11.ebuild,v 1.1 2011/12/04 18:52:22 ssuominen Exp $
 
 EAPI=4
-inherit autotools fdo-mime multilib
+inherit autotools fdo-mime gnome2-utils multilib
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="http://www.rosegardenmusic.com/"
@@ -15,7 +15,6 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug lirc"
 
 RDEPEND="x11-libs/qt-gui:4
-	x11-libs/qt-qt3support:4
 	media-libs/ladspa-sdk
 	x11-libs/libSM
 	media-sound/jack-audio-connection-kit
@@ -53,12 +52,18 @@ src_configure() {
 		${myconf}
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
+	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 }
diff --git a/media-sound/rosegarden/rosegarden-11.11.ebuild b/media-sound/rosegarden/rosegarden-11.11.ebuild
deleted file mode 100644
index 56c93393b2b0..000000000000
--- a/media-sound/rosegarden/rosegarden-11.11.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-11.11.ebuild,v 1.1 2011/11/08 21:23:58 radhermit Exp $
-
-EAPI=4
-inherit autotools fdo-mime multilib
-
-DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="http://www.rosegardenmusic.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug lirc"
-
-RDEPEND="x11-libs/qt-gui:4
-	media-libs/ladspa-sdk
-	x11-libs/libSM
-	media-sound/jack-audio-connection-kit
-	media-libs/alsa-lib
-	>=media-libs/dssi-1.0.0
-	media-libs/liblo
-	media-libs/liblrdf
-	sci-libs/fftw:3.0
-	media-libs/libsamplerate[sndfile]
-	lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-misc/makedepend"
-
-src_prepare() {
-	if ! use lirc; then
-		sed -i \
-			-e '/AC_CHECK_HEADER/s:lirc_client.h:dIsAbLe&:' \
-			-e '/AC_CHECK_LIB/s:lirc_init:dIsAbLe&:' \
-			configure.ac || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	export USER_CXXFLAGS="${CXXFLAGS}"
-
-	local myconf
-	use debug && myconf="--enable-debug"
-
-	econf \
-		--with-qtdir=/usr \
-		--with-qtlibdir=/usr/$(get_libdir)/qt4 \
-		${myconf}
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-sound/squeezeslave/Manifest b/media-sound/squeezeslave/Manifest
index 3646d681b538..d795666df6fc 100644
--- a/media-sound/squeezeslave/Manifest
+++ b/media-sound/squeezeslave/Manifest
@@ -1,2 +1,2 @@
-DIST squeezeslave-1.1_p262.tar.xz 104224 RMD160 6518dba4bb366b11ed80fd0ef703b4c790fa187c SHA1 5096010912015819dfaedfb497f1f6733084c098 SHA256 6dcb70731359ae35a57b994dc944617dc222222488bbad1cd8e9fbc2114eec5b
 DIST squeezeslave-1.1_p286.tar.xz 110276 RMD160 40d659a63a64daab9433ffb1b7da782dc1116307 SHA1 accde6037322515e7effca9080d6ea488b203802 SHA256 55c9d3935992e888992b4b66db917a8a5dd86297b72c8e61169c64e9e270f965
+DIST squeezeslave-1.1_p309.tar.xz 115040 RMD160 2362e93999921cea6b1f3d304d17a5da5c4920fe SHA1 6c99e62ea761421d0f2c1542f97eaf8c93bd9d60 SHA256 8de690eb6080db3409bd6ffa641b8367679f3cac04710526cf4563f002999f67
diff --git a/media-sound/squeezeslave/files/squeezeslave-1.1_p309-ffmpeg.patch b/media-sound/squeezeslave/files/squeezeslave-1.1_p309-ffmpeg.patch
new file mode 100644
index 000000000000..70a88dde4348
--- /dev/null
+++ b/media-sound/squeezeslave/files/squeezeslave-1.1_p309-ffmpeg.patch
@@ -0,0 +1,95 @@
+--- squeezeslave-1.1_p309/src/slimaudio/slimaudio_decoder_aac.c.orig
++++ squeezeslave-1.1_p309/src/slimaudio/slimaudio_decoder_aac.c
+@@ -28,6 +28,10 @@
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+ 
++#ifndef CODEC_TYPE_AUDIO
++#define CODEC_TYPE_AUDIO	AVMEDIA_TYPE_AUDIO
++#endif
++
+ #include "slimproto/slimproto.h"
+ #include "slimaudio/slimaudio.h"
+ 
+@@ -96,11 +100,6 @@
+ }
+ 
+ int slimaudio_decoder_aac_process(slimaudio_t *audio) {
+-//	unsigned char data[AUDIO_CHUNK_SIZE];
+-//	int buffer[AUDIO_CHUNK_SIZE/2];
+-//	int i;
+-	
+-//	unsigned char *ptr = data;
+ 	char streamformat[16];
+ 	int out_size;
+ 	int len = 0;
+@@ -148,18 +147,6 @@
+ 
+ 	DEBUGF ("aac: play audioStream: %d\n", audioStream);
+ 
+-	AVInputFormat* pAVInputFormat = av_find_input_format(streamformat);
+-	if( !pAVInputFormat )
+-	{
+-		DEBUGF("aac: probe failed\n");
+-		return -1;
+-	}
+-	else
+-	{
+-		DEBUGF("aac: probe ok name:%s lname:%s\n", pAVInputFormat->name, pAVInputFormat->long_name);
+-		pAVInputFormat->flags |= AVFMT_NOFILE;
+-	}
+-
+ 	inbuf = av_malloc(AUDIO_INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
+ 	if ( !inbuf )
+ 	{
+@@ -167,23 +154,35 @@
+ 		return -1;
+ 	}
+ 
+-	ByteIOContext ByteIOCtx;
++	AVIOContext *AVIOCtx;
+ 
+-	iRC = init_put_byte( &ByteIOCtx, inbuf, AUDIO_CHUNK_SIZE, 0, audio, av_read_data, NULL, NULL ) ;
+-	if( iRC < 0)
++	AVIOCtx = avio_alloc_context(inbuf, AUDIO_CHUNK_SIZE, 0, audio, av_read_data, NULL, NULL);
++	if ( AVIOCtx == NULL )
+ 	{
+-		DEBUGF("aac: init_put_byte failed:%d\n", iRC);
++		DEBUGF("aac: avio_alloc_context failed.\n");
+ 		return -1;
+ 	}
+ 	else
+ 	{
+-		ByteIOCtx.is_streamed = 1;
++		AVIOCtx->is_streamed = 1;
++	}
++
++	AVInputFormat* pAVInputFormat = av_find_input_format(streamformat);
++	if( !pAVInputFormat )
++	{
++		DEBUGF("aac: probe failed\n");
++		return -1;
++	}
++	else
++	{
++		DEBUGF("aac: probe ok name:%s lname:%s\n", pAVInputFormat->name, pAVInputFormat->long_name);
++		pAVInputFormat->flags |= AVFMT_NOFILE;
+ 	}
+ 
+ 	AVFormatContext* pFormatCtx;
+ 	AVCodecContext *pCodecCtx;
+ 
+-	iRC = av_open_input_stream(&pFormatCtx, &ByteIOCtx, "", pAVInputFormat, NULL);
++	iRC = av_open_input_stream(&pFormatCtx, AVIOCtx, "", pAVInputFormat, NULL);
+ 
+ 	if (iRC < 0)
+ 	{
+@@ -261,7 +260,7 @@
+ 				eos=true;
+ 			}
+ 
+-			if ( url_feof(pFormatCtx->pb) )
++			if ( pFormatCtx->pb->eof_reached )
+ 			{
+ 				DEBUGF("aac: url_feof\n");
+ 				eos=true;
diff --git a/media-sound/squeezeslave/files/squeezeslave.initd b/media-sound/squeezeslave/files/squeezeslave.initd
index ea9f1f755f7a..efa5c140dbff 100644
--- a/media-sound/squeezeslave/files/squeezeslave.initd
+++ b/media-sound/squeezeslave/files/squeezeslave.initd
@@ -1,23 +1,14 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/files/squeezeslave.initd,v 1.1 2011/08/09 08:01:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/files/squeezeslave.initd,v 1.2 2011/12/04 22:18:43 radhermit Exp $
+
+command="/usr/bin/${SVCNAME}"
+command_args="--daemonize ${SS_LOG} --mac ${SS_MAC} --retry ${SBS_HOST} ${SS_OPTS}"
+pidfile="/var/run/${SVCNAME}.pid"
+start_stop_daemon_args="--background --quiet --make-pidfile"
 
 depend() {
 	need net
 	use squeezeboxserver
 }
-
-start() {
-	ebegin "Starting squeezeslave"
-	start-stop-daemon --start --quiet --background --pidfile /var/run/squeezeslave.pid \
-		--make-pidfile --exec /usr/bin/squeezeslave -- \
-		--daemonize "${SS_LOG}" --mac ${SS_MAC} --retry ${SBS_HOST} ${SS_OPTS}
-	eend $? "Failed to start squeezeslave"
-}
-
-stop() {
-	ebegin "Stopping squeezeslave"
-	start-stop-daemon --stop --pid /var/run/squeezeslave.pid
-	eend $? "Failed to stop squeezeslave"
-}
diff --git a/media-sound/squeezeslave/squeezeslave-1.1_p262.ebuild b/media-sound/squeezeslave/squeezeslave-1.1_p309.ebuild
similarity index 78%
rename from media-sound/squeezeslave/squeezeslave-1.1_p262.ebuild
rename to media-sound/squeezeslave/squeezeslave-1.1_p309.ebuild
index 58169d809455..f196184c5a34 100644
--- a/media-sound/squeezeslave/squeezeslave-1.1_p262.ebuild
+++ b/media-sound/squeezeslave/squeezeslave-1.1_p309.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/squeezeslave-1.1_p262.ebuild,v 1.1 2011/08/09 08:01:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/squeezeslave-1.1_p309.ebuild,v 1.1 2011/12/04 22:18:43 radhermit Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aac +alsa display wma"
+IUSE="aac +alsa display wma zones"
 
 RDEPEND="media-libs/libmad
 	media-libs/flac
@@ -24,16 +24,17 @@ RDEPEND="media-libs/libmad
 	wma? ( virtual/ffmpeg )
 	display? ( app-misc/lirc )"
 DEPEND="${RDEPEND}
+	app-arch/xz-utils
 	dev-util/pkgconfig"
 
 src_prepare() {
-	! use display && sed -i -e "/display/d" Makefile
-	! use aac && sed -i -e "/AAC/d" Makefile
-	! use wma && sed -i -e "/WMA/d" Makefile
+	for i in display aac wma zones ; do
+		! use $i && sed -i -e "/$i/Id" Makefile
+	done
 
 	epatch "${FILESDIR}"/${P}-ffmpeg.patch
 
-	tc-export CC AR
+	tc-export CC AR RANLIB
 }
 
 src_install() {
diff --git a/metadata/cache/app-accessibility/espeak-1.45.04 b/metadata/cache/app-accessibility/espeak-1.45.04
index bf30f8fa1092..0a6d02c2f30a 100644
--- a/metadata/cache/app-accessibility/espeak-1.45.04
+++ b/metadata/cache/app-accessibility/espeak-1.45.04
@@ -6,7 +6,7 @@ mirror://sourceforge/espeak/espeak-1.45.04-source.zip
 http://espeak.sourceforge.net/
 GPL-3
 Speech synthesizer for English and other languages
-~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
 eutils multilib portability toolchain-funcs user
 portaudio pulseaudio
 portaudio? ( !pulseaudio ) pulseaudio? ( !portaudio )
diff --git a/metadata/cache/app-accessibility/mbrola-3.0.1h-r6 b/metadata/cache/app-accessibility/mbrola-3.0.1h-r6
index 5225ae8fb3f3..73ca4876e446 100644
--- a/metadata/cache/app-accessibility/mbrola-3.0.1h-r6
+++ b/metadata/cache/app-accessibility/mbrola-3.0.1h-r6
@@ -6,7 +6,7 @@ strip
 http://tcts.fpms.ac.be/synthesis/mbrola.html
 MBROLA
 Speech synthesizer based on the concatenation of diphones. Includes sample voices.
-~alpha ~amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+alpha ~amd64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd
 
 linguas_de linguas_es linguas_fr linguas_it linguas_la linguas_pl linguas_ro linguas_sv
 
diff --git a/metadata/cache/app-admin/puppet-2.6.11 b/metadata/cache/app-admin/puppet-2.6.11
deleted file mode 100644
index d8fcb6e0f8bc..000000000000
--- a/metadata/cache/app-admin/puppet-2.6.11
+++ /dev/null
@@ -1,22 +0,0 @@
-test? ( ruby_targets_ruby18? ( >=dev-ruby/facter-1.5.1[ruby_targets_ruby18] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby18] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby18] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby18] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby18] ) sqlite3? ( dev-ruby/sqlite3-ruby[ruby_targets_ruby18] ) virtual/ruby-ssl[ruby_targets_ruby18] ) ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
-ruby_targets_ruby18? ( >=dev-ruby/facter-1.5.1[ruby_targets_ruby18] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby18] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby18] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby18] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby18] ) sqlite3? ( dev-ruby/sqlite3-ruby[ruby_targets_ruby18] ) virtual/ruby-ssl[ruby_targets_ruby18] ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] ) >=app-portage/eix-0.18.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
-0
-mirror://rubygems/puppet-2.6.11.gem
-
-http://puppetlabs.com/
-GPL-2
-A system automation and configuration management software
-amd64 hppa ppc sparc x86
-elisp-common eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator xemacs-elisp-common
-augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby18 test test
-
-
-
-3
-
-compile configure install postinst postrm prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-admin/puppet-2.7.5 b/metadata/cache/app-admin/puppet-2.7.6-r1
similarity index 89%
rename from metadata/cache/app-admin/puppet-2.7.5
rename to metadata/cache/app-admin/puppet-2.7.6-r1
index 74447c71db00..64a086658f21 100644
--- a/metadata/cache/app-admin/puppet-2.7.5
+++ b/metadata/cache/app-admin/puppet-2.7.6-r1
@@ -1,18 +1,18 @@
 test? ( ruby_targets_ruby18? ( >=dev-ruby/facter-1.5.1[ruby_targets_ruby18] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby18] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby18] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby18] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby18] ) sqlite3? ( dev-ruby/sqlite3-ruby[ruby_targets_ruby18] ) virtual/ruby-ssl[ruby_targets_ruby18] ) ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) )
 ruby_targets_ruby18? ( >=dev-ruby/facter-1.5.1[ruby_targets_ruby18] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby18] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby18] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby18] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby18] ) sqlite3? ( dev-ruby/sqlite3-ruby[ruby_targets_ruby18] ) virtual/ruby-ssl[ruby_targets_ruby18] ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] ) >=app-portage/eix-0.18.0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] )
 0
-mirror://rubygems/puppet-2.7.5.gem
+mirror://rubygems/puppet-2.7.6.gem
 
 http://puppetlabs.com/
 Apache-2.0
 A system automation and configuration management software
 ~amd64 ~hppa ~ppc ~sparc ~x86
 elisp-common eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator xemacs-elisp-common
-augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby18 test test
+augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby18 test test
+|| ( ruby_targets_ruby18 )
 
 
-
-3
+4
 
 compile configure install postinst postrm prepare setup test unpack
 
diff --git a/metadata/cache/app-emacs/browse-kill-ring-1.3c b/metadata/cache/app-emacs/browse-kill-ring-1.3c
new file mode 100644
index 000000000000..aa6083991951
--- /dev/null
+++ b/metadata/cache/app-emacs/browse-kill-ring-1.3c
@@ -0,0 +1,22 @@
+>=virtual/emacs-21
+>=virtual/emacs-21
+0
+mirror://gentoo/browse-kill-ring-1.3c.el.bz2
+
+http://www.emacswiki.org/emacs/BrowseKillRing https://github.com/T-J-Teru/browse-kill-ring
+GPL-2
+An improved interface to kill-ring
+~amd64 ~x86
+elisp elisp-common eutils multilib portability toolchain-funcs user
+
+
+
+
+4
+
+compile configure install postinst postrm prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/app-emacs/python-mode-5.2.0 b/metadata/cache/app-emacs/python-mode-5.2.0
index 9b62c462ac36..bee3c76748ad 100644
--- a/metadata/cache/app-emacs/python-mode-5.2.0
+++ b/metadata/cache/app-emacs/python-mode-5.2.0
@@ -6,7 +6,7 @@ http://launchpad.net/python-mode/trunk/5.2.0/+download/python-mode-5.2.0.tgz
 https://launchpad.net/python-mode
 GPL-3
 An Emacs major mode for editing Python source
-amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 elisp elisp-common eutils multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/app-emulation/qemu-kvm-0.14.1-r2 b/metadata/cache/app-emulation/qemu-kvm-0.14.1-r2
index 6a5a841a4447..a9a60ed02937 100644
--- a/metadata/cache/app-emulation/qemu-kvm-0.14.1-r2
+++ b/metadata/cache/app-emulation/qemu-kvm-0.14.1-r2
@@ -6,7 +6,7 @@ test
 http://www.linux-kvm.org
 GPL-2
 QEMU + Kernel-based Virtual Machine userland tools
-~amd64 ~ppc ~ppc64 x86
+amd64 ~ppc ~ppc64 x86
 eutils flag-o-matic linux-info multilib portability toolchain-funcs user versionator
 +aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde +vhost-net xen +qemu_softmmu_targets_x86_64 qemu_softmmu_targets_i386 qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_alpha qemu_user_targets_armeb qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus
 
diff --git a/metadata/cache/app-i18n/scim-prime-1.0.1 b/metadata/cache/app-i18n/scim-prime-1.0.1
index 6fe1b8fdda44..f249c50c92ea 100644
--- a/metadata/cache/app-i18n/scim-prime-1.0.1
+++ b/metadata/cache/app-i18n/scim-prime-1.0.1
@@ -6,7 +6,7 @@ mirror://sourceforge.jp/scim-imengine/29156/scim-prime-1.0.1.tar.gz
 http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMPRIME
 GPL-2
 Japanese input method PRIME IMEngine for SCIM
-~amd64 ~ppc ~x86
+amd64 ~ppc ~x86
 eutils multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/app-misc/vlock-2.2.3 b/metadata/cache/app-misc/vlock-2.2.3
index 104b81d1b603..3a4cf7d49445 100644
--- a/metadata/cache/app-misc/vlock-2.2.3
+++ b/metadata/cache/app-misc/vlock-2.2.3
@@ -6,7 +6,7 @@ http://cthulhu.c3d2.de/~toidinamai/vlock/archive/vlock-2.2.3.tar.gz
 http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html
 GPL-2
 A console screen locker
-~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+alpha amd64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86
 eutils flag-o-matic multilib pam portability toolchain-funcs user
 pam test
 
diff --git a/metadata/cache/app-office/abiword-2.8.6-r2 b/metadata/cache/app-office/abiword-2.8.6-r2
new file mode 100644
index 000000000000..867b94c4752e
--- /dev/null
+++ b/metadata/cache/app-office/abiword-2.8.6-r2
@@ -0,0 +1,22 @@
+>=app-text/wv-1.2 >=dev-libs/fribidi-0.10.4 >=dev-libs/glib-2.16:2 >=gnome-base/librsvg-2.16:2 >=gnome-extra/libgsf-1.14.15 >=media-libs/libpng-1.2 virtual/jpeg >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.14:2[cups?] gnome? ( >=gnome-extra/gucharmap-2 >=x11-libs/goffice-0.8:0.8 ) plugins? ( collab? ( >=dev-libs/boost-1.33.1 >=dev-libs/libxml2-2.4 >=net-libs/loudmouth-1 net-libs/libsoup:2.4 net-libs/gnutls ) grammar? ( >=dev-libs/link-grammar-4.2.1 ) latex? ( dev-libs/libxslt ) math? ( >=x11-libs/gtkmathview-0.7.5 ) openxml? ( dev-libs/boost ) ots? ( >=app-text/ots-0.5 ) readline? ( sys-libs/readline ) thesaurus? ( >=app-text/aiksaurus-1.2[gtk] ) wordperfect? ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) ) spell? ( >=app-text/enchant-1.2 ) !<app-office/abiword-plugins-2.8 >=dev-util/pkgconfig-0.9 collab? ( dev-cpp/asio ) app-arch/xz-utils >=sys-apps/sed-4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=app-text/wv-1.2 >=dev-libs/fribidi-0.10.4 >=dev-libs/glib-2.16:2 >=gnome-base/librsvg-2.16:2 >=gnome-extra/libgsf-1.14.15 >=media-libs/libpng-1.2 virtual/jpeg >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.14:2[cups?] gnome? ( >=gnome-extra/gucharmap-2 >=x11-libs/goffice-0.8:0.8 ) plugins? ( collab? ( >=dev-libs/boost-1.33.1 >=dev-libs/libxml2-2.4 >=net-libs/loudmouth-1 net-libs/libsoup:2.4 net-libs/gnutls ) grammar? ( >=dev-libs/link-grammar-4.2.1 ) latex? ( dev-libs/libxslt ) math? ( >=x11-libs/gtkmathview-0.7.5 ) openxml? ( dev-libs/boost ) ots? ( >=app-text/ots-0.5 ) readline? ( sys-libs/readline ) thesaurus? ( >=app-text/aiksaurus-1.2[gtk] ) wordperfect? ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) ) spell? ( >=app-text/enchant-1.2 ) !<app-office/abiword-plugins-2.8
+2
+http://www.abisource.com/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz
+
+http://www.abisource.com/
+GPL-2
+Fully featured yet light and fast cross platform word processor
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+alternatives autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
+collab cups gnome grammar latex math ots openxml plugins readline spell wordperfect wmf thesaurus debug
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/app-office/libreoffice-3.5.0.0 b/metadata/cache/app-office/libreoffice-3.5.0.0
index 8b17fec54e1a..b49ba8d4a415 100644
--- a/metadata/cache/app-office/libreoffice-3.5.0.0
+++ b/metadata/cache/app-office/libreoffice-3.5.0.0
@@ -1,5 +1,5 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 0
 branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-core-3.5.0.0.tar.bz2 binfilter? ( http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-binfilter-3.5.0.0.tar.bz2 ) http://download.documentfoundation.org/libreoffice/src/libreoffice-core-3.5.0.0.tar.bz2 binfilter? ( http://download.documentfoundation.org/libreoffice/src/libreoffice-binfilter-3.5.0.0.tar.bz2 ) http://download.documentfoundation.org/libreoffice/old/src/libreoffice-core-3.5.0.0.tar.bz2 binfilter? ( http://download.documentfoundation.org/libreoffice/old/src/libreoffice-binfilter-3.5.0.0.tar.bz2 ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 
@@ -8,7 +8,7 @@ LGPL-3
 LibreOffice, a full office productivity suite.
 ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
-binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde kdeenablefinal
+binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde kdeenablefinal
 nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome )
 =app-office/libreoffice-l10n-3.5.0*
 
diff --git a/metadata/cache/app-office/libreoffice-9999-r2 b/metadata/cache/app-office/libreoffice-9999-r2
index e736d9200e97..4e158dfc673f 100644
--- a/metadata/cache/app-office/libreoffice-9999-r2
+++ b/metadata/cache/app-office/libreoffice-9999-r2
@@ -1,5 +1,5 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.6.3:4[qt3support,ssl] >=x11-libs/qt-gui-4.6.3:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.6.3:4[accessibility,kde] >=x11-libs/qt-script-4.6.3:4 >=x11-libs/qt-sql-4.6.3:4[qt3support] >=x11-libs/qt-svg-4.6.3:4 >=x11-libs/qt-test-4.6.3:4 >=x11-libs/qt-webkit-4.6.3:4[kde?] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 0
 branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 
@@ -8,7 +8,7 @@ LGPL-3
 LibreOffice, a full office productivity suite.
 
 autotools base bash-completion-r1 check-reqs eutils fdo-mime flag-o-matic git-2 gnome2-utils java-pkg-opt-2 java-utils-2 kde4-base kde4-functions libtool multilib nsplugins pax-utils portability prefix python toolchain-funcs user versionator virtualx
-binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde kdeenablefinal
+binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec elibc_FreeBSD java aqua kde kdeenablefinal
 nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome )
 =app-office/libreoffice-l10n-9999*
 
diff --git a/metadata/cache/app-portage/gentoolkit-9999 b/metadata/cache/app-portage/gentoolkit-9999
index 0035bf3697a1..716305916b30 100644
--- a/metadata/cache/app-portage/gentoolkit-9999
+++ b/metadata/cache/app-portage/gentoolkit-9999
@@ -1,5 +1,5 @@
 sys-apps/portage >=app-admin/eselect-python-20091230 dev-lang/python[xml] dev-lang/python >=app-admin/eselect-python-20091230 dev-lang/python[xml] dev-vcs/git
-sys-apps/portage !<=app-portage/gentoolkit-dev-0.2.7 dev-python/argparse || ( app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep >=app-admin/eselect-python-20091230 dev-lang/python[xml] dev-lang/python >=app-admin/eselect-python-20091230 dev-lang/python[xml]
+sys-apps/portage !<=app-portage/gentoolkit-dev-0.2.7 dev-python/argparse || ( app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep !minimal? ( app-portage/diffmask app-portage/eclean-kernel app-portage/flaggie app-portage/install-mask app-portage/smart-live-rebuild ) >=app-admin/eselect-python-20091230 dev-lang/python[xml] dev-lang/python >=app-admin/eselect-python-20091230 dev-lang/python[xml]
 0
 
 
@@ -8,7 +8,7 @@ GPL-2
 Collection of administration scripts for Gentoo
 
 distutils git-2 multilib python toolchain-funcs
-
+minimal
 
 
 
diff --git a/metadata/cache/app-text/docbook-xsl-ns-stylesheets-1.76.1 b/metadata/cache/app-text/docbook-xsl-ns-stylesheets-1.76.1
index 1e2ccbf934c6..4799352fde52 100644
--- a/metadata/cache/app-text/docbook-xsl-ns-stylesheets-1.76.1
+++ b/metadata/cache/app-text/docbook-xsl-ns-stylesheets-1.76.1
@@ -6,7 +6,7 @@ test
 http://wiki.docbook.org/topic/DocBookXslStylesheets
 BSD
 XSL Stylesheets for Docbook
-alpha ~amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
+alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
 
 
 
diff --git a/metadata/cache/app-text/docbook-xsl-stylesheets-1.76.1 b/metadata/cache/app-text/docbook-xsl-stylesheets-1.76.1
index 9a7eedfad7ff..0575c813a901 100644
--- a/metadata/cache/app-text/docbook-xsl-stylesheets-1.76.1
+++ b/metadata/cache/app-text/docbook-xsl-stylesheets-1.76.1
@@ -6,7 +6,7 @@ test
 http://wiki.docbook.org/topic/DocBookXslStylesheets
 BSD
 XSL Stylesheets for Docbook
-alpha ~amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/app-text/jadetex-3.13-r3 b/metadata/cache/app-text/jadetex-3.13-r3
index 747dc9ed398b..bbc94d0f7900 100644
--- a/metadata/cache/app-text/jadetex-3.13-r3
+++ b/metadata/cache/app-text/jadetex-3.13-r3
@@ -6,7 +6,7 @@ test
 http://jadetex.sourceforge.net/
 freedist
 TeX macros used by Jade TeX output
-~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 base eutils latex-package multilib portability texlive-common toolchain-funcs user
 
 
diff --git a/metadata/cache/app-vim/bash-support-3.8 b/metadata/cache/app-vim/bash-support-3.8
new file mode 100644
index 000000000000..ed9cd3876521
--- /dev/null
+++ b/metadata/cache/app-vim/bash-support-3.8
@@ -0,0 +1,22 @@
+|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+0
+https://github.com/vim-scripts/bash-support.vim/tarball/3.8 -> bash-support-3.8.tar.gz
+
+http://www.vim.org/scripts/script.php?script_id=365
+public-domain
+vim plugin: Bash-IDE - Write and run bash scripts using menus and hotkeys
+~amd64 ~x86
+vim-doc vim-plugin
+
+
+
+
+4
+
+install postinst postrm prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/app-vim/gtk-syntax-20110214-r1 b/metadata/cache/app-vim/gtk-syntax-20110214-r1
index d94111d1f6eb..00dceba64e59 100644
--- a/metadata/cache/app-vim/gtk-syntax-20110214-r1
+++ b/metadata/cache/app-vim/gtk-syntax-20110214-r1
@@ -6,7 +6,7 @@ mirror://gentoo/gtk-syntax-20110214.tar.bz2
 http://www.vim.org/scripts/script.php?script_id=1000
 as-is
 vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
 vim-doc vim-plugin
 
 
diff --git a/metadata/cache/app-vim/tagbar-2.2 b/metadata/cache/app-vim/tagbar-2.2
new file mode 100644
index 000000000000..9c5cd7024fc3
--- /dev/null
+++ b/metadata/cache/app-vim/tagbar-2.2
@@ -0,0 +1,22 @@
+|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+>=dev-util/ctags-5.5 || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+0
+http://github.com/majutsushi/tagbar/tarball/v2.2 -> tagbar-2.2.tar.gz
+
+http://majutsushi.github.com/tagbar/ http://www.vim.org/scripts/script.php?script_id=3465
+vim
+vim plugin: display tags of the current file ordered by scope
+~amd64 ~x86
+vim-doc vim-plugin
+
+
+
+
+4
+
+install postinst postrm unpack
+
+
+
+
+
diff --git a/metadata/cache/app-vim/zencoding-vim-0.58 b/metadata/cache/app-vim/zencoding-vim-0.58
new file mode 100644
index 000000000000..528cbfda1d40
--- /dev/null
+++ b/metadata/cache/app-vim/zencoding-vim-0.58
@@ -0,0 +1,22 @@
+|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+0
+https://github.com/vim-scripts/ZenCoding.vim/tarball/0.58 -> zencoding-vim-0.58.tar.gz
+
+http://www.vim.org/scripts/script.php?script_id=2981 http://mattn.github.com/zencoding-vim/
+BSD
+vim plugin: HTML and CSS hi-speed coding
+~amd64 ~x86
+vim-doc vim-plugin
+
+
+
+
+4
+
+install postinst postrm prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/base-unicode-symbols-0.2.2.2 b/metadata/cache/dev-haskell/base-unicode-symbols-0.2.2.2
new file mode 100644
index 000000000000..157cf23a8e23
--- /dev/null
+++ b/metadata/cache/dev-haskell/base-unicode-symbols-0.2.2.2
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/base-unicode-symbols/0.2.2.2/base-unicode-symbols-0.2.2.2.tar.gz
+
+http://haskell.org/haskellwiki/Unicode-symbols
+BSD
+Unicode alternatives for common functions and operators
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/binary-0.4.1 b/metadata/cache/dev-haskell/binary-0.4.1
deleted file mode 100644
index 0454692ee9e7..000000000000
--- a/metadata/cache/dev-haskell/binary-0.4.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/ghc-6.4 doc? ( dev-haskell/haddock ) >=dev-haskell/cabal-1.2
->=dev-lang/ghc-6.4 dev-lang/ghc
-0
-http://hackage.haskell.org/packages/archive/binary/0.4.1/binary-0.4.1.tar.gz
-
-http://code.haskell.org/binary/
-BSD
-Efficient, pure binary serialisation using lazy ByteStrings
-~amd64 ~sparc ~x86
-eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
-doc profile
-
-
-
-
-
-compile install postinst prerm setup test
-
-
-
-
-
diff --git a/metadata/cache/dev-haskell/binary-0.4.2 b/metadata/cache/dev-haskell/binary-0.4.2
deleted file mode 100644
index c74ccd164d70..000000000000
--- a/metadata/cache/dev-haskell/binary-0.4.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/ghc-6.4 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) >=dev-haskell/cabal-1.1.4
->=dev-lang/ghc-6.4 >=dev-haskell/cabal-1.2 dev-lang/ghc
-0
-http://hackage.haskell.org/packages/archive/binary/0.4.2/binary-0.4.2.tar.gz
-
-http://code.haskell.org/binary/
-BSD
-Binary serialisation for Haskell values using lazy ByteStrings
-~amd64 ~sparc ~x86
-eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
-doc profile
-
-
-
-
-
-compile install postinst prerm setup test
-
-
-
-
-
diff --git a/metadata/cache/dev-haskell/crypto-4.2.4 b/metadata/cache/dev-haskell/crypto-4.2.4
new file mode 100644
index 000000000000..3e864e98125b
--- /dev/null
+++ b/metadata/cache/dev-haskell/crypto-4.2.4
@@ -0,0 +1,22 @@
+dev-haskell/hunit >=dev-haskell/quickcheck-2.4.0.1 >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+dev-haskell/hunit >=dev-haskell/quickcheck-2.4.0.1 >=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/Crypto/4.2.4/Crypto-4.2.4.tar.gz
+
+http://hackage.haskell.org/package/crypto
+BSD GPL-2
+Collects together existing Haskell cryptographic functions into a package
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/dataenc-0.14 b/metadata/cache/dev-haskell/dataenc-0.14.0.2
similarity index 60%
rename from metadata/cache/dev-haskell/dataenc-0.14
rename to metadata/cache/dev-haskell/dataenc-0.14.0.2
index 4f7dbac6e9a0..1fa5417d152d 100644
--- a/metadata/cache/dev-haskell/dataenc-0.14
+++ b/metadata/cache/dev-haskell/dataenc-0.14.0.2
@@ -1,20 +1,20 @@
 >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 >=dev-lang/ghc-6.8.2 dev-lang/ghc
 0
-http://hackage.haskell.org/packages/archive/dataenc/0.14/dataenc-0.14.tar.gz
+http://hackage.haskell.org/packages/archive/dataenc/0.14.0.2/dataenc-0.14.0.2.tar.gz
 
 http://www.haskell.org/haskellwiki/Library/Data_encoding
 BSD
 Data encoding library
 ~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
-base eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
 doc hscolour profile
 
 
 
 3
 
-compile configure install postinst prepare prerm setup test unpack
+compile configure install postinst prerm setup test
 
 
 
diff --git a/metadata/cache/dev-haskell/hs3-0.5.6 b/metadata/cache/dev-haskell/hs3-0.5.6
new file mode 100644
index 000000000000..3d8f62a54f3f
--- /dev/null
+++ b/metadata/cache/dev-haskell/hs3-0.5.6
@@ -0,0 +1,22 @@
+>=dev-haskell/crypto-4.1.0 dev-haskell/dataenc >=dev-haskell/http-4000.0.0 =dev-haskell/hxt-9* >=dev-haskell/missingh-0.18.6 dev-haskell/network dev-haskell/regex-compat dev-haskell/utf8-string >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-haskell/crypto-4.1.0 dev-haskell/dataenc >=dev-haskell/http-4000.0.0 =dev-haskell/hxt-9* >=dev-haskell/missingh-0.18.6 dev-haskell/network dev-haskell/regex-compat dev-haskell/utf8-string >=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/hS3/0.5.6/hS3-0.5.6.tar.gz
+
+http://gregheartsfield.com/hS3/
+BSD
+Interface to Amazon's Simple Storage Service (S3)
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/hslogger-1.1.5 b/metadata/cache/dev-haskell/hslogger-1.1.5
new file mode 100644
index 000000000000..a54c2c1861ad
--- /dev/null
+++ b/metadata/cache/dev-haskell/hslogger-1.1.5
@@ -0,0 +1,22 @@
+dev-haskell/mtl <dev-haskell/network-2.4 dev-haskell/time >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+dev-haskell/mtl <dev-haskell/network-2.4 dev-haskell/time >=dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/hslogger/1.1.5/hslogger-1.1.5.tar.gz
+
+http://software.complete.org/hslogger
+BSD
+Versatile logging framework
+~amd64 ~sparc ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/http-4000.1.2 b/metadata/cache/dev-haskell/http-4000.1.2
new file mode 100644
index 000000000000..43ac14389c32
--- /dev/null
+++ b/metadata/cache/dev-haskell/http-4000.1.2
@@ -0,0 +1,22 @@
+dev-haskell/mtl dev-haskell/network dev-haskell/parsec >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+dev-haskell/mtl dev-haskell/network dev-haskell/parsec >=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/HTTP/4000.1.2/HTTP-4000.1.2.tar.gz
+
+http://projects.haskell.org/http/
+BSD
+A library for client-side HTTP
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/hunit-1.2.4.2 b/metadata/cache/dev-haskell/hunit-1.2.4.2
new file mode 100644
index 000000000000..700a28fdf773
--- /dev/null
+++ b/metadata/cache/dev-haskell/hunit-1.2.4.2
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/HUnit/1.2.4.2/HUnit-1.2.4.2.tar.gz
+
+http://hunit.sourceforge.net/
+BSD
+A unit testing framework for Haskell
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/hxt-7.3 b/metadata/cache/dev-haskell/hxt-7.3
deleted file mode 100644
index c766df1a50bf..000000000000
--- a/metadata/cache/dev-haskell/hxt-7.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/ghc-6.6 >=dev-haskell/http-2006.7.7 >=dev-haskell/hunit-1.1 >=dev-haskell/network-1.0 doc? ( dev-haskell/haddock ) >=dev-haskell/cabal-1.1.4
->=dev-lang/ghc-6.6 >=dev-haskell/http-2006.7.7 >=dev-haskell/hunit-1.1 >=dev-haskell/network-1.0 dev-lang/ghc
-0
-http://www.fh-wedel.de/~si/HXmlToolbox/hxt-7.3.tar.gz
-
-http://www.fh-wedel.de/~si/HXmlToolbox/
-MIT
-A collection of tools for processing XML with Haskell
-~amd64 ~sparc ~x86
-eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
-doc profile
-
-
-
-
-
-compile install postinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-haskell/hxt-9.1.5 b/metadata/cache/dev-haskell/hxt-9.1.5
new file mode 100644
index 000000000000..a84cf0c0e5d7
--- /dev/null
+++ b/metadata/cache/dev-haskell/hxt-9.1.5
@@ -0,0 +1,22 @@
+>=dev-haskell/binary-0.5 <dev-haskell/binary-1 >=dev-haskell/deepseq-1.1 <dev-haskell/deepseq-2 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 =dev-haskell/hxt-charproperties-9* =dev-haskell/hxt-regex-xmlschema-9* =dev-haskell/hxt-unicode-9* >=dev-haskell/network-2.1 <dev-haskell/network-3 >=dev-haskell/parsec-2.1 <dev-haskell/parsec-4 >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-haskell/binary-0.5 <dev-haskell/binary-1 >=dev-haskell/deepseq-1.1 <dev-haskell/deepseq-2 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2 =dev-haskell/hxt-charproperties-9* =dev-haskell/hxt-regex-xmlschema-9* =dev-haskell/hxt-unicode-9* >=dev-haskell/network-2.1 <dev-haskell/network-3 >=dev-haskell/parsec-2.1 <dev-haskell/parsec-4 >=dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/hxt/9.1.5/hxt-9.1.5.tar.gz
+
+http://www.fh-wedel.de/~si/HXmlToolbox/index.html
+MIT
+A collection of tools for processing XML with Haskell.
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/hxt-charproperties-9.1.0 b/metadata/cache/dev-haskell/hxt-charproperties-9.1.0
new file mode 100644
index 000000000000..c21fc79855c8
--- /dev/null
+++ b/metadata/cache/dev-haskell/hxt-charproperties-9.1.0
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/hxt-charproperties/9.1.0/hxt-charproperties-9.1.0.tar.gz
+
+http://www.fh-wedel.de/~si/HXmlToolbox/index.html
+MIT
+Character properties and classes for XML and Unicode
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/hxt-regex-xmlschema-9.0.1 b/metadata/cache/dev-haskell/hxt-regex-xmlschema-9.0.1
new file mode 100644
index 000000000000..9a4d9688c23b
--- /dev/null
+++ b/metadata/cache/dev-haskell/hxt-regex-xmlschema-9.0.1
@@ -0,0 +1,22 @@
+=dev-haskell/hxt-charproperties-9* >=dev-haskell/parsec-2.1 <dev-haskell/parsec-4 >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+=dev-haskell/hxt-charproperties-9* >=dev-haskell/parsec-2.1 <dev-haskell/parsec-4 >=dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/hxt-regex-xmlschema/9.0.1/hxt-regex-xmlschema-9.0.1.tar.gz
+
+http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema
+MIT
+A regular expression library for W3C XML Schema regular expressions
+~amd64 ~x86
+base eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prepare prerm setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/hxt-unicode-9.0.1 b/metadata/cache/dev-haskell/hxt-unicode-9.0.1
new file mode 100644
index 000000000000..fc472f6bdc80
--- /dev/null
+++ b/metadata/cache/dev-haskell/hxt-unicode-9.0.1
@@ -0,0 +1,22 @@
+=dev-haskell/hxt-charproperties-9* >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+=dev-haskell/hxt-charproperties-9* >=dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/hxt-unicode/9.0.1/hxt-unicode-9.0.1.tar.gz
+
+http://www.fh-wedel.de/~si/HXmlToolbox/index.html
+MIT
+Unicode en-/decoding functions for utf8, iso-latin-* and other encodings
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/missingh-1.1.0.3 b/metadata/cache/dev-haskell/missingh-1.1.1.0
similarity index 54%
rename from metadata/cache/dev-haskell/missingh-1.1.0.3
rename to metadata/cache/dev-haskell/missingh-1.1.1.0
index b33bee684dd2..82cb385f5070 100644
--- a/metadata/cache/dev-haskell/missingh-1.1.0.3
+++ b/metadata/cache/dev-haskell/missingh-1.1.1.0
@@ -1,20 +1,20 @@
->=dev-haskell/cabal-1.2.3 virtual/libiconv >=dev-lang/ghc-6.10 dev-haskell/hslogger dev-haskell/hunit dev-haskell/mtl dev-haskell/network dev-haskell/parsec dev-haskell/regex-compat doc? ( dev-haskell/haddock ) >=dev-haskell/cabal-1.1.4
+>=dev-haskell/cabal-1.2.3 virtual/libiconv >=dev-lang/ghc-6.10 dev-haskell/hslogger dev-haskell/hunit dev-haskell/mtl dev-haskell/network dev-haskell/parsec dev-haskell/regex-compat test? ( dev-haskell/testpack dev-haskell/quickcheck:1 dev-haskell/hunit ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 >=dev-lang/ghc-6.10 dev-haskell/hslogger dev-haskell/hunit dev-haskell/mtl dev-haskell/network dev-haskell/parsec dev-haskell/regex-compat dev-lang/ghc
 0
-http://hackage.haskell.org/packages/archive/MissingH/1.1.0.3/MissingH-1.1.0.3.tar.gz
+http://hackage.haskell.org/packages/archive/MissingH/1.1.1.0/MissingH-1.1.1.0.tar.gz
 
 http://software.complete.org/missingh
 GPL-2
 Large utility library
 ~amd64 ~sparc ~x86
 eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
-doc profile
-
-
-
-
-
-compile install postinst prerm setup test unpack
+test doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prepare prerm setup test
 
 
 
diff --git a/metadata/cache/dev-haskell/monad-control-0.2.0.3 b/metadata/cache/dev-haskell/monad-control-0.2.0.3
new file mode 100644
index 000000000000..24eb4115f173
--- /dev/null
+++ b/metadata/cache/dev-haskell/monad-control-0.2.0.3
@@ -0,0 +1,22 @@
+<dev-haskell/base-unicode-symbols-0.3 =dev-haskell/transformers-0.2* >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.9.2 test? ( >=dev-haskell/cabal-1.10 <dev-haskell/test-framework-0.5 <dev-haskell/test-framework-hunit-0.3 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+<dev-haskell/base-unicode-symbols-0.3 =dev-haskell/transformers-0.2* >=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/monad-control/0.2.0.3/monad-control-0.2.0.3.tar.gz
+
+https://github.com/basvandijk/monad-control/
+BSD
+Lift control operations, like exception catching, through monad transformers
+~amd64 ~x86
+base eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+test doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prepare prerm setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/network-2.3.0.7 b/metadata/cache/dev-haskell/network-2.3.0.7
new file mode 100644
index 000000000000..c0b5000f2b90
--- /dev/null
+++ b/metadata/cache/dev-haskell/network-2.3.0.7
@@ -0,0 +1,22 @@
+dev-haskell/parsec >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.8 test? ( <dev-haskell/hunit-1.3 <dev-haskell/test-framework-0.5 <dev-haskell/test-framework-hunit-0.3 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+dev-haskell/parsec >=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/network/2.3.0.7/network-2.3.0.7.tar.gz
+
+http://github.com/haskell/network
+BSD
+Low-level networking interface
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+autotools base eutils ghc-package haskell-cabal libtool multilib portability toolchain-funcs user versionator
+test doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prepare prerm setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/pcre-light-0.4 b/metadata/cache/dev-haskell/pcre-light-0.4
new file mode 100644
index 000000000000..36925f61e876
--- /dev/null
+++ b/metadata/cache/dev-haskell/pcre-light-0.4
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.8.2 dev-libs/libpcre >=dev-haskell/cabal-1.2.0 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.8.2 dev-libs/libpcre dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/pcre-light/0.4/pcre-light-0.4.tar.gz
+
+http://code.haskell.org/~dons/code/pcre-light
+BSD
+A small, efficient and portable regex library for Perl 5 compatible regular expressions
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/quickcheck-2.4.1.1 b/metadata/cache/dev-haskell/quickcheck-2.4.1.1
new file mode 100644
index 000000000000..f2845069dae1
--- /dev/null
+++ b/metadata/cache/dev-haskell/quickcheck-2.4.1.1
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.10.1 dev-lang/ghc
+2
+http://hackage.haskell.org/packages/archive/QuickCheck/2.4.1.1/QuickCheck-2.4.1.1.tar.gz
+
+http://code.haskell.org/QuickCheck
+BSD
+Automatic testing of Haskell programs
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/regex-base-0.93.2 b/metadata/cache/dev-haskell/regex-base-0.93.2
new file mode 100644
index 000000000000..2e45099c28ce
--- /dev/null
+++ b/metadata/cache/dev-haskell/regex-base-0.93.2
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.6 dev-haskell/mtl >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.6 dev-haskell/mtl dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/regex-base/0.93.2/regex-base-0.93.2.tar.gz
+
+http://sourceforge.net/projects/lazy-regex
+BSD
+Interface API for regex-posix,pcre,parsec,tdfa,dfa
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc profile
+
+
+
+
+
+compile install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/regex-compat-0.95.1 b/metadata/cache/dev-haskell/regex-compat-0.95.1
new file mode 100644
index 000000000000..232652208975
--- /dev/null
+++ b/metadata/cache/dev-haskell/regex-compat-0.95.1
@@ -0,0 +1,22 @@
+>=dev-haskell/regex-base-0.93 >=dev-haskell/regex-posix-0.95.1 >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-haskell/regex-base-0.93 >=dev-haskell/regex-posix-0.95.1 >=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/regex-compat/0.95.1/regex-compat-0.95.1.tar.gz
+
+http://sourceforge.net/projects/lazy-regex
+BSD
+Replaces/Enhances Text.Regex
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/regex-posix-0.95.1 b/metadata/cache/dev-haskell/regex-posix-0.95.1
new file mode 100644
index 000000000000..f6e531c7cc9b
--- /dev/null
+++ b/metadata/cache/dev-haskell/regex-posix-0.95.1
@@ -0,0 +1,22 @@
+>=dev-haskell/regex-base-0.93 >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-haskell/regex-base-0.93 >=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/regex-posix/0.95.1/regex-posix-0.95.1.tar.gz
+
+http://sourceforge.net/projects/lazy-regex
+BSD
+Replaces/Enhances Text.Regex
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/sha-1.5.0.0 b/metadata/cache/dev-haskell/sha-1.5.0.0
new file mode 100644
index 000000000000..4bd189c8a382
--- /dev/null
+++ b/metadata/cache/dev-haskell/sha-1.5.0.0
@@ -0,0 +1,22 @@
+dev-haskell/binary >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+dev-haskell/binary >=dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/SHA/1.5.0.0/SHA-1.5.0.0.tar.gz
+
+http://hackage.haskell.org/package/sha
+BSD
+Implementations of the SHA suite of message digest functions
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/testpack-2.1.0 b/metadata/cache/dev-haskell/testpack-2.1.1
similarity index 88%
rename from metadata/cache/dev-haskell/testpack-2.1.0
rename to metadata/cache/dev-haskell/testpack-2.1.1
index bc6c4a309ffa..e5b8b662d328 100644
--- a/metadata/cache/dev-haskell/testpack-2.1.0
+++ b/metadata/cache/dev-haskell/testpack-2.1.1
@@ -1,7 +1,7 @@
 dev-haskell/hunit dev-haskell/mtl >=dev-haskell/quickcheck-2.1.0.3 >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 dev-haskell/hunit dev-haskell/mtl >=dev-haskell/quickcheck-2.1.0.3 >=dev-lang/ghc-6.8.2 dev-lang/ghc
 0
-http://hackage.haskell.org/packages/archive/testpack/2.1.0/testpack-2.1.0.tar.gz
+http://hackage.haskell.org/packages/archive/testpack/2.1.1/testpack-2.1.1.tar.gz
 
 http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack
 LGPL-2.1
diff --git a/metadata/cache/dev-haskell/transformers-0.2.2.0 b/metadata/cache/dev-haskell/transformers-0.2.2.0
new file mode 100644
index 000000000000..d10f75545331
--- /dev/null
+++ b/metadata/cache/dev-haskell/transformers-0.2.2.0
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.5.5 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/transformers/0.2.2.0/transformers-0.2.2.0.tar.gz
+
+http://hackage.haskell.org/package/transformers
+BSD
+Concrete functor and monad transformers
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/utf8-string-0.3.7 b/metadata/cache/dev-haskell/utf8-string-0.3.7
new file mode 100644
index 000000000000..945ba0fb6565
--- /dev/null
+++ b/metadata/cache/dev-haskell/utf8-string-0.3.7
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.6.1 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.6.1 >=dev-haskell/cabal-1.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/utf8-string/0.3.7/utf8-string-0.3.7.tar.gz
+
+http://github.com/glguy/utf8-string/
+BSD
+Support for reading and writing UTF8 Strings
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+
+
+compile install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-java/byaccj-1.15 b/metadata/cache/dev-java/byaccj-1.15
index 9e4c472ade93..3ff27a2caf0d 100644
--- a/metadata/cache/dev-java/byaccj-1.15
+++ b/metadata/cache/dev-java/byaccj-1.15
@@ -6,7 +6,7 @@ mirror://sourceforge/byaccj/byaccj1.15_src.tar.gz
 http://byaccj.sourceforge.net/
 as-is
 A java extension of BSD YACC-compatible parser generator
-~amd64 ~ppc ~ppc64 x86 ~x86-fbsd
+amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 
 
 
diff --git a/metadata/cache/dev-libs/lzo-2.06 b/metadata/cache/dev-libs/lzo-2.06
index 3844c85cd047..f119c03151de 100644
--- a/metadata/cache/dev-libs/lzo-2.06
+++ b/metadata/cache/dev-libs/lzo-2.06
@@ -6,7 +6,7 @@ http://www.oberhumer.com/opensource/lzo/download/lzo-2.06.tar.gz
 http://www.oberhumer.com/opensource/lzo/
 GPL-2
 An extremely fast compression and decompression library
-~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
+alpha amd64 ~arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris
 
 examples static-libs
 
diff --git a/metadata/cache/dev-libs/redland-1.0.15 b/metadata/cache/dev-libs/redland-1.0.15
new file mode 100644
index 000000000000..004b43d06dd4
--- /dev/null
+++ b/metadata/cache/dev-libs/redland-1.0.15
@@ -0,0 +1,22 @@
+>=sys-devel/libtool-2.2.6b mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) xml? ( dev-libs/libxml2 ) !xml? ( dev-libs/expat ) ssl? ( dev-libs/openssl ) media-libs/raptor:2[xml?] >=dev-libs/rasqal-0.9.26 postgres? ( dev-db/postgresql-base ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) dev-util/pkgconfig
+>=sys-devel/libtool-2.2.6b mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) xml? ( dev-libs/libxml2 ) !xml? ( dev-libs/expat ) ssl? ( dev-libs/openssl ) media-libs/raptor:2[xml?] >=dev-libs/rasqal-0.9.26 postgres? ( dev-db/postgresql-base ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
+0
+http://download.librdf.org/source/redland-1.0.15.tar.gz
+
+http://librdf.org/
+Apache-2.0 GPL-2 LGPL-2.1
+High-level interface for the Resource Description Framework
+~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
+libtool multilib toolchain-funcs
+berkdb iodbc mysql odbc postgres sqlite ssl static-libs +xml
+
+
+
+4
+
+configure install prepare test
+
+
+
+
+
diff --git a/metadata/cache/dev-perl/Alien-wxWidgets-0.530.0 b/metadata/cache/dev-perl/Alien-wxWidgets-0.530.0
index 5e5d9691099f..10569a749ee4 100644
--- a/metadata/cache/dev-perl/Alien-wxWidgets-0.530.0
+++ b/metadata/cache/dev-perl/Alien-wxWidgets-0.530.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.53.tar.gz
 http://search.cpan.org/dist/Alien-wxWidgets/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Building, finding and using wxWidgets binaries
-~amd64 ~ia64 ~x86
+amd64 ~ia64 ~x86
 base eutils multilib perl-module portability toolchain-funcs user wxwidgets
 test
 
diff --git a/metadata/cache/dev-perl/Chart-Math-Axis-1.00 b/metadata/cache/dev-perl/Chart-Math-Axis-1.00
index b640f56d16a5..af9ddf4c0a25 100644
--- a/metadata/cache/dev-perl/Chart-Math-Axis-1.00
+++ b/metadata/cache/dev-perl/Chart-Math-Axis-1.00
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AD/ADAMK/Chart-Math-Axis-1.00.tar.gz
 http://search.cpan.orga/~adamk/
 || ( Artistic GPL-2 )
 Implements an algorithm to find good values for chart axis
-alpha amd64 hppa ia64 ~mips ~ppc sparc x86
+amd64 hppa ~mips ~ppc x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Chart-Math-Axis-1.60.0 b/metadata/cache/dev-perl/Chart-Math-Axis-1.60.0
index 3e0475fd8844..4fdb6e7332b9 100644
--- a/metadata/cache/dev-perl/Chart-Math-Axis-1.60.0
+++ b/metadata/cache/dev-perl/Chart-Math-Axis-1.60.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AD/ADAMK/Chart-Math-Axis-1.06.tar.gz
 http://search.cpan.org/dist/Chart-Math-Axis/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Implements an algorithm to find good values for chart axis
-~alpha ~amd64 hppa ~ia64 ~mips ~ppc ~sparc x86
+~amd64 hppa ~mips ~ppc x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/ExtUtils-XSpp-0.160.200 b/metadata/cache/dev-perl/ExtUtils-XSpp-0.160.200
index 8b07ff2c125e..26727f701579 100644
--- a/metadata/cache/dev-perl/ExtUtils-XSpp-0.160.200
+++ b/metadata/cache/dev-perl/ExtUtils-XSpp-0.160.200
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/M/MB/MBARBON/ExtUtils-XSpp-0.1602.tar.gz
 http://search.cpan.org/dist/ExtUtils-XSpp/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 XS for C++
-~amd64 ~x86
+amd64 ~x86
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/File-chdir-0.100.200 b/metadata/cache/dev-perl/File-chdir-0.100.200
index 7b275e251f38..16627cc8adaa 100644
--- a/metadata/cache/dev-perl/File-chdir-0.100.200
+++ b/metadata/cache/dev-perl/File-chdir-0.100.200
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1002.tar.gz
 http://search.cpan.org/dist/File-chdir/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 An alternative to File::Spec and CWD
-amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/File-chdir-0.100.300 b/metadata/cache/dev-perl/File-chdir-0.100.300
index cdabc4ec95d1..072bda1a78ab 100644
--- a/metadata/cache/dev-perl/File-chdir-0.100.300
+++ b/metadata/cache/dev-perl/File-chdir-0.100.300
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1003.tar.gz
 http://search.cpan.org/dist/File-chdir/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 An alternative to File::Spec and CWD
-amd64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/File-chdir-0.100.600 b/metadata/cache/dev-perl/File-chdir-0.100.600
index 750800ac669d..2b6df32bdde6 100644
--- a/metadata/cache/dev-perl/File-chdir-0.100.600
+++ b/metadata/cache/dev-perl/File-chdir-0.100.600
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1006.tar.gz
 http://search.cpan.org/dist/File-chdir/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 An alternative to File::Spec and CWD
-~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Net-Domain-TLD-1.65 b/metadata/cache/dev-perl/Net-Domain-TLD-1.65
index 52a5c800de96..70ce284d0b05 100644
--- a/metadata/cache/dev-perl/Net-Domain-TLD-1.65
+++ b/metadata/cache/dev-perl/Net-Domain-TLD-1.65
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AL/ALEXP/Net-Domain-TLD-1.65.tar.gz
 http://search.cpan.org/~rjbs/
 Artistic
 Gives ability to retrieve currently available tld names/descriptions and perform verification of given tld name
-alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
+amd64 hppa ~mips ppc ppc64 x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Net-Domain-TLD-1.690.0 b/metadata/cache/dev-perl/Net-Domain-TLD-1.690.0
index a227851ccd96..7114654019ca 100644
--- a/metadata/cache/dev-perl/Net-Domain-TLD-1.690.0
+++ b/metadata/cache/dev-perl/Net-Domain-TLD-1.690.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AL/ALEXP/Net-Domain-TLD-1.69.tar.gz
 http://search.cpan.org/dist/Net-Domain-TLD/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Current list of available top level domain names including new ICANN additions and ccTLDs
-~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+amd64 hppa ~mips ~ppc ~ppc64 x86
 base eutils multilib perl-module portability toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/PatchReader-0.9.6 b/metadata/cache/dev-perl/PatchReader-0.9.6
index a9992855b4fe..863767eecce9 100644
--- a/metadata/cache/dev-perl/PatchReader-0.9.6
+++ b/metadata/cache/dev-perl/PatchReader-0.9.6
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/T/TM/TMANNERM/PatchReader-0.9.6.tar.gz
 http://search.cpan.org/dist/PatchReader/
 || ( Artistic GPL-2 )
 Module for reading diff-compatible patch files
-~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/SGMLSpm-1.03-r6 b/metadata/cache/dev-perl/SGMLSpm-1.03-r6
index f9198b0ba035..ca42eb4c65d8 100644
--- a/metadata/cache/dev-perl/SGMLSpm-1.03-r6
+++ b/metadata/cache/dev-perl/SGMLSpm-1.03-r6
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/D/DM/DMEGG/SGMLSpm-1.03ii.tar.gz
 http://search.cpan.org/author/DMEGG/SGMLSpm-1.03ii/
 GPL-2
 Perl library for parsing the output of nsgmls
-~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/SVN-Mirror-0.73 b/metadata/cache/dev-perl/SVN-Mirror-0.73
index 52e851b7b559..6d10bfea6faf 100644
--- a/metadata/cache/dev-perl/SVN-Mirror-0.73
+++ b/metadata/cache/dev-perl/SVN-Mirror-0.73
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/C/CL/CLKAO/SVN-Mirror-0.73.tar.gz
 http://www.cpan.org/authors/id/C/CL/CLKAO/SVN-Mirror-0.73.readme
 Artistic
 SVN::Mirror - Mirror remote repositories to local subversion repository
-amd64 ia64 ppc sparc x86
+amd64 ppc x86
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/SVN-Mirror-0.750.0 b/metadata/cache/dev-perl/SVN-Mirror-0.750.0
index 549107170e5a..fe75d289aeac 100644
--- a/metadata/cache/dev-perl/SVN-Mirror-0.750.0
+++ b/metadata/cache/dev-perl/SVN-Mirror-0.750.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/C/CL/CLKAO/SVN-Mirror-0.75.tar.gz
 http://search.cpan.org/dist/SVN-Mirror/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 SVN::Mirror - Mirror remote repositories to local subversion repository
-~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/wxperl-0.990.200 b/metadata/cache/dev-perl/wxperl-0.990.200
index b38102c64f4c..ec96e63976c4 100644
--- a/metadata/cache/dev-perl/wxperl-0.990.200
+++ b/metadata/cache/dev-perl/wxperl-0.990.200
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9902.tar.gz
 http://wxperl.sourceforge.net/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Perl bindings for wxGTK
-~amd64 ~x86
+amd64 ~x86
 base eutils multilib perl-module portability toolchain-funcs user wxwidgets
 
 
diff --git a/metadata/cache/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta3 b/metadata/cache/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta3
index 366ad861338a..dd77d716f2a7 100644
--- a/metadata/cache/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta3
+++ b/metadata/cache/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta3
@@ -6,7 +6,7 @@ http://pear.php.net/get/MDB2_Driver_mysqli-1.5.0b3.tgz
 http://pear.php.net/MDB2_Driver_mysqli
 BSD
 Database Abstraction Layer, mysqli driver
-alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86
+alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
 multilib php-pear-r1 toolchain-funcs
 
 
diff --git a/metadata/cache/dev-python/columnize-0.3.3 b/metadata/cache/dev-python/columnize-0.3.3
index 3438ca76d15d..f9c931aee957 100644
--- a/metadata/cache/dev-python/columnize-0.3.3
+++ b/metadata/cache/dev-python/columnize-0.3.3
@@ -4,7 +4,7 @@ dev-python/setuptools >=app-admin/eselect-python-20091230 =dev-lang/python-2* te
 http://pycolumnize.googlecode.com/files/columnize-0.3.3.tar.gz
 
 http://code.google.com/p/pycolumnize/ http://pypi.python.org/pypi/columnize
-PSF-2.2
+PSF-2
 Format a simple (i.e. not nested) list into aligned columns.
 ~amd64
 distutils multilib python toolchain-funcs
diff --git a/metadata/cache/dev-python/python-daemon-1.6 b/metadata/cache/dev-python/python-daemon-1.6
index 7f496d7177c3..5379833fd69e 100644
--- a/metadata/cache/dev-python/python-daemon-1.6
+++ b/metadata/cache/dev-python/python-daemon-1.6
@@ -4,7 +4,7 @@
 mirror://pypi/p/python-daemon/python-daemon-1.6.tar.gz
 
 http://pypi.python.org/pypi/python-daemon
-PSF-2.2
+PSF-2
 Library to implement a well-behaved Unix daemon process.
 amd64 x86
 distutils multilib python toolchain-funcs
diff --git a/metadata/cache/dev-ruby/bacon-1.1.0-r1 b/metadata/cache/dev-ruby/bacon-1.1.0-r1
index 031a2353e207..1d8744069ecc 100644
--- a/metadata/cache/dev-ruby/bacon-1.1.0-r1
+++ b/metadata/cache/dev-ruby/bacon-1.1.0-r1
@@ -6,7 +6,7 @@ mirror://rubygems/bacon-1.1.0.gem
 http://chneukirchen.org/repos/bacon
 MIT
 Small RSpec clone weighing less than 350 LoC
-~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
 
diff --git a/metadata/cache/dev-ruby/crack-0.3.1 b/metadata/cache/dev-ruby/crack-0.3.1
index d8346d66b832..ce68d38ef7fe 100644
--- a/metadata/cache/dev-ruby/crack-0.3.1
+++ b/metadata/cache/dev-ruby/crack-0.3.1
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:
 0
 mirror://rubygems/crack-0.3.1.gem
 
-http://rubyforge.org/projects/crack
+https://github.com/jnunemaker/crack
 MIT
 Really simple JSON and XML parsing, ripped from Merb and Rails.
 ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
diff --git a/metadata/cache/dev-ruby/heckle-1.4.3-r2 b/metadata/cache/dev-ruby/heckle-1.4.3-r2
index c86f94c059b2..6aa43ad6aa78 100644
--- a/metadata/cache/dev-ruby/heckle-1.4.3-r2
+++ b/metadata/cache/dev-ruby/heckle-1.4.3-r2
@@ -6,7 +6,7 @@ mirror://rubygems/heckle-1.4.3.gem
 http://seattlerb.rubyforge.org/
 GPL-2
 Unit Test Sadism
-amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc doc test test
 
diff --git a/metadata/cache/dev-ruby/hoe-seattlerb-1.2.7 b/metadata/cache/dev-ruby/hoe-seattlerb-1.2.7
index f3a74ba0f757..04d582d0df94 100644
--- a/metadata/cache/dev-ruby/hoe-seattlerb-1.2.7
+++ b/metadata/cache/dev-ruby/hoe-seattlerb-1.2.7
@@ -6,7 +6,7 @@ mirror://rubygems/hoe-seattlerb-1.2.7.gem
 http://seattlerb.rubyforge.org/hoe-seattlerb
 MIT
 Hoe plugins providing tasks used by seattle.rb
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test
 
diff --git a/metadata/cache/dev-ruby/i18n-0.6.0-r1 b/metadata/cache/dev-ruby/i18n-0.6.0-r1
new file mode 100644
index 000000000000..7d1c9a690db6
--- /dev/null
+++ b/metadata/cache/dev-ruby/i18n-0.6.0-r1
@@ -0,0 +1,22 @@
+ruby_targets_ruby18? ( test? ( dev-ruby/mocha[ruby_targets_ruby18] dev-ruby/test_declarative[ruby_targets_ruby18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/mocha[ruby_targets_jruby] dev-ruby/test_declarative[ruby_targets_jruby] ) ) ruby_targets_ree18? ( test? ( dev-ruby/mocha[ruby_targets_ree18] dev-ruby/test_declarative[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] dev-ruby/test_declarative[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+0.6
+http://github.com/svenfuchs/i18n/tarball/v0.6.0 -> i18n-git-0.6.0.tgz
+
+http://rails-i18n.org/
+MIT
+Add Internationalization support to your Ruby application.
+~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+elibc_FreeBSD ruby_targets_ruby18 ruby_targets_jruby ruby_targets_ree18 ruby_targets_ruby19 test test
+|| ( ruby_targets_ruby18 ruby_targets_jruby ruby_targets_ree18 ruby_targets_ruby19 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/markaby-0.7.2 b/metadata/cache/dev-ruby/markaby-0.7.2
index b4b89803087a..70f9cadc2f51 100644
--- a/metadata/cache/dev-ruby/markaby-0.7.2
+++ b/metadata/cache/dev-ruby/markaby-0.7.2
@@ -6,7 +6,7 @@ mirror://rubygems/markaby-0.7.2.gem
 http://markaby.github.com/
 MIT
 A templating language for Ruby to write HTML templates in pre Ruby
-~amd64 ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+amd64 ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 
diff --git a/metadata/cache/dev-ruby/mime-types-1.16-r3 b/metadata/cache/dev-ruby/mime-types-1.16-r3
index 3edeb21c1f69..86c7a8cc1159 100644
--- a/metadata/cache/dev-ruby/mime-types-1.16-r3
+++ b/metadata/cache/dev-ruby/mime-types-1.16-r3
@@ -6,7 +6,7 @@ mirror://rubygems/mime-types-1.16.gem
 http://rubyforge.org/projects/mime-types
 Ruby Artistic GPL-2
 Provides a mailcap-like MIME Content-Type lookup for Ruby.
-~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos ~sparc-solaris ~x86-solaris
+~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-macos ~sparc-solaris ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 doc doc test test
 
diff --git a/metadata/cache/dev-ruby/mustache-0.99.4 b/metadata/cache/dev-ruby/mustache-0.99.4
index 4de8394fd58d..ff97afa1e993 100644
--- a/metadata/cache/dev-ruby/mustache-0.99.4
+++ b/metadata/cache/dev-ruby/mustache-0.99.4
@@ -6,7 +6,7 @@ mirror://rubygems/mustache-0.99.4.gem
 http://mustache.github.com/
 MIT
 Mustache is a framework-agnostic way to render logic-free views.
-~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test
 
diff --git a/metadata/cache/dev-ruby/parsetree-3.0.8 b/metadata/cache/dev-ruby/parsetree-3.0.8
index 328ab603c5d3..093e3e2b7118 100644
--- a/metadata/cache/dev-ruby/parsetree-3.0.8
+++ b/metadata/cache/dev-ruby/parsetree-3.0.8
@@ -6,7 +6,7 @@ mirror://rubygems/ParseTree-3.0.8.gem
 http://www.zenspider.com/ZSS/Products/ParseTree/
 GPL-2
 ParseTree extracts the parse tree for a Class or method and returns it as a s-expression.
-~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc doc test test
 
diff --git a/metadata/cache/dev-ruby/rack-1.2.4 b/metadata/cache/dev-ruby/rack-1.2.4
index a4d5dc314389..ac34e2c11630 100644
--- a/metadata/cache/dev-ruby/rack-1.2.4
+++ b/metadata/cache/dev-ruby/rack-1.2.4
@@ -3,7 +3,7 @@ ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ree1
 1.2
 mirror://rubyforge/rack/rack-1.2.4.tar.gz
 
-http://rubyforge.org/projects/rack
+https://github.com/rack/rack
 MIT
 A modular Ruby webserver interface
 ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
diff --git a/metadata/cache/dev-ruby/rack-1.2.4-r1 b/metadata/cache/dev-ruby/rack-1.2.4-r1
new file mode 100644
index 000000000000..a0a0ac386aee
--- /dev/null
+++ b/metadata/cache/dev-ruby/rack-1.2.4-r1
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/ruby-ssl[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/ruby-ssl[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/bacon[ruby_targets_ruby18] dev-ruby/ruby-fcgi[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/bacon[ruby_targets_ree18] dev-ruby/ruby-fcgi[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/bacon[ruby_targets_ruby19] dev-ruby/ruby-fcgi[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/bacon[ruby_targets_jruby] dev-ruby/ruby-fcgi[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/ruby-ssl[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/ruby-ssl[ruby_targets_jruby] ) !<dev-ruby/rack-1.1.0-r1:0 ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+1.2
+mirror://rubyforge/rack/rack-1.2.4.tar.gz
+
+http://rubyforge.org/projects/rack
+MIT
+A modular Ruby webserver interface
+~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
+
+
+
+2
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/rdiscount-1.6.8 b/metadata/cache/dev-ruby/rdiscount-1.6.8
index 886ceda76296..c3fdd8682283 100644
--- a/metadata/cache/dev-ruby/rdiscount-1.6.8
+++ b/metadata/cache/dev-ruby/rdiscount-1.6.8
@@ -6,7 +6,7 @@ mirror://rubygems/rdiscount-1.6.8.gem
 http://github.com/rtomayko/rdiscount
 MIT
 Implementation of John Gruber's Markdown
-~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc test test
 
diff --git a/metadata/cache/dev-ruby/ruby-inline-3.9.0 b/metadata/cache/dev-ruby/ruby-inline-3.9.0
index 9b6215f1a0fd..f1b3475520fb 100644
--- a/metadata/cache/dev-ruby/ruby-inline-3.9.0
+++ b/metadata/cache/dev-ruby/ruby-inline-3.9.0
@@ -6,7 +6,7 @@ mirror://rubygems/RubyInline-3.9.0.gem
 http://www.zenspider.com/ZSS/Products/RubyInline/
 MIT
 Allows to embed C/C++ in Ruby code
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 doc doc test test
 
diff --git a/metadata/cache/dev-ruby/ruby2ruby-1.3.1 b/metadata/cache/dev-ruby/ruby2ruby-1.3.1
index 5fd9e6121cca..12791582c82d 100644
--- a/metadata/cache/dev-ruby/ruby2ruby-1.3.1
+++ b/metadata/cache/dev-ruby/ruby2ruby-1.3.1
@@ -6,7 +6,7 @@ mirror://rubygems/ruby2ruby-1.3.1.gem
 http://seattlerb.rubyforge.org/
 GPL-2
 Generates readable ruby from ParseTree
-~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 doc doc test
 
diff --git a/metadata/cache/dev-ruby/ruby_parser-2.3.1 b/metadata/cache/dev-ruby/ruby_parser-2.3.1
index 28bed589443c..5106fed8f6a5 100644
--- a/metadata/cache/dev-ruby/ruby_parser-2.3.1
+++ b/metadata/cache/dev-ruby/ruby_parser-2.3.1
@@ -6,7 +6,7 @@ mirror://rubygems/ruby_parser-2.3.1.gem
 http://parsetree.rubyforge.org/
 MIT
 A ruby parser written in pure ruby.
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby doc doc test test
 
diff --git a/metadata/cache/dev-ruby/rubyzip-0.9.5 b/metadata/cache/dev-ruby/rubyzip-0.9.5
index 3c0e1b033afc..af0bec119a7b 100644
--- a/metadata/cache/dev-ruby/rubyzip-0.9.5
+++ b/metadata/cache/dev-ruby/rubyzip-0.9.5
@@ -6,7 +6,7 @@ https://github.com/aussiegeek/rubyzip/tarball/0.9.5 -> rubyzip-0.9.5-git.tgz
 https://github.com/aussiegeek/rubyzip
 Ruby
 A ruby library for reading and writing zip files
-~amd64 ~ia64 ~ppc ~ppc64 ~x86
+~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
 || ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
diff --git a/metadata/cache/dev-ruby/sexp-processor-3.0.6 b/metadata/cache/dev-ruby/sexp-processor-3.0.6
index 21e9b4fa043c..8f3bfb4dd03b 100644
--- a/metadata/cache/dev-ruby/sexp-processor-3.0.6
+++ b/metadata/cache/dev-ruby/sexp-processor-3.0.6
@@ -6,7 +6,7 @@ mirror://rubygems/sexp_processor-3.0.6.gem
 http://www.zenspider.com/ZSS/Products/ParseTree/
 GPL-2
 Processor for s-expressions created as part of the ParseTree project.
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
 
diff --git a/metadata/cache/dev-ruby/tilt-1.3.2 b/metadata/cache/dev-ruby/tilt-1.3.2
index db65b44ff393..45ff7cef362d 100644
--- a/metadata/cache/dev-ruby/tilt-1.3.2
+++ b/metadata/cache/dev-ruby/tilt-1.3.2
@@ -6,7 +6,7 @@ mirror://rubygems/tilt-1.3.2.gem
 http://github.com/rtomayko/tilt
 MIT
 A thin interface over a Ruby template engines to make their usage as generic as possible.
-~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
 
diff --git a/metadata/cache/dev-ruby/zentest-4.6.2 b/metadata/cache/dev-ruby/zentest-4.6.2
index 4fef9c7047d7..6c8325649e1d 100644
--- a/metadata/cache/dev-ruby/zentest-4.6.2
+++ b/metadata/cache/dev-ruby/zentest-4.6.2
@@ -6,7 +6,7 @@ mirror://rubygems/ZenTest-4.6.2.gem
 http://rubyforge.org/projects/zentest/
 Ruby
 ZenTest provides tools to support testing: zentest, unit_diff, autotest, multiruby, and Test::Rails
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
 
diff --git a/metadata/cache/dev-tex/catdvi-0.14 b/metadata/cache/dev-tex/catdvi-0.14
deleted file mode 100644
index e2f64b3d2be7..000000000000
--- a/metadata/cache/dev-tex/catdvi-0.14
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/tex-base
-virtual/tex-base
-0
-mirror://sourceforge/catdvi/catdvi-0.14.tar.gz
-
-http://catdvi.sourceforge.net
-GPL-2
-DVI to plain text translator
-amd64 x86
-multilib toolchain-funcs
-
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/dev-util/strace-4.6 b/metadata/cache/dev-util/strace-4.6
index 755820090460..9b8a0bd5e2a8 100644
--- a/metadata/cache/dev-util/strace-4.6
+++ b/metadata/cache/dev-util/strace-4.6
@@ -6,7 +6,7 @@ mirror://sourceforge/strace/strace-4.6.tar.xz
 http://sourceforge.net/projects/strace/
 BSD
 A useful diagnostic, instructional, and debugging tool
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
 eutils flag-o-matic multilib portability toolchain-funcs user
 static aio
 
diff --git a/metadata/cache/dev-vcs/giggle-0.6.1 b/metadata/cache/dev-vcs/giggle-0.6.1
new file mode 100644
index 000000000000..641c32d91df3
--- /dev/null
+++ b/metadata/cache/dev-vcs/giggle-0.6.1
@@ -0,0 +1,22 @@
+>=dev-vcs/git-1.5 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-3.0:3.0 gnome-base/gnome-common eds? ( gnome-extra/evolution-data-server ) >=x11-libs/vte-0.26:2.90 sys-devel/gettext >=dev-util/pkgconfig-0.15 >=dev-util/intltool-0.35 >=sys-devel/autoconf-2.64 >=sys-devel/libtool-2 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4
+>=dev-vcs/git-1.5 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-3.0:3.0 gnome-base/gnome-common eds? ( gnome-extra/evolution-data-server ) >=x11-libs/vte-0.26:2.90
+0
+mirror://gnome/sources/giggle/0.6/giggle-0.6.1.tar.bz2
+
+http://live.gnome.org/giggle
+GPL-2
+GTK+ Frontend for GIT
+~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux
+autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
+eds debug
+
+
+
+3
+
+compile configure install postinst postrm preinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-vcs/git-annex-3.20111203 b/metadata/cache/dev-vcs/git-annex-3.20111203
new file mode 100644
index 000000000000..4274b1b5be78
--- /dev/null
+++ b/metadata/cache/dev-vcs/git-annex-3.20111203
@@ -0,0 +1,22 @@
+>=dev-vcs/git-1.7.7 >=dev-haskell/cabal-1.6 dev-haskell/dataenc dev-haskell/hs3 dev-haskell/hslogger dev-haskell/http dev-haskell/json dev-haskell/missingh dev-haskell/monad-control dev-haskell/mtl dev-haskell/network dev-haskell/pcre-light dev-haskell/sha dev-haskell/time dev-haskell/utf8-string >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.1.4
+>=dev-vcs/git-1.7.7
+0
+http://hackage.haskell.org/packages/archive/git-annex/3.20111203/git-annex-3.20111203.tar.gz
+
+http://git-annex.branchable.com/
+GPL-2
+manage files with git, without checking their contents into git
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib portability toolchain-funcs user versionator
+
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-vcs/gitolite-2.2 b/metadata/cache/dev-vcs/gitolite-2.2
new file mode 100644
index 000000000000..4a3c799d10bc
--- /dev/null
+++ b/metadata/cache/dev-vcs/gitolite-2.2
@@ -0,0 +1,22 @@
+dev-lang/perl >=dev-vcs/git-1.6.6 dev-lang/perl[-build]
+dev-lang/perl >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl[-build]
+0
+mirror://gentoo/gitolite-2.2.tar.bz2
+
+http://github.com/sitaramc/gitolite
+GPL-2
+Highly flexible server for git directory version tracker
+~amd64 ~x86
+base eutils multilib perl-module portability toolchain-funcs user
+contrib vim-syntax
+
+
+
+4
+
+compile configure install postinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-vcs/gitolite-gentoo-2.2 b/metadata/cache/dev-vcs/gitolite-gentoo-2.2
new file mode 100644
index 000000000000..b7dea5313f13
--- /dev/null
+++ b/metadata/cache/dev-vcs/gitolite-gentoo-2.2
@@ -0,0 +1,22 @@
+dev-lang/perl >=dev-vcs/git-1.6.6 dev-lang/perl[-build]
+dev-lang/perl >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl[-build]
+0
+mirror://gentoo/gitolite-gentoo-2.2.tar.bz2
+
+http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=summary
+GPL-2
+Highly flexible server for git directory version tracker, Gentoo fork
+~amd64 ~x86
+base eutils multilib perl-module portability toolchain-funcs user
+contrib vim-syntax
+
+
+
+3
+
+compile configure install postinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-vcs/rapidsvn-0.12.0 b/metadata/cache/dev-vcs/rapidsvn-0.12.0
index 1288ae9a0967..7f0cbdcd5416 100644
--- a/metadata/cache/dev-vcs/rapidsvn-0.12.0
+++ b/metadata/cache/dev-vcs/rapidsvn-0.12.0
@@ -6,7 +6,7 @@ http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz
 http://rapidsvn.tigris.org/
 GPL-2 LGPL-2.1 FDL-1.2
 Cross-platform GUI front-end for the Subversion revision system.
-~amd64 ppc ppc64 ~sparc x86
+amd64 ppc ppc64 ~sparc x86
 autotools confutils eutils fdo-mime flag-o-matic libtool multilib portability toolchain-funcs user versionator wxwidgets
 doc
 
diff --git a/metadata/cache/dev-vcs/svk-1.08 b/metadata/cache/dev-vcs/svk-1.08
index b39db1a4d035..325ce81a8fb8 100644
--- a/metadata/cache/dev-vcs/svk-1.08
+++ b/metadata/cache/dev-vcs/svk-1.08
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/C/CL/CLKAO/SVK-1.08.tar.gz
 http://www.elixus.org/
 || ( Artistic GPL-2 )
 A decentralized version control system
-~amd64 ~ia64 ~ppc ~sparc ~x86
+~amd64 ~ppc ~x86
 base bash-completion eutils multilib perl-module portability toolchain-funcs user
 crypt nls pager patch bash-completion
 
diff --git a/metadata/cache/dev-vcs/svk-2.0.2 b/metadata/cache/dev-vcs/svk-2.0.2
index c7ff13fa3ad7..65165e6952ce 100644
--- a/metadata/cache/dev-vcs/svk-2.0.2
+++ b/metadata/cache/dev-vcs/svk-2.0.2
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/C/CL/CLKAO/SVK-v2.0.2.tar.gz
 http://www.elixus.org/
 || ( Artistic GPL-2 )
 A decentralized version control system
-~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 base bash-completion eutils multilib perl-module portability toolchain-funcs user
 crypt nls pager patch log4p bash-completion bash-completion
 
diff --git a/metadata/cache/kde-base/dolphin-4.7.3 b/metadata/cache/kde-base/dolphin-4.7.3
index 629351d2bcb5..1056ec15e838 100644
--- a/metadata/cache/kde-base/dolphin-4.7.3
+++ b/metadata/cache/kde-base/dolphin-4.7.3
@@ -2,7 +2,7 @@
 >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop=] >=kde-base/libkonq-4.7.3:4[aqua=] semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 ) >=kde-base/kfind-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 4
 mirror://kde/stable/4.7.3/src/kde-baseapps-4.7.3.tar.bz2
-
+test
 http://www.kde.org/
 GPL-2
 A KDE filemanager focusing on usability
diff --git a/metadata/cache/kde-base/kaddressbook-4.7.3 b/metadata/cache/kde-base/kaddressbook-4.7.3
index 3132860e8c2c..702d46e532e1 100644
--- a/metadata/cache/kde-base/kaddressbook-4.7.3
+++ b/metadata/cache/kde-base/kaddressbook-4.7.3
@@ -2,7 +2,7 @@
 >=dev-libs/grantlee-0.1.4 >=kde-base/kdelibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] kontact? ( >=kde-base/kontact-4.7.3:4[aqua=] )
 4
 mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
+test
 http://www.kde.org/
 GPL-2
 The KDE Address Book
diff --git a/metadata/cache/kde-base/kalgebra-4.7.3 b/metadata/cache/kde-base/kalgebra-4.7.3
index ebd46433fbcf..276f6596370b 100644
--- a/metadata/cache/kde-base/kalgebra-4.7.3
+++ b/metadata/cache/kde-base/kalgebra-4.7.3
@@ -2,7 +2,7 @@
 >=kde-base/libkdeedu-4.7.3:4[aqua=] readline? ( sys-libs/readline ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
 4
 mirror://kde/stable/4.7.3/src/kalgebra-4.7.3.tar.bz2
-
+test
 http://www.kde.org/
 GPL-2
 MathML-based graph calculator for KDE.
diff --git a/metadata/cache/kde-base/kcalc-4.7.3 b/metadata/cache/kde-base/kcalc-4.7.3
index 6a672e4a191a..95e3526a05e3 100644
--- a/metadata/cache/kde-base/kcalc-4.7.3
+++ b/metadata/cache/kde-base/kcalc-4.7.3
@@ -2,7 +2,7 @@ dev-libs/gmp >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/
 dev-libs/gmp >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
 4
 mirror://kde/stable/4.7.3/src/kdeutils-4.7.3.tar.bz2
-
+test
 http://www.kde.org/
 GPL-2
 KDE calculator
diff --git a/metadata/cache/kde-base/kdepim-common-libs-4.7.3 b/metadata/cache/kde-base/kdepim-common-libs-4.7.3
index a90dd88f926d..febdf0615e8b 100644
--- a/metadata/cache/kde-base/kdepim-common-libs-4.7.3
+++ b/metadata/cache/kde-base/kdepim-common-libs-4.7.3
@@ -2,7 +2,7 @@ app-crypt/gpgme >=app-office/akonadi-server-1.3.60 >=dev-libs/shared-desktop-ont
 app-crypt/gpgme >=app-office/akonadi-server-1.3.60 >=dev-libs/shared-desktop-ontologies-0.6.50 >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] app-crypt/gnupg >=kde-base/kdepim-runtime-4.7.3:4[aqua=] !kde-base/akonadi:4 !kde-base/libkdepim:4 !kde-base/libkleo:4 !kde-base/libkpgp:4 !<kde-base/kaddressbook-4.4.90:4 !<kde-base/kmail-4.4.80:4 !<kde-base/korganizer-4.5.67:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
 4
 mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
+test
 http://www.kde.org/
 GPL-2
 Common libraries for KDE PIM apps
diff --git a/metadata/cache/kde-base/keditbookmarks-4.7.3 b/metadata/cache/kde-base/keditbookmarks-4.7.3
index 45a4613b0cc7..9ae2c562ab3d 100644
--- a/metadata/cache/kde-base/keditbookmarks-4.7.3
+++ b/metadata/cache/kde-base/keditbookmarks-4.7.3
@@ -2,7 +2,7 @@
 >=kde-base/libkonq-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 4
 mirror://kde/stable/4.7.3/src/kde-baseapps-4.7.3.tar.bz2
-
+test
 http://www.kde.org/
 GPL-2
 KDE's bookmarks editor
diff --git a/metadata/cache/kde-base/kmail-4.7.3 b/metadata/cache/kde-base/kmail-4.7.3
index 4f4100784d01..8ecab65f1664 100644
--- a/metadata/cache/kde-base/kmail-4.7.3
+++ b/metadata/cache/kde-base/kmail-4.7.3
@@ -2,7 +2,7 @@
 >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/korganizer-4.7.3:4[aqua=] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] kontact? ( >=kde-base/kontact-4.7.3:4[aqua=] )
 4
 mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
+test
 http://www.kde.org/
 GPL-2
 KMail is the email component of Kontact, the integrated personal information manager of KDE.
diff --git a/metadata/cache/kde-base/korganizer-4.7.3 b/metadata/cache/kde-base/korganizer-4.7.3
index 5e2344a3b149..5705e50f02af 100644
--- a/metadata/cache/kde-base/korganizer-4.7.3
+++ b/metadata/cache/kde-base/korganizer-4.7.3
@@ -2,7 +2,7 @@
 >=kde-base/kdepimlibs-4.7.3:4[aqua=,semantic-desktop] >=kde-base/kdepim-common-libs-4.7.3:4[aqua=] sys-libs/zlib >=kde-base/ktimezoned-4.7.3:4[aqua=] >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] kontact? ( >=kde-base/kontact-4.7.3:4[aqua=] )
 4
 mirror://kde/stable/4.7.3/src/kdepim-4.7.3.tar.bz2
-
+test
 http://www.kde.org/
 GPL-2
 A Personal Organizer for KDE
diff --git a/metadata/cache/kde-base/kpasswdserver-4.7.3 b/metadata/cache/kde-base/kpasswdserver-4.7.3
index 2f36cb9226e3..cc053d98b405 100644
--- a/metadata/cache/kde-base/kpasswdserver-4.7.3
+++ b/metadata/cache/kde-base/kpasswdserver-4.7.3
@@ -2,7 +2,7 @@
 >=kde-base/oxygen-icons-4.7.3:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 4
 mirror://kde/stable/4.7.3/src/kde-runtime-4.7.3.tar.bz2
-
+test
 http://www.kde.org/
 GPL-2
 KDED Password Module
diff --git a/metadata/cache/kde-base/kscd-4.7.3 b/metadata/cache/kde-base/kscd-4.7.3
index d9e3d8d71912..1f8cd8b56853 100644
--- a/metadata/cache/kde-base/kscd-4.7.3
+++ b/metadata/cache/kde-base/kscd-4.7.3
@@ -2,7 +2,7 @@
 >=kde-base/libkcddb-4.7.3:4[aqua=] >=kde-base/libkcompactdisc-4.7.3:4[aqua=] media-libs/musicbrainz:3 >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=]
 4
 mirror://kde/stable/4.7.3/src/kdemultimedia-4.7.3.tar.bz2
-
+test
 http://www.kde.org/
 GPL-2
 KDE CD player
diff --git a/metadata/cache/kde-base/ksysguard-4.7.3 b/metadata/cache/kde-base/ksysguard-4.7.3
index 53f1cd01d526..702574712cf1 100644
--- a/metadata/cache/kde-base/ksysguard-4.7.3
+++ b/metadata/cache/kde-base/ksysguard-4.7.3
@@ -2,7 +2,7 @@ x11-libs/libXrender x11-libs/libXres lm_sensors? ( sys-apps/lm_sensors ) x11-pro
 x11-libs/libXrender x11-libs/libXres lm_sensors? ( sys-apps/lm_sensors ) >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 4
 mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
+test
 http://www.kde.org/
 GPL-2
 KSysguard is a network enabled task manager and system monitor application.
diff --git a/metadata/cache/kde-base/systemsettings-4.7.3 b/metadata/cache/kde-base/systemsettings-4.7.3
index 2f2daa9296d7..3721d6f59d1f 100644
--- a/metadata/cache/kde-base/systemsettings-4.7.3
+++ b/metadata/cache/kde-base/systemsettings-4.7.3
@@ -2,7 +2,7 @@ dev-libs/glib:2 >=kde-base/libkworkspace-4.7.3:4[aqua=] media-libs/fontconfig >=
 dev-libs/glib:2 >=kde-base/libkworkspace-4.7.3:4[aqua=] media-libs/fontconfig >=media-libs/freetype-2 >=x11-libs/libxklavier-3.2 x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXrandr x11-libs/libXtst opengl? ( virtual/opengl ) usb? ( =virtual/libusb-0* ) xinerama? ( x11-libs/libXinerama ) sys-libs/timezone-data x11-apps/setxkbmap x11-misc/xkeyboard-config gtk? ( kde-misc/kcm-gtk-config ) !<kde-base/kdeaccessibility-colorschemes-4.6.50:4 >=kde-base/oxygen-icons-4.7.3:4[aqua=] handbook? ( >=kde-base/kdelibs-4.7.3:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility,kde] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4[kde] !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.7.3:4[aqua=] >=media-libs/qimageblitz-0.0.4
 4
 mirror://kde/stable/4.7.3/src/kde-workspace-4.7.3.tar.bz2
-
+test
 http://www.kde.org/
 GPL-2
 System settings utility
diff --git a/metadata/cache/mail-client/mutt-1.5.21-r7 b/metadata/cache/mail-client/mutt-1.5.21-r7
index c007cae57534..ff7e95a06e36 100644
--- a/metadata/cache/mail-client/mutt-1.5.21-r7
+++ b/metadata/cache/mail-client/mutt-1.5.21-r7
@@ -1,5 +1,5 @@
->=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types
+>=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) selinux? ( sec-policy/selinux-mutt ) app-misc/mime-types net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) selinux? ( sec-policy/selinux-mutt ) app-misc/mime-types
 0
 ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz mirror://gentoo/mutt-1.5.21-gentoo-patches-r7.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/mutt-1.5.21-gentoo-patches-r7.tar.bz2
 
@@ -8,7 +8,7 @@ GPL-2
 A small but very powerful text-based mail client
 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools eutils flag-o-matic libtool multilib portability toolchain-funcs user
-berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet
+berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl selinux sidebar smime smtp ssl tokyocabinet
 
 
 
diff --git a/metadata/cache/media-gfx/mypaint-1.0.0 b/metadata/cache/media-gfx/mypaint-1.0.0
index c6895d31193b..3f14c20c7f5a 100644
--- a/metadata/cache/media-gfx/mypaint-1.0.0
+++ b/metadata/cache/media-gfx/mypaint-1.0.0
@@ -1,4 +1,4 @@
-dev-python/pygtk dev-python/numpy >=dev-python/pycairo-1.4 >=dev-lang/python-2.4 <dev-lang/python-3 dev-libs/protobuf[python] >=dev-util/scons-1.0 dev-lang/swig >=sys-apps/sed-4 dev-util/scons
+dev-python/pygtk dev-python/numpy >=dev-python/pycairo-1.4 >=dev-lang/python-2.4 <dev-lang/python-3 dev-libs/protobuf[python] >=dev-util/scons-1.0 dev-lang/swig dev-util/pkgconfig >=sys-apps/sed-4 dev-util/scons
 dev-python/pygtk dev-python/numpy >=dev-python/pycairo-1.4 >=dev-lang/python-2.4 <dev-lang/python-3 dev-libs/protobuf[python]
 0
 http://download.gna.org/mypaint/mypaint-1.0.0.tar.bz2
diff --git a/metadata/cache/media-libs/libpng-1.5.6 b/metadata/cache/media-libs/libpng-1.5.6
index dc5bbc9ce7d0..8d359b258b0b 100644
--- a/metadata/cache/media-libs/libpng-1.5.6
+++ b/metadata/cache/media-libs/libpng-1.5.6
@@ -6,7 +6,7 @@ mirror://sourceforge/libpng/libpng-1.5.6.tar.xz apng? ( mirror://sourceforge/lib
 http://www.libpng.org/
 as-is
 Portable Network Graphics library
-~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 eutils libtool multilib portability toolchain-funcs user
 apng static-libs
 
diff --git a/metadata/cache/media-libs/libvisio-0.0.11 b/metadata/cache/media-libs/libvisio-0.0.11
index 9d7a7a7894c9..399a415193ea 100644
--- a/metadata/cache/media-libs/libvisio-0.0.11
+++ b/metadata/cache/media-libs/libvisio-0.0.11
@@ -1,4 +1,4 @@
-sys-devel/libtool doc? ( app-doc/doxygen )
+dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen )
 app-text/libwpd:0.9 app-text/libwpg:0.2
 0
 http://dev-www.libreoffice.org/src/libvisio-0.0.11.tar.xz
diff --git a/metadata/cache/media-libs/libvisio-0.0.8 b/metadata/cache/media-libs/libvisio-0.0.8
index ca41e0c80a58..45e13815fac2 100644
--- a/metadata/cache/media-libs/libvisio-0.0.8
+++ b/metadata/cache/media-libs/libvisio-0.0.8
@@ -1,4 +1,4 @@
-sys-devel/libtool doc? ( app-doc/doxygen )
+dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen )
 app-text/libwpd:0.9 app-text/libwpg:0.2
 0
 http://dev-www.libreoffice.org/src/libvisio-0.0.8.tar.xz
diff --git a/metadata/cache/media-libs/libvisio-9999 b/metadata/cache/media-libs/libvisio-9999
index 58a68a4f19f3..713fce522104 100644
--- a/metadata/cache/media-libs/libvisio-9999
+++ b/metadata/cache/media-libs/libvisio-9999
@@ -1,4 +1,4 @@
-sys-devel/libtool doc? ( app-doc/doxygen ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/git
+dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/git
 app-text/libwpd:0.9 app-text/libwpg:0.2
 0
 
diff --git a/metadata/cache/media-libs/netpbm-10.56.00 b/metadata/cache/media-libs/netpbm-10.56.00
new file mode 100644
index 000000000000..2ada0d9879fc
--- /dev/null
+++ b/metadata/cache/media-libs/netpbm-10.56.00
@@ -0,0 +1,22 @@
+jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 ) app-arch/xz-utils sys-devel/flex
+jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
+0
+mirror://gentoo/netpbm-10.56.00.tar.xz
+
+http://netpbm.sourceforge.net/
+GPL-2
+A set of utilities for converting to/from the netpbm (and related) formats
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+eutils multilib portability toolchain-funcs user
+jbig jpeg jpeg2k png rle svga tiff X xml zlib
+
+
+
+3
+
+compile configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/media-libs/sdl-gfx-2.0.23 b/metadata/cache/media-libs/sdl-gfx-2.0.23
new file mode 100644
index 000000000000..b79bef61275d
--- /dev/null
+++ b/metadata/cache/media-libs/sdl-gfx-2.0.23
@@ -0,0 +1,22 @@
+media-libs/libsdl[video] || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+media-libs/libsdl[video]
+0
+http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.23.tar.gz
+
+http://www.ferzkopp.net/joomla/content/view/19/14/
+LGPL-2.1
+Graphics drawing primitives library for SDL
+~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+autotools eutils libtool multilib portability toolchain-funcs user
+doc mmx static-libs
+
+
+
+2
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/media-libs/taglib-1.7 b/metadata/cache/media-libs/taglib-1.7
index c63921675a16..9e129e2b9e78 100644
--- a/metadata/cache/media-libs/taglib-1.7
+++ b/metadata/cache/media-libs/taglib-1.7
@@ -6,7 +6,7 @@ http://developer.kde.org/~wheeler/files/src/taglib-1.7.tar.gz
 http://developer.kde.org/~wheeler/taglib.html
 LGPL-2 MPL-1.1
 A library for reading and editing audio meta data
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 +asf debug examples +mp4 test
 
diff --git a/metadata/cache/media-sound/aacplusenc-0.17.1 b/metadata/cache/media-sound/aacplusenc-0.17.1
deleted file mode 100644
index 60f0cc5e6d69..000000000000
--- a/metadata/cache/media-sound/aacplusenc-0.17.1
+++ /dev/null
@@ -1,22 +0,0 @@
-sci-libs/fftw:3.0 sys-apps/sed
-sci-libs/fftw:3.0
-0
-http://teknoraver.net/software/mp4tools/aacplusenc-0.17.1.tar.bz2
-mirror
-http://teknoraver.net/software/mp4tools/
-GPL-1
-High-Efficiency AAC (AAC+) Encoder
-~amd64 ~x86
-eutils multilib portability toolchain-funcs user
-
-
-
-
-2
-
-compile configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-sound/gnomad-2.9.4-r2 b/metadata/cache/media-sound/gnomad-2.9.4-r2
deleted file mode 100644
index 4c92d16f942e..000000000000
--- a/metadata/cache/media-sound/gnomad-2.9.4-r2
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/dbus-glib-0.88 >=x11-libs/gtk+-2.6:2 media-libs/libnjb media-libs/libmtp >=media-libs/taglib-1.5 >=media-libs/libid3tag-0.15.1b dev-util/pkgconfig nls? ( sys-devel/gettext dev-util/intltool ) >=sys-apps/sed-4
->=dev-libs/dbus-glib-0.88 >=x11-libs/gtk+-2.6:2 media-libs/libnjb media-libs/libmtp >=media-libs/taglib-1.5 >=media-libs/libid3tag-0.15.1b
-0
-mirror://sourceforge/gnomad2/gnomad2-2.9.4.tar.gz
-
-http://gnomad2.sourceforge.net
-GPL-2
-A GNOME2 frontend for Creative Players (Zen, JukeBox, etc ...)
-amd64 ~ppc ~ppc64 x86
-eutils fdo-mime flag-o-matic gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
-nls
-
-
-
-2
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-sound/ncmpcpp-0.5.8 b/metadata/cache/media-sound/ncmpcpp-0.5.8
index 58d3f254dcc5..1318e34f5dd7 100644
--- a/metadata/cache/media-sound/ncmpcpp-0.5.8
+++ b/metadata/cache/media-sound/ncmpcpp-0.5.8
@@ -6,7 +6,7 @@ http://unkart.ovh.org/ncmpcpp/ncmpcpp-0.5.8.tar.bz2
 http://unkart.ovh.org/ncmpcpp
 GPL-2
 An ncurses mpd client, ncmpc clone with some new features, written in C++
-amd64 ~arm hppa ~ppc ~sparc ~x86
+amd64 arm hppa ~ppc ~sparc ~x86
 bash-completion-r1 eutils multilib portability toolchain-funcs user
 bash-completion clock curl fftw iconv outputs taglib unicode visualizer
 
diff --git a/metadata/cache/media-sound/rosegarden-10.04 b/metadata/cache/media-sound/rosegarden-10.04
deleted file mode 100644
index f570140bfc7b..000000000000
--- a/metadata/cache/media-sound/rosegarden-10.04
+++ /dev/null
@@ -1,22 +0,0 @@
-<x11-libs/qt-gui-4.7:4 <x11-libs/qt-qt3support-4.7:4 media-libs/ladspa-sdk x11-libs/libSM media-sound/jack-audio-connection-kit media-libs/alsa-lib >=media-libs/dssi-1.0.0 media-libs/liblo media-libs/liblrdf =sci-libs/fftw-3* media-libs/libsamplerate[sndfile] lirc? ( app-misc/lirc ) dev-util/pkgconfig x11-misc/makedepend || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-<x11-libs/qt-gui-4.7:4 <x11-libs/qt-qt3support-4.7:4 media-libs/ladspa-sdk x11-libs/libSM media-sound/jack-audio-connection-kit media-libs/alsa-lib >=media-libs/dssi-1.0.0 media-libs/liblo media-libs/liblrdf =sci-libs/fftw-3* media-libs/libsamplerate[sndfile] lirc? ( app-misc/lirc )
-0
-mirror://sourceforge/rosegarden/rosegarden-10.04.tar.bz2
-
-http://www.rosegardenmusic.com/
-GPL-2
-MIDI and audio sequencer and notation editor
-amd64 ppc x86
-autotools eutils fdo-mime libtool multilib portability toolchain-funcs user
-debug lirc
-
-
-
-2
-
-configure install postinst postrm prepare
-
-
-
-
-
diff --git a/metadata/cache/media-sound/rosegarden-11.06 b/metadata/cache/media-sound/rosegarden-11.06
deleted file mode 100644
index 387afb716271..000000000000
--- a/metadata/cache/media-sound/rosegarden-11.06
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 media-libs/ladspa-sdk x11-libs/libSM media-sound/jack-audio-connection-kit media-libs/alsa-lib >=media-libs/dssi-1.0.0 media-libs/liblo media-libs/liblrdf sci-libs/fftw:3.0 media-libs/libsamplerate[sndfile] lirc? ( app-misc/lirc ) dev-util/pkgconfig x11-misc/makedepend || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 media-libs/ladspa-sdk x11-libs/libSM media-sound/jack-audio-connection-kit media-libs/alsa-lib >=media-libs/dssi-1.0.0 media-libs/liblo media-libs/liblrdf sci-libs/fftw:3.0 media-libs/libsamplerate[sndfile] lirc? ( app-misc/lirc )
-0
-mirror://sourceforge/rosegarden/rosegarden-11.06.tar.bz2
-
-http://www.rosegardenmusic.com/
-GPL-2
-MIDI and audio sequencer and notation editor
-~amd64 ~ppc ~x86
-autotools eutils fdo-mime libtool multilib portability toolchain-funcs user
-debug lirc
-
-
-
-4
-
-configure postinst postrm prepare
-
-
-
-
-
diff --git a/metadata/cache/media-sound/rosegarden-11.11 b/metadata/cache/media-sound/rosegarden-11.11.11
similarity index 73%
rename from metadata/cache/media-sound/rosegarden-11.11
rename to metadata/cache/media-sound/rosegarden-11.11.11
index c6f63eb34cde..d6f299fcafcb 100644
--- a/metadata/cache/media-sound/rosegarden-11.11
+++ b/metadata/cache/media-sound/rosegarden-11.11.11
@@ -1,20 +1,20 @@
-x11-libs/qt-gui:4 media-libs/ladspa-sdk x11-libs/libSM media-sound/jack-audio-connection-kit media-libs/alsa-lib >=media-libs/dssi-1.0.0 media-libs/liblo media-libs/liblrdf sci-libs/fftw:3.0 media-libs/libsamplerate[sndfile] lirc? ( app-misc/lirc ) dev-util/pkgconfig x11-misc/makedepend || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+x11-libs/qt-gui:4 media-libs/ladspa-sdk x11-libs/libSM media-sound/jack-audio-connection-kit media-libs/alsa-lib >=media-libs/dssi-1.0.0 media-libs/liblo media-libs/liblrdf sci-libs/fftw:3.0 media-libs/libsamplerate[sndfile] lirc? ( app-misc/lirc ) dev-util/pkgconfig x11-misc/makedepend || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4
 x11-libs/qt-gui:4 media-libs/ladspa-sdk x11-libs/libSM media-sound/jack-audio-connection-kit media-libs/alsa-lib >=media-libs/dssi-1.0.0 media-libs/liblo media-libs/liblrdf sci-libs/fftw:3.0 media-libs/libsamplerate[sndfile] lirc? ( app-misc/lirc )
 0
-mirror://sourceforge/rosegarden/rosegarden-11.11.tar.bz2
+mirror://sourceforge/rosegarden/rosegarden-11.11.11.tar.bz2
 
 http://www.rosegardenmusic.com/
 GPL-2
 MIDI and audio sequencer and notation editor
 ~amd64 ~ppc ~x86
-autotools eutils fdo-mime libtool multilib portability toolchain-funcs user
+autotools eutils fdo-mime gnome2-utils libtool multilib portability toolchain-funcs user
 debug lirc
 
 
 
 4
 
-configure postinst postrm prepare
+configure postinst postrm preinst prepare
 
 
 
diff --git a/metadata/cache/media-sound/squeezeslave-1.1_p262 b/metadata/cache/media-sound/squeezeslave-1.1_p309
similarity index 73%
rename from metadata/cache/media-sound/squeezeslave-1.1_p262
rename to metadata/cache/media-sound/squeezeslave-1.1_p309
index 0d4b77401bc3..48b2a6e179f6 100644
--- a/metadata/cache/media-sound/squeezeslave-1.1_p262
+++ b/metadata/cache/media-sound/squeezeslave-1.1_p309
@@ -1,14 +1,14 @@
-media-libs/libmad media-libs/flac media-libs/libvorbis media-libs/libogg media-libs/portaudio[alsa?] aac? ( virtual/ffmpeg ) wma? ( virtual/ffmpeg ) display? ( app-misc/lirc ) dev-util/pkgconfig
+media-libs/libmad media-libs/flac media-libs/libvorbis media-libs/libogg media-libs/portaudio[alsa?] aac? ( virtual/ffmpeg ) wma? ( virtual/ffmpeg ) display? ( app-misc/lirc ) app-arch/xz-utils dev-util/pkgconfig
 media-libs/libmad media-libs/flac media-libs/libvorbis media-libs/libogg media-libs/portaudio[alsa?] aac? ( virtual/ffmpeg ) wma? ( virtual/ffmpeg ) display? ( app-misc/lirc )
 0
-http://dev.gentoo.org/~radhermit/distfiles/squeezeslave-1.1_p262.tar.xz
+http://dev.gentoo.org/~radhermit/distfiles/squeezeslave-1.1_p309.tar.xz
 
 http://squeezeslave.googlecode.com
 GPL-2
 A lightweight streaming audio player for squeezeboxserver
 ~amd64 ~x86
 eutils multilib portability toolchain-funcs user
-aac +alsa display wma
+aac +alsa display wma zones
 
 
 
diff --git a/metadata/cache/net-analyzer/icinga-1.5.1-r3 b/metadata/cache/net-analyzer/icinga-1.5.1-r3
deleted file mode 100644
index c5bbf1cc238d..000000000000
--- a/metadata/cache/net-analyzer/icinga-1.5.1-r3
+++ /dev/null
@@ -1,22 +0,0 @@
-idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) perl? ( dev-lang/perl ) virtual/mailx web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] ) apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) ) ) !net-analyzer/nagios-core apache2? ( =www-servers/apache-2* )
-idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) perl? ( dev-lang/perl ) virtual/mailx web? ( media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] ) apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) ) ) !net-analyzer/nagios-core plugins? ( net-analyzer/nagios-plugins ) apache2? ( =www-servers/apache-2* )
-0
-mirror://sourceforge/icinga/icinga-1.5.1.tar.gz
-
-http://www.icinga.org/
-GPL-2
-Nagios Fork - Check daemon, CGIs, docs, IDOutils
-~amd64 ~x86
-depend.apache eutils multilib portability toolchain-funcs user
-+apache2 api debug +idoutils lighttpd +mysql perl plugins postgres ssl +vim-syntax +web apache2
-
-
-
-2
-
-compile configure install postinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/net-analyzer/icinga-1.6.1 b/metadata/cache/net-analyzer/icinga-1.6.1-r1
similarity index 100%
rename from metadata/cache/net-analyzer/icinga-1.6.1
rename to metadata/cache/net-analyzer/icinga-1.6.1-r1
diff --git a/metadata/cache/net-im/bitlbee-3.0.4 b/metadata/cache/net-im/bitlbee-3.0.4
new file mode 100644
index 000000000000..687ac11092ae
--- /dev/null
+++ b/metadata/cache/net-im/bitlbee-3.0.4
@@ -0,0 +1,22 @@
+purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent ) !libevent? ( >=dev-libs/glib-2.4 ) otr? ( net-libs/libotr ) gnutls? ( net-libs/gnutls ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( ssl? ( dev-libs/openssl ) ) ) dev-util/pkgconfig test? ( dev-libs/check )
+purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent ) !libevent? ( >=dev-libs/glib-2.4 ) otr? ( net-libs/libotr ) gnutls? ( net-libs/gnutls ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( ssl? ( dev-libs/openssl ) ) ) virtual/logger xinetd? ( sys-apps/xinetd )
+0
+http://get.bitlbee.org/src/bitlbee-3.0.4.tar.gz
+
+http://www.bitlbee.org/
+GPL-2
+irc to IM gateway that support multiple IM protocols
+~amd64 ~ppc ~x86 ~x86-fbsd
+eutils multilib portability toolchain-funcs user
+debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple ssl test twitter +yahoo xinetd
+^^ ( purple || ( jabber msn oscar yahoo ) ) msn? ( || ( gnutls nss ssl ) ) jabber? ( !nss )
+
+
+4
+
+configure install postinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/net-irc/irssi-xmpp-0.51 b/metadata/cache/net-irc/irssi-xmpp-0.51
index 5dfce884e4a5..f8f666d2ba8e 100644
--- a/metadata/cache/net-irc/irssi-xmpp-0.51
+++ b/metadata/cache/net-irc/irssi-xmpp-0.51
@@ -1,5 +1,5 @@
->=net-irc/irssi-0.8.13 >=net-libs/loudmouth-1.2.0[debug]
->=net-irc/irssi-0.8.13 >=net-libs/loudmouth-1.2.0[debug]
+net-irc/irssi net-libs/loudmouth
+net-irc/irssi net-libs/loudmouth
 0
 http://cybione.org/~irssi-xmpp/files/irssi-xmpp-0.51.tar.gz
 
diff --git a/metadata/cache/net-libs/libpcap-1.1.1-r1 b/metadata/cache/net-libs/libpcap-1.1.1-r1
index d67d782368fa..520400d5ee28 100644
--- a/metadata/cache/net-libs/libpcap-1.1.1-r1
+++ b/metadata/cache/net-libs/libpcap-1.1.1-r1
@@ -6,7 +6,7 @@ http://www.tcpdump.org/release/libpcap-1.1.1.tar.gz http://www.jp.tcpdump.org/re
 http://www.tcpdump.org/
 BSD
 A system-independent library for user-level network packet capture
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 autotools eutils libtool multilib portability toolchain-funcs user
 bluetooth ipv6 libnl static-libs
 
diff --git a/metadata/cache/net-libs/loudmouth-1.4.3 b/metadata/cache/net-libs/loudmouth-1.4.3
index e62f71be5ce3..8960843059d8 100644
--- a/metadata/cache/net-libs/loudmouth-1.4.3
+++ b/metadata/cache/net-libs/loudmouth-1.4.3
@@ -1,5 +1,5 @@
->=dev-libs/glib-2.4 ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns ) test? ( dev-libs/check ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) >=dev-util/gtk-doc-am-1 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4
->=dev-libs/glib-2.4 ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns )
+>=dev-libs/glib-2.4 net-dns/libidn ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns ) test? ( dev-libs/check ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) >=dev-util/gtk-doc-am-1 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.4 net-dns/libidn ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns )
 0
 mirror://gnome/sources/loudmouth/1.4/loudmouth-1.4.3.tar.bz2
 
diff --git a/metadata/cache/net-libs/loudmouth-1.4.3-r1 b/metadata/cache/net-libs/loudmouth-1.4.3-r1
index 2800b7b913f1..5c9f01d3f384 100644
--- a/metadata/cache/net-libs/loudmouth-1.4.3-r1
+++ b/metadata/cache/net-libs/loudmouth-1.4.3-r1
@@ -1,5 +1,5 @@
->=dev-libs/glib-2.4 ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns ) test? ( dev-libs/check ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) >=dev-util/gtk-doc-am-1 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4
->=dev-libs/glib-2.4 ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns )
+>=dev-libs/glib-2.4 net-dns/libidn ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns ) test? ( dev-libs/check ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) >=dev-util/gtk-doc-am-1 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.4 net-dns/libidn ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns )
 0
 mirror://gnome/sources/loudmouth/1.4/loudmouth-1.4.3.tar.bz2
 
diff --git a/metadata/cache/net-libs/loudmouth-1.4.3-r2 b/metadata/cache/net-libs/loudmouth-1.4.3-r2
index cf2cf90ed324..7a67833dc9f7 100644
--- a/metadata/cache/net-libs/loudmouth-1.4.3-r2
+++ b/metadata/cache/net-libs/loudmouth-1.4.3-r2
@@ -1,5 +1,5 @@
->=dev-libs/glib-2.4 ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns ) test? ( dev-libs/check ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) >=dev-util/gtk-doc-am-1 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4
->=dev-libs/glib-2.4 ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns )
+>=dev-libs/glib-2.4 net-dns/libidn ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns ) test? ( dev-libs/check ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) >=dev-util/gtk-doc-am-1 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.4 net-dns/libidn ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns )
 0
 mirror://gnome/sources/loudmouth/1.4/loudmouth-1.4.3.tar.bz2
 
diff --git a/metadata/cache/net-mail/gnubiff-2.2.13-r1 b/metadata/cache/net-mail/gnubiff-2.2.13-r1
deleted file mode 100644
index 0c3aea3c0785..000000000000
--- a/metadata/cache/net-mail/gnubiff-2.2.13-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=x11-libs/gtk+-2.6:2 >=gnome-base/libglade-2.3 dev-libs/popt gnome? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 ) password? ( dev-libs/openssl ) fam? ( virtual/fam ) x11-proto/xproto dev-util/pkgconfig
->=x11-libs/gtk+-2.6:2 >=gnome-base/libglade-2.3 dev-libs/popt gnome? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 ) password? ( dev-libs/openssl ) fam? ( virtual/fam ) x11-proto/xproto
-0
-mirror://sourceforge/gnubiff/gnubiff-2.2.13.tar.gz
-
-http://gnubiff.sourceforge.net/
-GPL-3
-A mail notification program
-amd64 x86
-eutils multilib portability toolchain-funcs user
-debug fam gnome nls password
-
-
-
-3
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/net-misc/autossh-1.4b b/metadata/cache/net-misc/autossh-1.4b
deleted file mode 100644
index 03bb68a4083b..000000000000
--- a/metadata/cache/net-misc/autossh-1.4b
+++ /dev/null
@@ -1,22 +0,0 @@
-
-net-misc/openssh
-0
-http://www.harding.motd.ca/autossh/autossh-1.4b.tgz
-
-http://www.harding.motd.ca/autossh/
-BSD
-Automatically restart SSH sessions and tunnels
-alpha amd64 ~arm ~hppa ia64 ~ppc ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
-
-
-
-
-
-2
-
-install prepare
-
-
-
-
-
diff --git a/metadata/cache/net-misc/autossh-1.4c b/metadata/cache/net-misc/autossh-1.4c
index 848e75e9d135..247761532681 100644
--- a/metadata/cache/net-misc/autossh-1.4c
+++ b/metadata/cache/net-misc/autossh-1.4c
@@ -6,7 +6,7 @@ http://www.harding.motd.ca/autossh/autossh-1.4c.tgz
 http://www.harding.motd.ca/autossh/
 BSD
 Automatically restart SSH sessions and tunnels
-~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
+amd64 ~arm ~hppa ~ppc ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
 
 
 
diff --git a/metadata/cache/net-misc/dhcp-4.2.2-r3 b/metadata/cache/net-misc/dhcp-4.2.2-r3
new file mode 100644
index 000000000000..8f11e951c351
--- /dev/null
+++ b/metadata/cache/net-misc/dhcp-4.2.2-r3
@@ -0,0 +1,22 @@
+selinux? ( sec-policy/selinux-dhcp ) kernel_linux? ( sys-apps/net-tools ) ldap? ( net-nds/openldap ssl? ( dev-libs/openssl ) )
+selinux? ( sec-policy/selinux-dhcp ) kernel_linux? ( sys-apps/net-tools ) ldap? ( net-nds/openldap ssl? ( dev-libs/openssl ) ) vim-syntax? ( app-vim/dhcpd-syntax )
+0
+ftp://ftp.isc.org/isc/dhcp/dhcp-4.2.2.tar.gz
+
+http://www.isc.org/products/DHCP
+as-is BSD
+ISC Dynamic Host Configuration Protocol (DHCP) client/server
+~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+eutils multilib portability toolchain-funcs user
++client ipv6 kernel_linux ldap selinux +server ssl vim-syntax
+
+
+
+2
+
+compile configure install postinst preinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/perl-core/Pod-Simple-3.160.0 b/metadata/cache/perl-core/Pod-Simple-3.160.0
index 449687bfa88d..03137fa1d719 100644
--- a/metadata/cache/perl-core/Pod-Simple-3.160.0
+++ b/metadata/cache/perl-core/Pod-Simple-3.160.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/D/DW/DWHEELER/Pod-Simple-3.16.tar.gz
 http://search.cpan.org/dist/Pod-Simple/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Framework for parsing Pod
-~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 alternatives base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/perl-core/Time-HiRes-1.972.200 b/metadata/cache/perl-core/Time-HiRes-1.972.200
index c07b230877dd..c0e72b1a2561 100644
--- a/metadata/cache/perl-core/Time-HiRes-1.972.200
+++ b/metadata/cache/perl-core/Time-HiRes-1.972.200
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/Z/ZE/ZEFRAM/Time-HiRes-1.9722.tar.gz
 http://search.cpan.org/dist/Time-HiRes/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Perl Time::HiRes. High resolution alarm, sleep, gettimeofday, interval timers
-~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 alternatives base eutils multilib perl-module portability toolchain-funcs user
 
 
diff --git a/metadata/cache/sci-chemistry/imosflm-1.0.5 b/metadata/cache/sci-chemistry/imosflm-1.0.5
index f9ba5fb77b51..fadc0763b98e 100644
--- a/metadata/cache/sci-chemistry/imosflm-1.0.5
+++ b/metadata/cache/sci-chemistry/imosflm-1.0.5
@@ -6,7 +6,7 @@ http://www.mrc-lmb.cam.ac.uk/harry/imosflm/ver105/downloads/imosflm-1.0.5.zip
 http://www.mrc-lmb.cam.ac.uk/harry/imosflm
 ccp4
 A new GUI for the Mosflm crystallographic data processing tool
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 eutils multilib portability toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/sci-libs/cctbx-2010.03.29.2334-r5 b/metadata/cache/sci-libs/cctbx-2010.03.29.2334-r5
new file mode 100644
index 000000000000..7649e46a2f25
--- /dev/null
+++ b/metadata/cache/sci-libs/cctbx-2010.03.29.2334-r5
@@ -0,0 +1,22 @@
+virtual/fortran >dev-libs/boost-1.39[python] sci-libs/clipper sci-libs/fftw !minimal? ( sci-chemistry/cns sci-chemistry/shelx ) >=dev-util/scons-1.2 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+virtual/fortran >dev-libs/boost-1.39[python] sci-libs/clipper sci-libs/fftw !minimal? ( sci-chemistry/cns sci-chemistry/shelx ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+http://cci.lbl.gov/cctbx_build/results/2010_03_29_2334/cctbx_bundle.tar.gz -> cctbx-2010.03.29.2334.tar.gz
+
+http://cctbx.sourceforge.net/
+cctbx-2.0
+Computational Crystallography Toolbox
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+eutils fortran-2 multilib portability prefix python toolchain-funcs user
++minimal openmp threads
+
+
+
+3
+
+compile configure install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/sci-mathematics/gmm-3.1 b/metadata/cache/sci-mathematics/gmm-3.1
index 2c2ee0597e93..99c7aa850b67 100644
--- a/metadata/cache/sci-mathematics/gmm-3.1
+++ b/metadata/cache/sci-mathematics/gmm-3.1
@@ -6,7 +6,7 @@ http://download.gna.org/getfem/stable/gmm-3.1.tar.gz
 http://www-gmm.insa-toulouse.fr/getfem/
 LGPL-2.1
 Generic C++ template library for sparse, dense and skyline matrices
-alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
+amd64 hppa ppc ppc64 x86 ~x86-fbsd
 eutils multilib portability toolchain-funcs user
 
 
diff --git a/metadata/cache/sci-mathematics/gmm-4.1 b/metadata/cache/sci-mathematics/gmm-4.1
index 75872c04e595..978e886eaaea 100644
--- a/metadata/cache/sci-mathematics/gmm-4.1
+++ b/metadata/cache/sci-mathematics/gmm-4.1
@@ -6,7 +6,7 @@ http://download.gna.org/getfem/stable/gmm-4.1.tar.gz
 http://www-gmm.insa-toulouse.fr/getfem/
 LGPL-2.1
 Generic C++ template library for sparse, dense and skyline matrices
-~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+amd64 hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 
 
 
diff --git a/metadata/cache/sec-policy/selinux-base-policy-2.20110726-r7 b/metadata/cache/sec-policy/selinux-base-policy-2.20110726-r7
new file mode 100644
index 000000000000..28043848f944
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-base-policy-2.20110726-r7
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-1.30.30 >=sys-fs/udev-151 sys-devel/m4 >=sys-apps/checkpolicy-1.30.12
+>=sys-apps/policycoreutils-1.30.30 >=sys-fs/udev-151
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+Gentoo base policy for SELinux
+~amd64 ~x86
+eutils multilib portability toolchain-funcs user
++peer_perms +open_perms +ubac doc
+
+
+
+4
+
+compile configure install postinst preinst prepare
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-denyhosts-2.20110726 b/metadata/cache/sec-policy/selinux-denyhosts-2.20110726
new file mode 100644
index 000000000000..d68e43d55d93
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-denyhosts-2.20110726
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for denyhosts
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-dhcp-2.20110726-r1 b/metadata/cache/sec-policy/selinux-dhcp-2.20110726-r1
new file mode 100644
index 000000000000..8665a7ef3532
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-dhcp-2.20110726-r1
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for dhcp
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-dpkg-2.20110726 b/metadata/cache/sec-policy/selinux-dpkg-2.20110726
new file mode 100644
index 000000000000..9c2c1831dec3
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-dpkg-2.20110726
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for dpkg
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-howl-2.20110726 b/metadata/cache/sec-policy/selinux-howl-2.20110726
new file mode 100644
index 000000000000..9d2628450fc6
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-howl-2.20110726
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for howl
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-inetd-2.20110726-r2 b/metadata/cache/sec-policy/selinux-inetd-2.20110726-r2
new file mode 100644
index 000000000000..d652b58877eb
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-inetd-2.20110726-r2
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for inetd
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-mpd-2.20110726 b/metadata/cache/sec-policy/selinux-mpd-2.20110726
new file mode 100644
index 000000000000..6fb73ae551d5
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-mpd-2.20110726
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for mpd
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-ncftool-2.20110726 b/metadata/cache/sec-policy/selinux-ncftool-2.20110726
new file mode 100644
index 000000000000..3dbfcafa73b0
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-ncftool-2.20110726
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for ncftool
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-networkmanager-2.20110726-r2 b/metadata/cache/sec-policy/selinux-networkmanager-2.20110726-r2
new file mode 100644
index 000000000000..dd3e46d057c5
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-networkmanager-2.20110726-r2
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for networkmanager
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-plymouthd-2.20110726 b/metadata/cache/sec-policy/selinux-plymouthd-2.20110726
new file mode 100644
index 000000000000..f5d298e5ff20
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-plymouthd-2.20110726
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for plymouthd
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-qemu-2.20110726-r2 b/metadata/cache/sec-policy/selinux-qemu-2.20110726-r2
new file mode 100644
index 000000000000..c3a7274e5fcb
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-qemu-2.20110726-r2
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for qemu
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-rpm-2.20110726 b/metadata/cache/sec-policy/selinux-rpm-2.20110726
new file mode 100644
index 000000000000..0252bad333b3
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-rpm-2.20110726
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for rpm
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-ucspitcp-2.20110726 b/metadata/cache/sec-policy/selinux-ucspitcp-2.20110726
new file mode 100644
index 000000000000..5489e4f165c5
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-ucspitcp-2.20110726
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for ucspitcp
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-uucp-2.20110726 b/metadata/cache/sec-policy/selinux-uucp-2.20110726
new file mode 100644
index 000000000000..d82b1b1ec660
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-uucp-2.20110726
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for uucp
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-vnstatd-2.20110726 b/metadata/cache/sec-policy/selinux-vnstatd-2.20110726
new file mode 100644
index 000000000000..63605949f81e
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-vnstatd-2.20110726
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for vnstatd
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-wm-2.20110726 b/metadata/cache/sec-policy/selinux-wm-2.20110726
new file mode 100644
index 000000000000..7cd71a9b5893
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-wm-2.20110726
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for wm
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sec-policy/selinux-xprint-2.20110726 b/metadata/cache/sec-policy/selinux-xprint-2.20110726
new file mode 100644
index 000000000000..e455d3e4705a
--- /dev/null
+++ b/metadata/cache/sec-policy/selinux-xprint-2.20110726
@@ -0,0 +1,22 @@
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20110726-r7
+0
+http://oss.tresys.com/files/refpolicy/refpolicy-2.20110726.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2
+
+http://www.gentoo.org/proj/en/hardened/selinux/
+GPL-2
+SELinux policy for xprint
+~amd64 ~x86
+eutils multilib portability selinux-policy-2 toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-apps/ack-1.92 b/metadata/cache/sys-apps/ack-1.92
deleted file mode 100644
index 2b6d44a7e243..000000000000
--- a/metadata/cache/sys-apps/ack-1.92
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-perl/File-Next-1.02 dev-lang/perl
->=dev-perl/File-Next-1.02 dev-lang/perl bash-completion? ( app-admin/eselect )
-0
-mirror://cpan/authors/id/P/PE/PETDANCE/ack-1.92.tar.gz
-
-http://www.petdance.com/ack/
-|| ( Artistic-2 GPL-1 GPL-2 GPL-3 )
-ack is a tool like grep, aimed at programmers with large trees of heterogeneous source code
-amd64 x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos
-base bash-completion eutils multilib perl-module portability toolchain-funcs user
-bash-completion
-
-bash-completion? ( app-shells/bash-completion )
-
-
-
-compile install postinst postrm preinst prerm setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-apps/elfix-0.4.0 b/metadata/cache/sys-apps/elfix-0.4.1
similarity index 84%
rename from metadata/cache/sys-apps/elfix-0.4.0
rename to metadata/cache/sys-apps/elfix-0.4.1
index 7f0cc3abe116..b2cabcfe588e 100644
--- a/metadata/cache/sys-apps/elfix-0.4.0
+++ b/metadata/cache/sys-apps/elfix-0.4.1
@@ -1,7 +1,7 @@
 dev-libs/elfutils =dev-python/pypax-0.4*[xtpax=] test? ( dev-lang/yasm )
 dev-libs/elfutils =dev-python/pypax-0.4*[xtpax=] test? ( dev-lang/yasm )
 0
-http://dev.gentoo.org/~blueness/elfix/elfix-0.4.0.tar.gz
+http://dev.gentoo.org/~blueness/elfix/elfix-0.4.1.tar.gz
 
 http://dev.gentoo.org/~blueness/elfix/
 GPL-3
diff --git a/metadata/cache/sys-apps/smartmontools-5.42 b/metadata/cache/sys-apps/smartmontools-5.42
index 318e9e1a708f..e2a6c577d0e7 100644
--- a/metadata/cache/sys-apps/smartmontools-5.42
+++ b/metadata/cache/sys-apps/smartmontools-5.42
@@ -6,7 +6,7 @@ mirror://sourceforge/smartmontools/smartmontools-5.42.tar.gz
 http://smartmontools.sourceforge.net/
 GPL-2
 Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools
-~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-linux
+alpha amd64 arm hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-linux
 eutils flag-o-matic multilib portability toolchain-funcs user
 static minimal caps
 
diff --git a/metadata/cache/sys-fs/encfs-1.7.4 b/metadata/cache/sys-fs/encfs-1.7.4
index d5a05629dd6f..578332fc670f 100644
--- a/metadata/cache/sys-fs/encfs-1.7.4
+++ b/metadata/cache/sys-fs/encfs-1.7.4
@@ -6,7 +6,7 @@ http://encfs.googlecode.com/files/encfs-1.7.4.tgz
 http://www.arg0.net/encfs/
 GPL-3
 An implementation of encrypted filesystem in user-space using FUSE
-~amd64 ~sparc x86
+amd64 ~sparc x86
 eutils multilib portability toolchain-funcs user versionator
 xattr
 
diff --git a/metadata/cache/sys-fs/quota-4.00 b/metadata/cache/sys-fs/quota-4.00
index dae0d434845b..a8503053a6a7 100644
--- a/metadata/cache/sys-fs/quota-4.00
+++ b/metadata/cache/sys-fs/quota-4.00
@@ -1,5 +1,5 @@
-ldap? ( >=net-nds/openldap-2.3.35 ) netlink? ( sys-apps/dbus dev-libs/libnl ) rpc? ( net-nds/rpcbind ) tcpd? ( sys-apps/tcp-wrappers ) nls? ( sys-devel/gettext )
-ldap? ( >=net-nds/openldap-2.3.35 ) netlink? ( sys-apps/dbus dev-libs/libnl ) rpc? ( net-nds/rpcbind ) tcpd? ( sys-apps/tcp-wrappers )
+ldap? ( >=net-nds/openldap-2.3.35 ) netlink? ( sys-apps/dbus dev-libs/libnl:1.1 ) rpc? ( net-nds/rpcbind ) tcpd? ( sys-apps/tcp-wrappers ) nls? ( sys-devel/gettext )
+ldap? ( >=net-nds/openldap-2.3.35 ) netlink? ( sys-apps/dbus dev-libs/libnl:1.1 ) rpc? ( net-nds/rpcbind ) tcpd? ( sys-apps/tcp-wrappers )
 0
 mirror://sourceforge/linuxquota/quota-4.00.tar.gz
 
diff --git a/metadata/cache/sys-fs/vhba-20101015-r1 b/metadata/cache/sys-fs/vhba-20101015-r1
index 13c27466bd40..dfa50d3e3dba 100644
--- a/metadata/cache/sys-fs/vhba-20101015-r1
+++ b/metadata/cache/sys-fs/vhba-20101015-r1
@@ -6,7 +6,7 @@ mirror://gentoo/vhba-module-20101015.tar.bz2
 http://cdemu.org
 GPL-2
 Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
-~amd64 x86
+amd64 x86
 eutils linux-info linux-mod multilib portability toolchain-funcs user versionator
 kernel_linux
 
diff --git a/metadata/cache/sys-kernel/hardened-sources-2.6.32-r79 b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r79
new file mode 100644
index 000000000000..42ded45f6e3d
--- /dev/null
+++ b/metadata/cache/sys-kernel/hardened-sources-2.6.32-r79
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+2.6.32-r79
+mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-2.6.32 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-2.6.32.N/deblob-check -> deblob-check-2.6.32 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-2.6.32-81.extras.tar.bz2 mirror://gentoo/genpatches-2.6.32-45.base.tar.bz2 mirror://gentoo/genpatches-2.6.32-45.extras.tar.bz2
+binchecks strip
+http://www.gentoo.org/proj/en/hardened/
+GPL-2 !deblob? ( freedist )
+Hardened kernel sources (kernel series 2.6)
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+4
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.1.4 b/metadata/cache/sys-kernel/hardened-sources-3.1.4
new file mode 100644
index 000000000000..a845c3e2b1d0
--- /dev/null
+++ b/metadata/cache/sys-kernel/hardened-sources-3.1.4
@@ -0,0 +1,22 @@
+!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+!build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
+3.1.4
+mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.1.4-1.extras.tar.bz2 mirror://gentoo/genpatches-3.1-6.base.tar.bz2 mirror://gentoo/genpatches-3.1-6.extras.tar.bz2
+binchecks strip
+http://www.gentoo.org/proj/en/hardened/
+GPL-2 !deblob? ( freedist )
+Hardened kernel sources (kernel series 3.1)
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+eutils kernel-2 multilib portability toolchain-funcs user versionator
+deblob symlink build deblob
+
+!build? ( virtual/dev-manager )
+
+4
+
+compile install postinst postrm preinst setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/linux-headers-2.6.39 b/metadata/cache/sys-kernel/linux-headers-2.6.39
index b07ae5d1c2c1..ae71f99cd986 100644
--- a/metadata/cache/sys-kernel/linux-headers-2.6.39
+++ b/metadata/cache/sys-kernel/linux-headers-2.6.39
@@ -6,7 +6,7 @@ binchecks strip
 http://www.kernel.org/ http://www.gentoo.org/
 GPL-2
 Linux system headers
-~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
+alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 eutils kernel-2 multilib portability toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/sys-libs/glibc-2.13-r4 b/metadata/cache/sys-libs/glibc-2.13-r4
index 4028770a21ac..ec42e0c98b6a 100644
--- a/metadata/cache/sys-libs/glibc-2.13-r4
+++ b/metadata/cache/sys-libs/glibc-2.13-r4
@@ -6,7 +6,7 @@ strip
 http://www.gnu.org/software/libc/libc.html
 LGPL-2
 GNU libc6 (also called glibc2) C library
-~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 eutils flag-o-matic gnuconfig libtool multilib portability toolchain-funcs user versionator
 debug gd glibc-omitfp hardened multilib nls selinux profile vanilla crosscompile_opts_headers-only
 
diff --git a/metadata/cache/sys-libs/libixp-0.5_p20110208 b/metadata/cache/sys-libs/libixp-0.5_p20110208-r2
similarity index 87%
rename from metadata/cache/sys-libs/libixp-0.5_p20110208
rename to metadata/cache/sys-libs/libixp-0.5_p20110208-r2
index 0fa55ce377e0..e0a4fd7cde2c 100644
--- a/metadata/cache/sys-libs/libixp-0.5_p20110208
+++ b/metadata/cache/sys-libs/libixp-0.5_p20110208-r2
@@ -12,9 +12,9 @@ multilib toolchain-funcs
 
 
 
-3
+4
 
-compile install setup
+compile install prepare setup
 
 
 
diff --git a/metadata/cache/sys-process/psmisc-22.14 b/metadata/cache/sys-process/psmisc-22.14
index b1a90639298f..82a9ac798666 100644
--- a/metadata/cache/sys-process/psmisc-22.14
+++ b/metadata/cache/sys-process/psmisc-22.14
@@ -6,7 +6,7 @@ mirror://sourceforge/psmisc/psmisc-22.14.tar.gz
 http://psmisc.sourceforge.net/
 GPL-2
 A set of tools that use the proc filesystem
-~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
+alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
 autotools eutils libtool multilib portability toolchain-funcs user
 ipv6 nls selinux X
 
diff --git a/metadata/cache/virtual/ruby-minitest-0-r1 b/metadata/cache/virtual/ruby-minitest-0-r1
index d985c54e0c1b..e878b81b3e50 100644
--- a/metadata/cache/virtual/ruby-minitest-0-r1
+++ b/metadata/cache/virtual/ruby-minitest-0-r1
@@ -6,7 +6,7 @@ ruby_targets_ruby18? ( dev-ruby/minitest[ruby_targets_ruby18] ) ruby_targets_ree
 
 
 Virtual ebuild for the Ruby minitest library
-~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 eutils java-utils-2 multilib portability ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby
 
diff --git a/metadata/cache/x11-libs/libfm-0.1.17 b/metadata/cache/x11-libs/libfm-0.1.17
index 67c8e323bc95..a93aa8a38032 100644
--- a/metadata/cache/x11-libs/libfm-0.1.17
+++ b/metadata/cache/x11-libs/libfm-0.1.17
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~hwoarang/distfiles/libfm-0.1.17.tar.gz
 http://pcmanfm.sourceforge.net/
 GPL-2
 A library for file management
-~alpha ~amd64 ~arm ~ppc ~x86 ~x86-linux
+~alpha amd64 ~arm ~ppc ~x86 ~x86-linux
 autotools eutils fdo-mime libtool multilib portability toolchain-funcs user
 debug examples udev
 
diff --git a/metadata/cache/x11-misc/devilspie-0.22 b/metadata/cache/x11-misc/devilspie-0.22
index 38ba0079c2f0..316f3dbe9a5a 100644
--- a/metadata/cache/x11-misc/devilspie-0.22
+++ b/metadata/cache/x11-misc/devilspie-0.22
@@ -1,5 +1,5 @@
->=dev-libs/glib-2.10 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 dev-util/pkgconfig dev-util/intltool sys-devel/gettext gnome-base/gnome-common || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
->=dev-libs/glib-2.10 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1
+>=dev-libs/glib-2.10 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libX11 dev-util/pkgconfig dev-util/intltool sys-devel/gettext gnome-base/gnome-common || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=dev-libs/glib-2.10 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libX11
 0
 http://www.burtonini.com/computing/devilspie-0.22.tar.gz
 
diff --git a/metadata/cache/x11-misc/i855crt-0.4-r1 b/metadata/cache/x11-misc/i855crt-0.4-r1
index 2665f1d8835f..6639be13bdc0 100644
--- a/metadata/cache/x11-misc/i855crt-0.4-r1
+++ b/metadata/cache/x11-misc/i855crt-0.4-r1
@@ -1,5 +1,5 @@
-x11-libs/libXext x11-libs/libXv
-x11-libs/libXext x11-libs/libXv
+x11-libs/libX11 x11-libs/libXv
+x11-libs/libX11 x11-libs/libXv
 0
 mirror://sourceforge/i855crt/i855crt-0.4.tar.gz
 
@@ -12,9 +12,9 @@ eutils multilib portability toolchain-funcs user
 
 
 
+4
 
-
-install unpack
+install prepare
 
 
 
diff --git a/metadata/cache/x11-misc/pcmanfm-0.9.10 b/metadata/cache/x11-misc/pcmanfm-0.9.10
index d6ccc07e66d4..4eaf1e755d47 100644
--- a/metadata/cache/x11-misc/pcmanfm-0.9.10
+++ b/metadata/cache/x11-misc/pcmanfm-0.9.10
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~hwoarang/distfiles/pcmanfm-0.9.10.tar.gz
 http://pcmanfm.sourceforge.net/
 GPL-2
 Fast lightweight tabbed filemanager
-~alpha ~amd64 ~arm ~ppc ~x86 ~x86-linux
+~alpha amd64 ~arm ~ppc ~x86 ~x86-linux
 autotools eutils fdo-mime libtool multilib portability toolchain-funcs user
 debug
 
diff --git a/metadata/cache/x11-misc/xautomation-1.01 b/metadata/cache/x11-misc/xautomation-1.01
index 734f389ee92f..0309de0bad50 100644
--- a/metadata/cache/x11-misc/xautomation-1.01
+++ b/metadata/cache/x11-misc/xautomation-1.01
@@ -1,5 +1,5 @@
-x11-libs/libXtst x11-libs/libXt x11-libs/libX11 x11-proto/inputproto x11-proto/xextproto x11-proto/xproto media-libs/libpng
-x11-libs/libXtst x11-libs/libXt x11-libs/libX11
+media-libs/libpng x11-libs/libX11 x11-libs/libXtst x11-proto/inputproto x11-proto/xextproto x11-proto/xproto
+media-libs/libpng x11-libs/libX11 x11-libs/libXtst
 0
 http://hoopajoo.net/static/projects/xautomation-1.01.tar.gz
 
diff --git a/metadata/cache/x11-misc/xautomation-1.03 b/metadata/cache/x11-misc/xautomation-1.03
index e147978079aa..a1fde5d2b871 100644
--- a/metadata/cache/x11-misc/xautomation-1.03
+++ b/metadata/cache/x11-misc/xautomation-1.03
@@ -1,5 +1,5 @@
-x11-libs/libXtst x11-libs/libXt x11-libs/libX11 x11-proto/inputproto x11-proto/xextproto x11-proto/xproto media-libs/libpng
-x11-libs/libXtst x11-libs/libXt x11-libs/libX11
+media-libs/libpng x11-libs/libX11 x11-libs/libXtst x11-proto/inputproto x11-proto/xextproto x11-proto/xproto
+media-libs/libpng x11-libs/libX11 x11-libs/libXtst
 0
 http://hoopajoo.net/static/projects/xautomation-1.03.tar.gz
 
diff --git a/metadata/cache/x11-misc/xautomation-1.05 b/metadata/cache/x11-misc/xautomation-1.05
new file mode 100644
index 000000000000..caa84885b2c3
--- /dev/null
+++ b/metadata/cache/x11-misc/xautomation-1.05
@@ -0,0 +1,22 @@
+media-libs/libpng x11-libs/libX11 x11-libs/libXtst x11-proto/inputproto x11-proto/xextproto x11-proto/xproto
+media-libs/libpng x11-libs/libX11 x11-libs/libXtst
+0
+http://hoopajoo.net/static/projects/xautomation-1.05.tar.gz
+
+http://hoopajoo.net/projects/xautomation.html
+GPL-2
+Control X from command line and find things on screen
+~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+
+
+
+
+
+4
+
+prepare
+
+
+
+
+
diff --git a/metadata/cache/x11-wm/wmii-3.9.2-r1 b/metadata/cache/x11-wm/wmii-3.9.2-r1
deleted file mode 100644
index 9f2fe9b10f42..000000000000
--- a/metadata/cache/x11-wm/wmii-3.9.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/libXft x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/libX11 x11-libs/libXinerama >=media-libs/freetype-2 dev-util/pkgconfig
-x11-libs/libXft x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/libX11 x11-libs/libXinerama >=media-libs/freetype-2 x11-apps/xmessage x11-apps/xsetroot media-fonts/font-misc-misc
-0
-http://dl.suckless.org/wmii/wmii+ixp-3.9.2.tbz
-
-http://wmii.suckless.org/
-MIT
-A dynamic window manager for X11
-~amd64 ~hppa ~ppc ~ppc64 ~x86
-eutils flag-o-matic multilib portability toolchain-funcs user
-
-
-
-
-2
-
-compile install prepare setup
-
-
-
-
-
diff --git a/metadata/cache/x11-wm/wmii-3.9.2-r2 b/metadata/cache/x11-wm/wmii-3.9.2-r2
new file mode 100644
index 000000000000..50b6e160fe3c
--- /dev/null
+++ b/metadata/cache/x11-wm/wmii-3.9.2-r2
@@ -0,0 +1,22 @@
+>=sys-libs/libixp-0.5_p20110208-r2 x11-libs/libXft x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/libX11 x11-libs/libXinerama >=media-libs/freetype-2 dev-util/pkgconfig
+>=sys-libs/libixp-0.5_p20110208-r2 x11-libs/libXft x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/libX11 x11-libs/libXinerama >=media-libs/freetype-2 x11-apps/xmessage x11-apps/xsetroot media-fonts/font-misc-misc
+0
+http://dl.suckless.org/wmii/wmii+ixp-3.9.2.tbz
+
+http://wmii.suckless.org/
+MIT
+A dynamic window manager for X11
+~amd64 ~hppa ~ppc ~ppc64 ~x86
+eutils flag-o-matic multilib portability toolchain-funcs user
+
+
+
+
+2
+
+compile install prepare setup
+
+
+
+
+
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index dce690bd695d..d3a4641496b4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Dec 2011 15:36:44 +0000
+Mon, 05 Dec 2011 01:06:44 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index dce690bd695d..d3a4641496b4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Dec 2011 15:36:44 +0000
+Mon, 05 Dec 2011 01:06:44 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6090e37796ca..7b2cbbf09bb8 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Dec 2011 15:36:46 +0000
+Mon, 05 Dec 2011 01:06:46 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index bb89acfc29bc..099a7148ef56 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Dec  4 15:36:44 UTC 2011
+Mon Dec  5 01:06:44 UTC 2011
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 56eb8a9d64b0..f9ad84baa110 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 04 Dec 2011 16:00:01 +0000
+Mon, 05 Dec 2011 01:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index cfc84440ecfb..cac95dcac61b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1323012901 Sun Dec  4 15:35:01 2011 UTC
+1323047101 Mon Dec  5 01:05:01 2011 UTC
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 1c0db450dc20..20c08af5e38a 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,2 +1 @@
-DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
 DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
diff --git a/net-analyzer/icinga/files/icinga-init.d-2 b/net-analyzer/icinga/files/icinga-init.d-2
index 062a33aadb7d..8f05cc7dcdce 100755
--- a/net-analyzer/icinga/files/icinga-init.d-2
+++ b/net-analyzer/icinga/files/icinga-init.d-2
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 
-opts="${opts} reload checkconfig"
+extra_commands="${extra_commands} reload checkconfig"
 
 depend() {
 	need net
 	use dns logger firewall
-	after mysql postgresql
+	after mysql postgresql ido2db
 }
 
 reload()
diff --git a/net-analyzer/icinga/files/ido2db-init.d b/net-analyzer/icinga/files/ido2db-init.d
index 75051abbf934..302a24881959 100644
--- a/net-analyzer/icinga/files/ido2db-init.d
+++ b/net-analyzer/icinga/files/ido2db-init.d
@@ -1,17 +1,18 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d,v 1.1 2011/11/15 00:14:29 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d,v 1.2 2011/12/04 19:27:46 prometheanfire Exp $
 
 IDO2DBBIN="/usr/sbin/ido2db"
-SOCKET="/var/icinga/ido.sock"
+IDO2DBSOCKET="/var/lib/icinga/ido.sock"
+IDO2DBLOCK="/var/lib/icinga/ido2db.lock"
 
 function check() {
-	if [ -S "${SOCKET}" ] ; then
-		ewarn "Strange, the socket file already exist in \"${SOCKET}\""
+	if [ -S "${IDO2DBSOCKET}" ] ; then
+		ewarn "Strange, the socket file already exist in \"${IDO2DBSOCKET}\""
 		ewarn "it will be removed now and re-created by ido2db"
 		ewarn "BUT please make your checks."
-		rm -f "${SOCKET}"
+		rm -f "${IDO2DBSOCKET}"
 	fi
 }
 
@@ -24,12 +25,12 @@ depend() {
 start() {
 	check
 	ebegin "Starting ido2db"
-	start-stop-daemon --quiet --start --pidfile /var/icinga/ido2db.lock --startas ${IDO2DBBIN} -- -c ${IDO2DBCFG}
+	start-stop-daemon --start --exec ${IDO2DBBIN} --pidfile ${IDO2DBLOCK} --name ${IDO2DBBIN} -- -c ${IDO2DBCFG}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ido2db"
-	start-stop-daemon --quiet --stop --pidfile /var/icinga/ido2db.lock --name /usr/sbin/ido2db
+	start-stop-daemon --stop --exec ${IDO2DBBIN} --pidfile ${IDO2DBLOCK} --name ${IDO2DBBIN}
 	eend $?
 }
diff --git a/net-analyzer/icinga/icinga-1.5.1-r3.ebuild b/net-analyzer/icinga/icinga-1.5.1-r3.ebuild
deleted file mode 100644
index 91c54b41022a..000000000000
--- a/net-analyzer/icinga/icinga-1.5.1-r3.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.5.1-r3.ebuild,v 1.2 2011/11/22 21:06:50 prometheanfire Exp $
-
-EAPI=2
-
-inherit depend.apache eutils multilib toolchain-funcs
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+apache2 api debug +idoutils lighttpd +mysql perl plugins postgres ssl +vim-syntax +web"
-DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
-	perl? ( dev-lang/perl )
-	virtual/mailx
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] )
-		apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( net-analyzer/nagios-plugins )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/spool/icinga "icinga,nagios"
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "Note that the user your webserver is running as needs"
-		elog "read-access to /etc/icinga."
-		elog
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G icinga apache"
-				elog "or"
-				elog "	chown icinga:apache /etc/icinga"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add \"-D ICINGA\""
-			elif use lighttpd ; then
-				elog "  usermod -G icinga lighttpd "
-				elog "or"
-				elog "  chown icinga:lighttpd /etc/icinga"
-				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
-			fi
-			elog
-			elog "That will make icinga's web front end visable via"
-			elog "http://localhost/icinga/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the icinga group!"
-		fi
-
-	else
-		ewarn "Please note that you have installed Icinga without web interface."
-		ewarn "Please don't file any bugs about having no web interface when you do this."
-		ewarn "Thank you!"
-	fi
-
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries.patch"
-}
-
-src_configure() {
-	local myconf
-	local myconf2
-
-	myconf="$(use_enable perl embedded-perl)
-	$(use_with perl perlcache)
-	$(use_enable idoutils)
-	$(use_enable ssl)
-	$(use_enable debug DEBUG0)
-	$(use_enable debug DEBUG1)
-	$(use_enable debug DEBUG2)
-	$(use_enable debug DEBUG3)
-	$(use_enable debug DEBUG4)
-	$(use_enable debug DEBUG5)
-	--disable-statuswrl
-	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga"
-
-	myconf2="--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga"
-
-	if use plugins ; then
-		myconf2+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf2+=" --libexecdir=/usr/$(get_libdir)/icinga/plugins"
-	fi
-
-	if use !apache2 && use !lighttpd ; then
-		myconf2+=" --with-command-group=icinga"
-	else
-		if use apache2 ; then
-			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf2+=" --with-command-group=apache"
-		elif use lighttpd ; then
-			myconf2+=" --with-command-group=lighttpd"
-		fi
-	fi
-
-	econf ${myconf} ${myconf2}
-	if use api ; then
-		cd module/icinga-api || die
-		econf ${myconf2}
-	fi
-}
-
-src_compile() {
-	tc-export CC
-
-	emake icinga || die "make failed"
-
-	if use web ; then
-		emake DESTDIR="${D}" cgis || die
-	fi
-
-	if use idoutils ; then
-		emake DESTDIR="${D}" idoutils || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog README UPGRADING || die
-
-	if ! use web ; then
-		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
-	fi
-
-	sed -i -e 's/^contactgroups$//g' Makefile || die
-
-	emake DESTDIR="${D}" install{,-config,-commandmode} || die
-
-	sed -i -e 's/var\/lib\/icinga\/icinga.lock/var\/run\/icinga\/icinga.lock/g' "${D}"/etc/icinga/icinga.cfg || die
-	sed -i -e 's/var\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
-
-	if use idoutils ; then
-		 emake DESTDIR="${D}" install-idoutils || die
-	fi
-	if use api ; then
-		 emake DESTDIR="${D}" install-api || die
-	fi
-
-	newinitd "${FILESDIR}"/icinga-init.d-2 icinga || die
-	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
-		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
-		insinto /usr/share/icinga/contrib/db
-		doins -r module/idoutils/db/* || die
-	fi
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
-		elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-	fi
-
-	fowners -R root:root /usr/$(get_libdir)/icinga || die
-	cd "${D}" || die
-	find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
-	find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
-	dodir /var/run/icinga || die
-	fowners icinga:icinga /var/run/icinga || die
-
-	keepdir /etc/icinga
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
-
-	if use apache2 ; then
-		webserver=apache
-	elif use lighttpd ; then
-		webserver=lighttpd
-	else
-		webserver=icinga
-	fi
-
-	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
-	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
-
-	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
-	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
-}
-
-pkg_postinst() {
-	elog "If you want icinga to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add icinga default"
-	elog
-	elog "If your kernel has /proc protection, icinga"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding icinga into"
-	elog "the group wheel, but this is not recomended."
-	elog
-	elog "/var/icinga was moved to /var/lib/icinga"
-	elog "please move the file if this was an upgrade"
-}
diff --git a/net-analyzer/icinga/icinga-1.6.1.ebuild b/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
similarity index 99%
rename from net-analyzer/icinga/icinga-1.6.1.ebuild
rename to net-analyzer/icinga/icinga-1.6.1-r1.ebuild
index 88a675b0ba81..016e935598f1 100644
--- a/net-analyzer/icinga/icinga-1.6.1.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.6.1.ebuild,v 1.1 2011/12/02 22:09:06 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.6.1-r1.ebuild,v 1.1 2011/12/04 19:27:45 prometheanfire Exp $
 
 EAPI=2
 
diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml
index bc77e2a88d41..3ab11f8551fb 100644
--- a/net-analyzer/icinga/metadata.xml
+++ b/net-analyzer/icinga/metadata.xml
@@ -4,7 +4,6 @@
 	<herd>no-herd</herd>
 	<longdescription lang="en">A rebuild of nagios from the ground up</longdescription>
 	<use>
-		<flag name="api">Adds support for the icinga API</flag>
 		<flag name="idoutils">Adds DB support</flag>
 		<flag name="lighttpd">Adds Lighttpd support</flag>
 		<flag name="plugins">Adds support for nagios plugins</flag>
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 491d9ff29694..5cf67d884f68 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1 +1,2 @@
 DIST bitlbee-3.0.3.tar.gz 676417 RMD160 4b537871eef1bb5b6839105bc7bc9f2567e5b8e1 SHA1 4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff SHA256 82ca758937ce7bedaab49edec75f4ad45a3102ac3beaa932b64c34fbb1e3af25
+DIST bitlbee-3.0.4.tar.gz 744599 RMD160 cd6b244f95e266f6c1c3e25c365752fedfc00627 SHA1 2c2742948d1ed2c83ee5db2d2fbff5e8b656b8c4 SHA256 64788e7ef7a175dcda915fad3a8e41990ce4bee3ccdbb4bfb0a2d5a78729ccdb
diff --git a/net-im/bitlbee/bitlbee-3.0.4.ebuild b/net-im/bitlbee/bitlbee-3.0.4.ebuild
new file mode 100644
index 000000000000..cc3d5da5771c
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-3.0.4.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.4.ebuild,v 1.1 2011/12/04 21:18:10 radhermit Exp $
+
+EAPI="4"
+inherit eutils multilib
+
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
+HOMEPAGE="http://www.bitlbee.org/"
+SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple ssl test twitter +yahoo xinetd" # ldap - Bug 195758
+
+COMMON_DEPEND="purple? ( net-im/pidgin )
+	libevent? ( dev-libs/libevent )
+	!libevent? ( >=dev-libs/glib-2.4 )
+	otr? ( net-libs/libotr )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		nss? ( dev-libs/nss )
+		!nss? ( ssl? ( dev-libs/openssl ) )
+	)"
+	# ldap? ( net-nds/openldap )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	test? ( dev-libs/check )"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	xinetd? ( sys-apps/xinetd )"
+
+REQUIRED_USE="^^ ( purple || ( jabber msn oscar yahoo ) )
+	msn? ( || ( gnutls nss ssl ) )
+	jabber? ( !nss )"
+
+pkg_setup() {
+	if use jabber && ! use gnutls && ! use ssl ; then
+		einfo
+		elog "You have enabled support for Jabber but do not have SSL"
+		elog "support enabled.  This *will* prevent bitlbee from being"
+		elog "able to connect to SSL enabled Jabber servers.  If you need to"
+		elog "connect to Jabber over SSL, enable ONE of the following use"
+		elog "flags: gnutls or ssl"
+		einfo
+	fi
+
+	enewgroup bitlbee
+	enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
+}
+
+src_prepare() {
+	sed -i \
+		-e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \
+		-e "s/nobody/bitlbee/" \
+		-e "s/}/	disable         = yes\n}/" \
+		doc/bitlbee.xinetd || die "sed failed in xinetd"
+
+	sed -i \
+		-e "s@mozilla-nss@nss@g" \
+		configure || die "sed failed in configure"
+
+	epatch "${FILESDIR}"/${PN}-3.0-configure.patch
+}
+
+src_configure() {
+	# ldap hard-disabled for now
+	local myconf="--ldap=0"
+
+	# setup plugins, protocol, ipv6 and debug
+	for flag in debug ipv6 msn jabber oscar plugins purple twitter yahoo ; do
+		if use ${flag} ; then
+			myconf="${myconf} --${flag}=1"
+		else
+			myconf="${myconf} --${flag}=0"
+		fi
+	done
+
+	# set otr
+	if use otr && use plugins ; then
+		myconf="${myconf} --otr=plugin"
+	else
+		if use otr ; then
+			ewarn "OTR support has been disabled automatically because it"
+			ewarn "requires the plugins USE flag."
+		fi
+		myconf="${myconf} --otr=0"
+	fi
+
+	# setup ssl use flags
+	if use gnutls ; then
+		myconf="${myconf} --ssl=gnutls"
+		einfo "Using gnutls for SSL support"
+	elif use ssl ; then
+		myconf="${myconf} --ssl=openssl"
+		einfo "Using openssl for SSL support"
+	elif use nss ; then
+		myconf="${myconf} --ssl=nss"
+		einfo "Using nss for SSL support"
+	else
+		myconf="${myconf} --ssl=bogus"
+		einfo "You will not have any encryption support enabled."
+	fi
+
+	# set event handler
+	if use libevent ; then
+		myconf="${myconf} --events=libevent"
+	else
+		myconf="${myconf} --events=glib"
+	fi
+
+	# NOTE: bitlbee's configure script is not an autotool creation,
+	# so that is why we don't use econf.
+	./configure --prefix=/usr --datadir=/usr/share/bitlbee \
+		--etcdir=/etc/bitlbee --plugindir=/usr/$(get_libdir)/bitlbee \
+		--strip=0 ${myconf} || die "econf failed"
+
+	sed -i \
+		-e "/^EFLAGS/s:=:&${LDFLAGS} :" \
+		Makefile.settings || die "sed failed"
+}
+
+src_install() {
+	emake install install-etc install-doc install-dev DESTDIR="${D}"
+
+	keepdir /var/lib/bitlbee
+	fperms 700 /var/lib/bitlbee
+	fowners bitlbee:bitlbee /var/lib/bitlbee
+
+	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
+	dodoc doc/user-guide/user-guide.txt
+	dohtml doc/user-guide/*.html
+
+	doman doc/bitlbee.8 doc/bitlbee.conf.5
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins doc/bitlbee.xinetd bitlbee
+	fi
+
+	newinitd "${FILESDIR}"/bitlbee.initd bitlbee
+	newconfd "${FILESDIR}"/bitlbee.confd bitlbee
+
+	keepdir /var/run/bitlbee
+	fowners bitlbee:bitlbee /var/run/bitlbee
+
+	exeinto /usr/share/bitlbee
+	cd utils
+	doexe convert_purple.py bitlbee-ctl.pl
+}
+
+pkg_postinst() {
+	chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
+	chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee
+
+	einfo
+	elog "The utils included in bitlbee are now located in /usr/share/bitlbee"
+	elog
+	elog "NOTE: The IRSSI script is no longer provided by BitlBee."
+	elog
+	elog "The bitlbeed init script has been replaced by bitlbee."
+	elog "You must update your configuration."
+	einfo
+}
diff --git a/net-im/bitlbee/files/bitlbee.initd b/net-im/bitlbee/files/bitlbee.initd
index b68a078e5e28..e703c028dff0 100644
--- a/net-im/bitlbee/files/bitlbee.initd
+++ b/net-im/bitlbee/files/bitlbee.initd
@@ -1,8 +1,8 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or
 # later
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbee.initd,v 1.2 2010/03/04 17:47:00 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbee.initd,v 1.3 2011/12/04 21:18:10 radhermit Exp $
 
 DAEMON=/usr/sbin/bitlbee
 PIDFILE=/var/run/bitlbee/bitlbee.pid
@@ -14,7 +14,7 @@ depend() {
 start () {
 	ebegin "Starting bitlbee"
 	start-stop-daemon --start --quiet \
-		-c bitlbee:bitlbee  --exec ${DAEMON} -- -P ${PIDFILE} \
+		-u bitlbee:bitlbee  --exec ${DAEMON} -- -P ${PIDFILE} \
 		${BITLBEE_OPTS}
 	eend $?
 }
diff --git a/net-im/vacuum/files/vacuum-1.1.1-minizip.patch b/net-im/vacuum/files/vacuum-1.1.1-minizip.patch
new file mode 100644
index 000000000000..9e71038fd3d0
--- /dev/null
+++ b/net-im/vacuum/files/vacuum-1.1.1-minizip.patch
@@ -0,0 +1,38 @@
+From 433b646f92e629fae235f23ebbfbec6ea5ff72a5 Mon Sep 17 00:00:00 2001
+From: Maxim Ignatenko <gelraen.ua@gmail.com>
+Date: Sun, 4 Dec 2011 20:00:14 +0000
+Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=BF=D1=86=D0=B8=D1=8F=20FORCE=5FBUNDLED=5FMINIZIP=20=D0=B4=D0=BB=D1=8F=20cmake,=20=D0=BF=D0=BE=D0=B7=D0=B2=D0=BE=D0=BB=D1=8F=D1=8E=D1=89=D0=B0=D1=8F=20=D0=B8=D0=B3=D0=BD=D0=BE=D1=80=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BD=D0=B0=D0=BB=D0=B8=D1=87=D0=B8=D0=B5=20=D0=B2=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=B5=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B8=20minizip.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: http://vacuum-im.googlecode.com/svn/trunk@1670 8ee3b2d0-dc07-11de-995a-ab19b33c1a40
+---
+ CMakeLists.txt |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 06da875..bfb33ca 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,11 +20,17 @@ set(LANGS "" CACHE STRING "List of languages to build localization for (this var
+ set(USED_LANGS "" CACHE INTERNAL "List of languages actually used for generating targets")
+ add_lang_options()
+ 
++set(FORCE_BUNDLED_MINIZIP NO CACHE BOOL "Use bundled minizip even if local system have one")
++
+ find_library(SYSTEM_ZLIB_FOUND z)
+ find_library(SYSTEM_IDN_FOUND idn)
+ find_library(SYSTEM_MINIZIP_FOUND minizip)
+ find_library(SYSTEM_QTLOCKEDFILE_FOUND QtSolutions_LockedFile-2.4)
+ 
++if (FORCE_BUNDLED_MINIZIP)
++	set(SYSTEM_MINIZIP_FOUND NO)
++endif (FORCE_BUNDLED_MINIZIP)
++
+ if (SYSTEM_ZLIB_FOUND)
+ 	add_definitions(-DUSE_SYSTEM_ZLIB)
+ endif (SYSTEM_ZLIB_FOUND)
+-- 
+1.7.3.4
+
diff --git a/net-im/vacuum/files/vacuum-1.1.1-zlib.patch b/net-im/vacuum/files/vacuum-1.1.1-zlib.patch
new file mode 100644
index 000000000000..46df1062e0e4
--- /dev/null
+++ b/net-im/vacuum/files/vacuum-1.1.1-zlib.patch
@@ -0,0 +1,49 @@
+From 88360d515a06ef08fd3e16f462fe0a869b55ca1d Mon Sep 17 00:00:00 2001
+From: Sergey Potapov <potapov.s.a@gmail.com>
+Date: Mon, 17 Oct 2011 11:54:39 +0000
+Subject: Плагин Compress не собирался в Gentoo после обновления системного ZLib.
+
+git-svn-id: http://vacuum-im.googlecode.com/svn/trunk@1636 8ee3b2d0-dc07-11de-995a-ab19b33c1a40
+---
+diff --git a/src/plugins/compress/compression.cpp b/src/plugins/compress/compression.cpp
+index b59b95d..3ca6bd4 100644
+--- a/src/plugins/compress/compression.cpp
++++ b/src/plugins/compress/compression.cpp
+@@ -138,30 +138,20 @@ void Compression::stopZlib()
+ 
+ void Compression::processData(QByteArray &AData, bool ADataOut)
+ {
+-	if (AData.size()>0)
++	if (AData.size() > 0)
+ 	{
+-		z_streamp zstream;
+-		int (*zfunc) OF((z_streamp strm, int flush));
+-		if (ADataOut)
+-		{
+-			zstream = &FDefStruc;
+-			zfunc = deflate;
+-		}
+-		else
+-		{
+-			zstream = &FInfStruc;
+-			zfunc = inflate;
+-		}
+-
+ 		int ret;
+ 		int dataPosOut = 0;
++
++		z_streamp zstream = ADataOut ? &FDefStruc : &FInfStruc;
+ 		zstream->avail_in = AData.size();
+ 		zstream->next_in = (Bytef *)(AData.constData());
++
+ 		do
+ 		{
+ 			zstream->avail_out = FOutBuffer.capacity() - dataPosOut;
+ 			zstream->next_out = (Bytef *)(FOutBuffer.data() + dataPosOut);
+-			ret = zfunc(zstream,Z_SYNC_FLUSH);
++			ret = ADataOut ? deflate(zstream,Z_SYNC_FLUSH) : inflate(zstream,Z_SYNC_FLUSH);
+ 			switch (ret)
+ 			{
+ 			case Z_OK:
+--
+cgit v0.9.0.2
diff --git a/net-im/vacuum/vacuum-1.1.1.ebuild b/net-im/vacuum/vacuum-1.1.1.ebuild
index 2f3a2534576c..9066edce10c5 100644
--- a/net-im/vacuum/vacuum-1.1.1.ebuild
+++ b/net-im/vacuum/vacuum-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-1.1.1.ebuild,v 1.1 2011/09/03 14:49:57 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-1.1.1.ebuild,v 1.2 2011/12/04 22:09:03 maksbotan Exp $
 
 EAPI="4"
 LANGS="de pl ru uk"
@@ -47,6 +47,13 @@ DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS CHANGELOG README TRANSLATORS"
 
+src_prepare() {
+	default
+
+	epatch "${FILESDIR}"/${P}-minizip.patch
+	epatch "${FILESDIR}"/${P}-zlib.patch
+}
+
 src_configure() {
 	# linguas
 	local langs="none;"
@@ -59,6 +66,7 @@ src_configure() {
 		-DINSTALL_SDK=ON
 		-DLANGS="${langs}"
 		-DINSTALL_DOCS=OFF
+		-DFORCE_BUNDLED_MINIZIP=ON
 	)
 
 	for x in ${PLUGINS}; do
diff --git a/net-im/vacuum/vacuum-9999.ebuild b/net-im/vacuum/vacuum-9999.ebuild
index e1e0ad7da1f6..d6e54bf3126c 100644
--- a/net-im/vacuum/vacuum-9999.ebuild
+++ b/net-im/vacuum/vacuum-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-9999.ebuild,v 1.2 2011/09/03 14:49:57 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/vacuum-9999.ebuild,v 1.3 2011/12/04 22:09:03 maksbotan Exp $
 
 EAPI="4"
 LANGS="de pl ru uk"
@@ -65,6 +65,7 @@ src_configure() {
 		-DINSTALL_SDK=ON
 		-DLANGS="${langs}"
 		-DINSTALL_DOCS=OFF
+		-DFORCE_BUNDLED_MINIZIP=ON
 	)
 
 	for x in ${PLUGINS}; do
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.51.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.51.ebuild
index a9566d026a37..05fb18a4e9ce 100644
--- a/net-irc/irssi-xmpp/irssi-xmpp-0.51.ebuild
+++ b/net-irc/irssi-xmpp/irssi-xmpp-0.51.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-xmpp/irssi-xmpp-0.51.ebuild,v 1.1 2010/09/05 12:03:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi-xmpp/irssi-xmpp-0.51.ebuild,v 1.2 2011/12/04 16:19:51 xarthisius Exp $
 
 EAPI="2"
 
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=net-irc/irssi-0.8.13
-	>=net-libs/loudmouth-1.2.0[debug]"
+DEPEND="net-irc/irssi
+	net-libs/loudmouth"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/net-libs/libpcap/libpcap-1.1.1-r1.ebuild b/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
index 450620b7c3aa..3339b53ae28c 100644
--- a/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
+++ b/net-libs/libpcap/libpcap-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.1-r1.ebuild,v 1.7 2011/12/04 06:43:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.1-r1.ebuild,v 1.8 2011/12/04 16:52:00 hwoarang Exp $
 
 EAPI=4
 inherit autotools eutils multilib toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth ipv6 libnl static-libs"
 
 RDEPEND="bluetooth? ( net-wireless/bluez )
diff --git a/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild b/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild
index fb4ecedf8dd1..9b58499c58ab 100644
--- a/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild,v 1.12 2011/11/02 02:56:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3-r1.ebuild,v 1.13 2011/12/04 20:23:43 tetromino Exp $
 
 inherit autotools gnome2
 
@@ -13,7 +13,9 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~ppc-macos"
 
 IUSE="asyncns doc ssl debug test"
 
+# Automagic libidn dependency
 RDEPEND=">=dev-libs/glib-2.4
+	net-dns/libidn
 	ssl? ( >=net-libs/gnutls-1.4.0 )
 	asyncns? ( net-libs/libasyncns )"
 # FIXME:
diff --git a/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild b/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild
index 718a6e5146bd..13ed2001b88f 100644
--- a/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild,v 1.1 2011/11/02 02:56:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3-r2.ebuild,v 1.2 2011/12/04 20:23:43 tetromino Exp $
 
 EAPI="4"
 GNOME_TARBALL_SUFFIX="bz2"
@@ -17,7 +17,9 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
 
 IUSE="asyncns debug doc ssl static-libs test"
 
+# Automagic libidn dependency
 RDEPEND=">=dev-libs/glib-2.4
+	net-dns/libidn
 	ssl? ( >=net-libs/gnutls-1.4.0 )
 	asyncns? ( net-libs/libasyncns )"
 # FIXME:
diff --git a/net-libs/loudmouth/loudmouth-1.4.3.ebuild b/net-libs/loudmouth/loudmouth-1.4.3.ebuild
index 93e4ff459088..744265602df4 100644
--- a/net-libs/loudmouth/loudmouth-1.4.3.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3.ebuild,v 1.11 2011/11/02 02:56:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/loudmouth/loudmouth-1.4.3.ebuild,v 1.12 2011/12/04 20:23:43 tetromino Exp $
 
 inherit autotools gnome2
 
@@ -13,7 +13,9 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
 IUSE="asyncns doc ssl debug test"
 
+# Automagic libidn dependency
 RDEPEND=">=dev-libs/glib-2.4
+	net-dns/libidn
 	ssl? ( >=net-libs/gnutls-1.4.0 )
 	asyncns? ( net-libs/libasyncns )"
 # FIXME:
diff --git a/net-mail/gnubiff/gnubiff-2.2.13-r1.ebuild b/net-mail/gnubiff/gnubiff-2.2.13-r1.ebuild
deleted file mode 100644
index a4aa0ebdfbef..000000000000
--- a/net-mail/gnubiff/gnubiff-2.2.13-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/gnubiff-2.2.13-r1.ebuild,v 1.7 2011/12/04 14:28:04 armin76 Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="A mail notification program"
-HOMEPAGE="http://gnubiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug fam gnome nls password"
-
-RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=gnome-base/libglade-2.3
-	dev-libs/popt
-	gnome? (
-		|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
-		>=gnome-base/libgnome-2.2
-		>=gnome-base/libgnomeui-2.2 )
-	password? ( dev-libs/openssl )
-	fam? ( virtual/fam )
-	x11-proto/xproto"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-nls.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable gnome) \
-		$(use_enable nls) \
-		$(use_enable fam) \
-		$(use_with password) \
-		$(use_with password password-string ${RANDOM}${RANDOM}${RANDOM}${RANDOM})
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/net-misc/autossh/Manifest b/net-misc/autossh/Manifest
index 625aa9f29eca..4b47f5d89923 100644
--- a/net-misc/autossh/Manifest
+++ b/net-misc/autossh/Manifest
@@ -1,2 +1 @@
-DIST autossh-1.4b.tgz 64337 RMD160 57accc6968ed0c654035feda8db2a11aa390ade3 SHA1 98fa61969b33fc1380c7e3b7b53ed35a13c1eeb4 SHA256 e77f518e1f3607aa55086c8969f72d1b44ef99402814a19fec213a6e0f06ef07
 DIST autossh-1.4c.tgz 65191 RMD160 894a841c9a079aaaecff5d6e6b148b6f7746dd5e SHA1 d9a1d5a2987e7e5a444b00e63d6590936da1e1f2 SHA256 6fcaba6a409a46bdf832086736bb8f09d245ebce11027f41d39588a95dc7fd1d
diff --git a/net-misc/autossh/autossh-1.4b.ebuild b/net-misc/autossh/autossh-1.4b.ebuild
deleted file mode 100644
index dba1b05927d8..000000000000
--- a/net-misc/autossh/autossh-1.4b.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.4b.ebuild,v 1.7 2011/03/30 21:20:01 radhermit Exp $
-
-EAPI=2
-
-DESCRIPTION="Automatically restart SSH sessions and tunnels"
-HOMEPAGE="http://www.harding.motd.ca/autossh/"
-SRC_URI="http://www.harding.motd.ca/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
-SLOT="0"
-IUSE=""
-
-RDEPEND="net-misc/openssh"
-
-src_prepare() {
-	sed -i -e "s:\$(CC):& \$(LDFLAGS):" Makefile.in || die
-}
-
-src_install() {
-	dobin autossh
-	dodoc CHANGES README autossh.host rscreen
-	doman autossh.1
-}
diff --git a/net-misc/autossh/autossh-1.4c.ebuild b/net-misc/autossh/autossh-1.4c.ebuild
index d3d0e9226c6e..6c30598a7820 100644
--- a/net-misc/autossh/autossh-1.4c.ebuild
+++ b/net-misc/autossh/autossh-1.4c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.4c.ebuild,v 1.2 2011/11/26 16:37:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/autossh/autossh-1.4c.ebuild,v 1.3 2011/12/04 15:38:13 armin76 Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.harding.motd.ca/autossh/"
 SRC_URI="http://www.harding.motd.ca/${PN}/${P}.tgz"
 
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 SLOT="0"
 IUSE=""
 
diff --git a/net-misc/dhcp/dhcp-4.2.2-r3.ebuild b/net-misc/dhcp/dhcp-4.2.2-r3.ebuild
new file mode 100644
index 000000000000..eea1ab424a05
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.2.2-r3.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r3.ebuild,v 1.1 2011/12/04 22:45:06 vapier Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
+
+LICENSE="as-is BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
+
+DEPEND="selinux? ( sec-policy/selinux-dhcp )
+	kernel_linux? ( sys-apps/net-tools )
+	ldap? (
+		net-nds/openldap
+		ssl? ( dev-libs/openssl )
+	)"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/dhcpd-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	# handle local bind hell
+	cd "${S}"/bind
+	unpack ./bind.tar.gz
+}
+
+src_prepare() {
+	# Gentoo patches - these will probably never be accepted upstream
+	# Fix some permission issues
+	epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
+	# Enable dhclient to equery NTP servers
+	epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
+	# resolvconf support in dhclient-script
+	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-resolvconf.patch
+	# Stop downing the interface on Linux as that breaks link daemons
+	# such as wpa_supplicant and netplug
+	epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
+	epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
+	# Enable dhclient to get extra configuration from stdin
+	epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
+	epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
+
+	# NetworkManager support patches
+	# If they fail to apply to future versions they will be dropped
+	# Add dbus support to dhclient
+	epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-dbus.patch
+
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+
+	# Change the hook script locations of the scripts
+	sed -i \
+		-e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+		-e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+		client/scripts/* || die
+
+	# No need for the linux script to force bash #158540
+	sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+	# Quiet the freebsd logger a little
+	sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+	# Remove these options from the sample config
+	sed -i \
+		-e "/\(script\|host-name\|domain-name\) / d" \
+		client/dhclient.conf || die
+
+	if use client && ! use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+			Makefile.in || die
+	elif ! use client && use server ; then
+		sed -i -r \
+			-e '/^SUBDIRS/s:\<client\>::' \
+			Makefile.in || die
+	fi
+
+	# Only install different man pages if we don't have en
+	if [[ " ${LINGUAS} " != *" en "* ]]; then
+		# Install Japanese man pages
+		if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+			einfo "Installing Japanese documention"
+			cp doc/ja_JP.eucJP/dhclient* client
+			cp doc/ja_JP.eucJP/dhcp* common
+		fi
+	fi
+	# Now remove the non-english docs so there are no errors later
+	rm -rf doc/ja_JP.eucJP
+
+	# make the bind build work
+	binddir=${S}/bind
+	cd "${binddir}" || die
+	cat <<-EOF > bindvar.tmp
+	binddir=${binddir}
+	GMAKE=${MAKE:-gmake}
+	EOF
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
+	cd bind-*/
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
+	epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
+}
+
+src_configure() {
+	# bind defaults to stupid `/usr/bin/ar`
+	tc-export AR BUILD_CC
+	export ac_cv_path_AR=${AR}
+
+	# this is tested for by the bind build system, and can cause trouble
+	# when cross-building; since dhcp itself doesn't make use of libcap,
+	# simply disable it.
+	export ac_cv_lib_cap_cap_set_proc=no
+
+	# Use FHS sane paths ... some of these have configure options,
+	# but not all, so just do it all here.
+	local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
+	cat <<-EOF >> includes/site.h
+	#define _PATH_DHCPD_CONF     "${e}/dhcpd.conf"
+	#define _PATH_DHCLIENT_CONF  "${e}/dhclient.conf"
+	#define _PATH_DHCPD_DB       "${l}/dhcpd.leases"
+	#define _PATH_DHCPD6_DB      "${l}/dhcpd6.leases"
+	#define _PATH_DHCLIENT_DB    "${l}/dhclient.leases"
+	#define _PATH_DHCLIENT6_DB   "${l}/dhclient6.leases"
+	#define _PATH_DHCPD_PID      "${r}/dhcpd.pid"
+	#define _PATH_DHCPD6_PID     "${r}/dhcpd6.pid"
+	#define _PATH_DHCLIENT_PID   "${r}/dhcpclient.pid"
+	#define _PATH_DHCLIENT6_PID  "${r}/dhcpclient6.pid"
+	#define _PATH_DHCRELAY_PID   "${r}/dhcrelay.pid"
+	#define _PATH_DHCRELAY6_PID  "${r}/dhcrelay6.pid"
+	EOF
+
+	econf \
+		--enable-paranoia \
+		--enable-early-chroot \
+		--sysconfdir=${e} \
+		$(use_enable ipv6 dhcpv6) \
+		$(use_with ldap) \
+		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+
+	# configure local bind cruft.  symtable option requires
+	# perl and we don't want to require that #383837.
+	cd bind/bind-*/ || die
+	eval econf \
+		$(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
+		--disable-symtable \
+		--without-make-clean
+}
+
+src_compile() {
+	# build local bind cruft first
+	emake -C bind/bind-*/lib/export install || die
+	# then build standard dhcp code
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+	dohtml doc/References.html
+
+	if [[ -e client/dhclient ]] ; then
+		# move the client to /
+		dodir /sbin
+		mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+		exeinto /sbin
+		if use kernel_linux ; then
+			newexe "${S}"/client/scripts/linux dhclient-script || die
+		else
+			newexe "${S}"/client/scripts/freebsd dhclient-script || die
+		fi
+	fi
+
+	if [[ -e server/dhcpd ]] ; then
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins contrib/ldap/dhcp.* || die
+			dosbin contrib/ldap/dhcpd-conf-to-ldap || die
+		fi
+
+		newinitd "${FILESDIR}"/dhcpd.init5 dhcpd || die
+		newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd || die
+		newinitd "${FILESDIR}"/dhcrelay.init2 dhcrelay || die
+		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay || die
+	fi
+
+	# the default config files aren't terribly useful #384087
+	sed -i '/^[^#]/s:^:#:' "${D}"/etc/dhcp/*.conf || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+	# Keep the user files over the sample ones.  The
+	# hashing is to ignore the crappy defaults #384087.
+	local f h
+	for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
+		h=${f#*:}
+		f="/etc/dhcp/${f%:*}.conf"
+		if [ -e "${ROOT}"${f} ] ; then
+			case $(md5sum "${ROOT}"${f}) in
+				${h}*) ;;
+				*) cp -p "${ROOT}"${f} "${D}"${f};;
+			esac
+		fi
+	done
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+		ewarn
+		ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+		ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+		ewarn "and dhcp should be removed from the default runlevel"
+		ewarn
+	fi
+}
diff --git a/net-misc/dhcp/files/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5
new file mode 100755
index 000000000000..c3bbab78082d
--- /dev/null
+++ b/net-misc/dhcp/files/dhcpd.init5
@@ -0,0 +1,114 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init5,v 1.1 2011/12/04 22:45:07 vapier Exp $
+
+extra_commands="configtest"
+
+: ${DHCPD_CONF:=/etc/dhcp/${SVCNAME}.conf}
+
+depend() {
+	need net
+	use logger dns
+}
+
+get_var() {
+	local var="$(sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#";]\+\).*/\1/p' "${chroot}${DHCPD_CONF}")"
+	echo ${var:-$2}
+}
+
+checkconfig() {
+	set -- ${DHCPD_OPTS} ${chroot:+-chroot} ${chroot} -t
+
+	dhcpd "$@" 1>/dev/null 2>&1
+	local ret=$?
+	if [ ${ret} -ne 0 ] ; then
+		eerror "${SVCNAME} has detected a syntax error in your configuration files:"
+		dhcpd "$@"
+	fi
+
+	return ${ret}
+}
+
+configtest() {
+	local chroot=${DHCPD_CHROOT%/}
+
+	ebegin "Checking ${SVCNAME} configuration"
+	checkconfig
+	eend $?
+}
+
+start() {
+	local chroot=${DHCPD_CHROOT%/}
+
+	# Work out our cffile if it's in our DHCPD_OPTS
+	case " ${DHCPD_OPTS} " in
+		*" -cf "*)
+			DHCPD_CONF=" ${DHCPD_OPTS} "
+			DHCPD_CONF="${DHCPD_CONF##* -cf }"
+			DHCPD_CONF="${DHCPD_CONF%% *}"
+			;;
+		*)	DHCPD_OPTS="${DHCPD_OPTS} -cf ${DHCPD_CONF}"
+			;;
+	esac
+
+	if [ -n "${chroot}" ] ; then
+		# the config test want's these to exist
+		mkdir -p \
+			"${chroot}"/var/run/dhcp \
+			"${chroot}"/var/lib/dhcp \
+			"${chroot}"/etc/dhcp
+	fi
+
+	# see comment in get_var() above
+	if [ ! -f "${chroot}${DHCPD_CONF}" ] ; then
+		eerror "${chroot}${DHCPD_CONF} does not exist"
+		return 1
+	fi
+
+	checkconfig || return 1
+
+	checkpath -d -o dhcp:dhcp "${chroot}"/var/run/dhcp "${chroot}"/var/lib/dhcp
+
+	local leasefile="$(get_var lease-file-name /var/lib/dhcp/${SVCNAME}.leases)"
+	checkpath -f -o dhcp:dhcp "${chroot}${leasefile}"
+
+	# Setup LD_PRELOAD so name resolution works in our chroot.
+	if [ -n "${chroot}" ] ; then
+		checkpath -d -o root:root -m 755 "${chroot}"/dev "${chroot}"/etc "${chroot}"/proc
+		cp -pP /etc/localtime /etc/resolv.conf "${chroot}"/etc/
+		export LD_PRELOAD="${LD_PRELOAD} libresolv.so libnss_dns.so"
+		if ! mountinfo -q "${chroot}/proc" ; then
+			mount --bind /proc "${chroot}/proc"
+		fi
+	fi
+
+	local pidfile="$(get_var pid-file-name /var/run/dhcp/${SVCNAME}.pid)"
+
+	ebegin "Starting ${chroot:+chrooted }${SVCNAME}"
+	start-stop-daemon --start --exec /usr/sbin/dhcpd \
+		--pidfile "${chroot}/${pidfile}" \
+		-- ${DHCPD_OPTS} -q -pf "${pidfile}" -lf "${leasefile}" \
+		-user dhcp -group dhcp \
+		${chroot:+-chroot} ${chroot} ${DHCPD_IFACE}
+	eend $? \
+		&& save_options chroot "${chroot}" \
+		&& save_options pidfile "${pidfile}"
+}
+
+stop() {
+	local chroot="$(get_options chroot)"
+
+	ebegin "Stopping ${chroot:+chrooted }${SVCNAME}"
+	start-stop-daemon --stop --exec /usr/sbin/dhcpd \
+		--pidfile "${chroot}/$(get_options pidfile)"
+	res=$?
+
+	if [ ${res} -eq 0 ] && [ -n "${chroot}" ] ; then
+		if mountinfo -q "${chroot}/proc" ; then
+			umount "${chroot}/proc"
+		fi
+	fi
+
+	eend $res
+}
diff --git a/perl-core/Pod-Simple/Pod-Simple-3.160.0.ebuild b/perl-core/Pod-Simple/Pod-Simple-3.160.0.ebuild
index 0c9381924e4d..1ccc4bd9a939 100644
--- a/perl-core/Pod-Simple/Pod-Simple-3.160.0.ebuild
+++ b/perl-core/Pod-Simple/Pod-Simple-3.160.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Pod-Simple/Pod-Simple-3.160.0.ebuild,v 1.3 2011/11/30 03:47:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Pod-Simple/Pod-Simple-3.160.0.ebuild,v 1.4 2011/12/04 21:11:55 maekke Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Framework for parsing Pod"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/perl-Pod-Escapes-1.04"
diff --git a/perl-core/Time-HiRes/Time-HiRes-1.972.200.ebuild b/perl-core/Time-HiRes/Time-HiRes-1.972.200.ebuild
index 4bc0048a8e25..06e0b2d4d822 100644
--- a/perl-core/Time-HiRes/Time-HiRes-1.972.200.ebuild
+++ b/perl-core/Time-HiRes/Time-HiRes-1.972.200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Time-HiRes/Time-HiRes-1.972.200.ebuild,v 1.2 2011/11/30 03:49:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Time-HiRes/Time-HiRes-1.972.200.ebuild,v 1.3 2011/12/04 21:14:59 maekke Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Perl Time::HiRes. High resolution alarm, sleep, gettimeofday, interval timers"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 9f1fe77da52d..423ebd81055c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -706,6 +706,7 @@ app-office/kspread:solver - Use solver extension for solving lingebra and others
 app-office/kword:wpd - Build wordperfect document support.
 app-office/libreoffice:binfilter - Enable support for legacy StarOffice 5.x and earlier file formats
 app-office/libreoffice:graphite - Enable support for non-Roman fonts via media-gfx/graphite2
+app-office/libreoffice:gtk3 - Enable highly experimental gtk3 frontend
 app-office/libreoffice:jemalloc - Use dev-libs/jemalloc for allocations
 app-office/libreoffice:odk - Build the Office Development Kit
 app-office/libreoffice:pdfimport - Build pdf-import extension using app-text/poppler. Note that you don't need this for pdf-export!
@@ -757,6 +758,7 @@ app-portage/eix:security - This adds some checks which can prevent certain explo
 app-portage/eix:sqlite - Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix
 app-portage/eix:strong-optimization - Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS
 app-portage/eix:tools - Create separate binary for script helper tools (currently only: versionsort); useful if they are called extremely often
+app-portage/gentoolkit:minimal - Install only the gentoolkit core code.
 app-portage/layman:bazaar - Support dev-vcs/bzr based overlays
 app-portage/layman:darcs - Support dev-vcs/darcs based overlays
 app-portage/layman:git - Support dev-vcs/git based overlays
@@ -3130,7 +3132,6 @@ net-analyzer/echoping:smtp - enable support for SMTP protocol.
 net-analyzer/echoping:tos - enable support for TOS (TYpe Of Service).
 net-analyzer/fprobe:messages - enable console messages
 net-analyzer/hydra:ncp - NCP protocol (NetWare) support through net-fs/ncpfs
-net-analyzer/icinga:api - Adds support for the icinga API
 net-analyzer/icinga:idoutils - Adds DB support
 net-analyzer/icinga:lighttpd - Adds Lighttpd support
 net-analyzer/icinga:plugins - Adds support for nagios plugins
diff --git a/sci-chemistry/imosflm/imosflm-1.0.5.ebuild b/sci-chemistry/imosflm/imosflm-1.0.5.ebuild
index b97f81638900..dd7475056b56 100644
--- a/sci-chemistry/imosflm/imosflm-1.0.5.ebuild
+++ b/sci-chemistry/imosflm/imosflm-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.5.ebuild,v 1.1 2011/09/07 15:27:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.5.ebuild,v 1.2 2011/12/04 16:46:19 hwoarang Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="${HOMEPAGE}/ver${MY_PV}/downloads/${P}.zip"
 
 LICENSE="ccp4"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r5.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r5.ebuild
new file mode 100644
index 000000000000..ec3ea1ee1661
--- /dev/null
+++ b/sci-libs/cctbx/cctbx-2010.03.29.2334-r5.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r5.ebuild,v 1.1 2011/12/04 19:03:25 jlec Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+
+inherit eutils fortran-2 prefix python toolchain-funcs
+
+MY_PV="${PV//./_}"
+
+DESCRIPTION="Computational Crystallography Toolbox"
+HOMEPAGE="http://cctbx.sourceforge.net/"
+SRC_URI="http://cci.lbl.gov/cctbx_build/results/${MY_PV}/${PN}_bundle.tar.gz -> ${P}.tar.gz"
+
+LICENSE="cctbx-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+minimal openmp threads"
+
+RDEPEND="
+	virtual/fortran
+	>dev-libs/boost-1.39[python]
+	sci-libs/clipper
+	sci-libs/fftw
+	!minimal? (
+		sci-chemistry/cns
+		sci-chemistry/shelx )"
+DEPEND="${RDEPEND}
+	>=dev-util/scons-1.2"
+
+S="${WORKDIR}"
+MY_S="${WORKDIR}"/cctbx_sources
+MY_B="${WORKDIR}"/cctbx_build
+
+pkg_setup() {
+	use openmp && FORTRAN_NEED_OPENMP="1"
+	fortran-2_pkg_setup
+	if use openmp && ! tc-has-openmp; then
+		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 and icc"
+		ewarn "If you want to build ${PN} with OpenMP, abort now,"
+		ewarn "and switch CC to an OpenMP capable compiler"
+	fi
+	python_set_active_version 2
+}
+
+src_prepare() {
+	local opts
+	local optsld
+
+	epatch \
+		"${FILESDIR}"/${PV}-tst_server.py.patch \
+		"${FILESDIR}"/${PV}-boost.patch \
+		"${FILESDIR}"/${PV}-clipper.patch \
+		"${FILESDIR}"/${PV}-flags.patch \
+		"${FILESDIR}"/${PV}-soname.patch \
+		"${FILESDIR}"/${PV}-gcc-4.6.patch
+
+	eprefixify "${MY_S}"/scitbx/libtbx_refresh.py
+
+	rm -rf "${MY_S}/scons" "${MY_S}/boost" "${MY_S}/PyCifRW" || die
+	find "${MY_S}/clipper" -name "*.h" -delete || die
+
+	echo "import os, sys; os.execvp('scons', sys.argv)" > "${MY_S}"/libtbx/command_line/scons.py
+}
+
+src_configure() {
+	local compiler
+	local myconf
+
+	myconf="${MY_S}/libtbx/configure.py"
+
+	compiler=$(expr match "$(tc-getCC)" '.*\([a-z]cc\)')
+	myconf="${myconf} --compiler=${compiler}"
+
+	# Additional USE flag usage
+	check_use openmp
+	myconf="${myconf} --enable-openmp-if-possible=${USE_openmp}"
+
+	use threads && USEthreads="--enable-boost-threads" && \
+		ewarn "If using boost threads openmp support is disabled"
+
+	myconf="${myconf} ${USE_threads} --scan-boost --use_environment_flags"
+
+	mkdir "${MY_B}" && myconf="${myconf} --current_working_directory=${MY_B}"
+	cd "${MY_B}"
+
+	myconf="${myconf} --build=release fftw3tbx rstbx smtbx mmtbx clipper_adaptbx fable"
+	einfo "configuring with ${python} ${myconf}"
+
+	$(PYTHON) ${myconf} || die "configure failed"
+}
+
+src_compile() {
+	local makeopts_exp
+
+	cd "${MY_B}"
+
+	makeopts_exp=${MAKEOPTS/j/j }
+	makeopts_exp=${makeopts_exp%-l[0-9]*}
+
+	source setpaths_all.sh
+
+	einfo "compiling with libtbx.scons ${makeopts_exp}"
+	libtbx.scons ${makeopts_exp} .|| die "make failed"
+}
+
+src_test(){
+	source "${MY_B}"/setpaths_all.sh
+	libtbx.python $(libtbx.show_dist_paths boost_adaptbx)/tests/tst_rational.py && \
+	libtbx.python ${SCITBX_DIST}/run_tests.py ${MAKEOPTS_EXP} && \
+	libtbx.python ${CCTBX_DIST}/run_tests.py  ${MAKEOPTS_EXP} \
+	|| die "test failed"
+}
+
+src_install(){
+	local lib baselib
+#	find cctbx_build/ -type f \( -name "*.py" -o -name "*sh" \) -exec \
+#	sed -e "s:${MY_S}:${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_sources:g" \
+#	    -e "s:${MY_B}:${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build:g"  \
+#	    -i '{}' \; || die "Fail to correct path"
+
+	sed \
+		-e "s:${MY_B}:${EPREFIX}/usr:g" \
+		-e "s:${MY_S}:${EPREFIX}/$(python_get_sitedir):g" \
+		-i "${MY_B}/libtbx_env" || die
+
+	insinto /usr/share/cctbx
+	doins "${MY_B}/libtbx_env" || die
+
+	ebegin "removing unnessary files"
+		rm -r "${S}"/cctbx_sources/{clipper,ccp4io,ucs-fonts,TAG} || die "failed to remove uneeded scons"
+		find -O3 "${S}" -type f \
+			\( -name "*conftest*" -o -name "*.o" -o -name "*.c" -o -name "*.f" -o -name "*.cpp" -o \
+			-name "*.pyc" -o -name "SCons*" -o -name "Makefile" -o -name "config.log" \) -delete || die
+		find "${S}" -type d -empty -delete || die
+		find "${MY_B}" -maxdepth 1 -type f -delete || die
+	eend
+
+	dobin "${MY_B}"/bin/* || die
+	rm -rf "${MY_B}/bin"
+	dolib.so "${MY_B}"/lib/lib* || die
+	mv "${ED}"/usr/$(get_libdir)/libscitbx_min{,i}pack.so || die
+	rm -f "${MY_B}"/lib/lib*
+
+	for lib in "${ED}"/usr/$(get_libdir)/*.so; do
+		baselib=$(basename ${lib})
+		mv ${lib}{,.0.0}
+		dosym ${baselib}.0.0 /usr/$(get_libdir)/${baselib}
+	done
+
+	insinto /usr/include
+	doins -r "${MY_B}"/include/* || die
+	rm -rf "${MY_B}/include"
+
+	insinto /usr/libexec/${PN}
+	doins -r "${MY_B}"/* || die
+	find "${ED}"/usr/libexec/${PN} -type f -exec chmod 755 '{}' \;
+
+	cd "${MY_S}"
+	insinto $(python_get_sitedir)
+	doins -r * || die
+	exeinto $(python_get_sitedir)
+	doexe "${MY_B}"/lib/* || die
+	rm -rf "${MY_B}/lib"
+
+	sed \
+		-e "/PYTHONPATH/s:${MY_S}:$(python_get_sitedir):g" \
+		-e "/PYTHONPATH/s:${MY_B}:$(python_get_sitedir):g" \
+		-e "/LD_LIBRARY_PATH/s:${MY_B}/lib:${EPREFIX}/usr/$(get_libdir):g" \
+		-e "/PATH/s:${MY_B}/bin:${EPREFIX}/usr/bin:g" \
+		-e "/PATH/s:${MY_B}/exe:${EPREFIX}/usr/bin:g" \
+		-e "/exec/s:${MY_S}:$(python_get_sitedir):g" \
+		-e "/LIBTBX_BUILD/s:${MY_B}:${EPREFIX}/usr/share/cctbx:g" \
+		-e "s:${MY_B}/exe_dev/:${EPREFIX}/usr/libexec/${PN}/exe_dev/:g" \
+		-i "${ED}"/usr/bin/* || die
+
+}
+
+pkg_postinst () {
+	python_mod_optimize boost_adaptbx cbflib_adaptbx ccp4io_adaptbx cctbx chiltbx clipper_adaptbx crys3d fable fftw3tbx gltbx iotbx libtbx mmtbx omptbx rstbx scitbx smtbx spotfinder tntbx
+}
+
+pkg_postrm () {
+	python_mod_cleanup boost_adaptbx cbflib_adaptbx ccp4io_adaptbx cctbx chiltbx clipper_adaptbx crys3d fable fftw3tbx gltbx iotbx libtbx mmtbx omptbx rstbx scitbx smtbx spotfinder tntbx
+}
+
+check_use() {
+	for var in $@; do
+		if use ${var}; then
+			printf -v "USE_$var" True
+		else
+			printf -v "USE_$var" False
+		fi
+	shift
+	done
+}
diff --git a/sci-mathematics/gmm/gmm-3.1.ebuild b/sci-mathematics/gmm/gmm-3.1.ebuild
index 39d2f8555c82..c38ddeac2d60 100644
--- a/sci-mathematics/gmm/gmm-3.1.ebuild
+++ b/sci-mathematics/gmm/gmm-3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmm/gmm-3.1.ebuild,v 1.7 2010/01/14 02:03:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmm/gmm-3.1.ebuild,v 1.8 2011/12/04 17:48:29 armin76 Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www-gmm.insa-toulouse.fr/getfem/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 src_install() {
diff --git a/sci-mathematics/gmm/gmm-4.1.ebuild b/sci-mathematics/gmm/gmm-4.1.ebuild
index 05811aa9e442..472f2a005f0b 100644
--- a/sci-mathematics/gmm/gmm-4.1.ebuild
+++ b/sci-mathematics/gmm/gmm-4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmm/gmm-4.1.ebuild,v 1.4 2011/11/30 03:55:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gmm/gmm-4.1.ebuild,v 1.5 2011/12/04 17:48:29 armin76 Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www-gmm.insa-toulouse.fr/getfem/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 DOCS=( AUTHORS )
diff --git a/sec-policy/selinux-base-policy/Manifest b/sec-policy/selinux-base-policy/Manifest
index 3563e5fd6df7..6cfd29b33411 100644
--- a/sec-policy/selinux-base-policy/Manifest
+++ b/sec-policy/selinux-base-policy/Manifest
@@ -1,4 +1,5 @@
 DIST patchbundle-selinux-base-policy-2.20110726-r4.tar.bz2 22344 RMD160 b4ecb26fb48b21f21e4836dd560cc39b463f76b7 SHA1 7505a0eb3863f3949224512d7329c185c37883f9 SHA256 62d9a41b087a47a09d1e1e5cee4451b8427b53d63babd7e61c7620aea4cbb009
 DIST patchbundle-selinux-base-policy-2.20110726-r5.tar.bz2 23064 RMD160 289c82cd3d5207321afd826bc6b496943f4e0076 SHA1 d5202ce8fb89242c66b9af276a1aef342372e01d SHA256 696090195a0eaf768fa63230c8b2c22ae9d434698302bfd27490d486760e3f81
 DIST patchbundle-selinux-base-policy-2.20110726-r6.tar.bz2 23875 RMD160 f39dfcde7ab79bc8c5b5fc9d5744922c1d1fdf94 SHA1 2aa434dc720f70ef7f4b64acc5da6028f853cef5 SHA256 f74b8385520846597532d56d4952fd001fc6cd044a6b876508a398e1cc865619
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
 DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r7.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r7.ebuild
new file mode 100644
index 000000000000..211b3ad89369
--- /dev/null
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r7.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-2.20110726-r7.ebuild,v 1.1 2011/12/04 19:02:17 swift Exp $
+
+EAPI="4"
+IUSE="+peer_perms +open_perms +ubac doc"
+
+inherit eutils
+
+DESCRIPTION="Gentoo base policy for SELinux"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
+SRC_URI="http://oss.tresys.com/files/refpolicy/refpolicy-${PV}.tar.bz2
+	http://dev.gentoo.org/~swift/patches/${PN}/patchbundle-${PF}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-apps/policycoreutils-1.30.30
+	>=sys-fs/udev-151"
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	>=sys-apps/checkpolicy-1.30.12"
+
+S=${WORKDIR}/
+
+src_prepare() {
+	# Apply the gentoo patches to the policy. These patches are only necessary
+	# for base policies, or for interface changes on modules.
+	EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	cd "${S}/refpolicy"
+	# Fix bug 257111 - Correct the initial sid for cron-started jobs in the
+	# system_r role
+	sed -i -e 's:system_crond_t:system_cronjob_t:g' \
+		"${S}/refpolicy/config/appconfig-standard/default_contexts"
+	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
+		"${S}/refpolicy/config/appconfig-mls/default_contexts"
+	sed -i -e 's|system_r:cronjob_t|system_r:system_cronjob_t|g' \
+		"${S}/refpolicy/config/appconfig-mcs/default_contexts"
+}
+
+src_configure() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	# Update the SELinux refpolicy capabilities based on the users' USE flags.
+
+	if ! use peer_perms; then
+		sed -i -e '/network_peer_controls/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	if ! use open_perms; then
+		sed -i -e '/open_perms/d' \
+			"${S}/refpolicy/policy/policy_capabilities"
+	fi
+
+	if ! use ubac; then
+		sed -i -e '/^UBAC/s/y/n/' "${S}/refpolicy/build.conf" \
+			|| die "Failed to disable User Based Access Control"
+	fi
+
+	echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf"
+
+	# Setup the policies based on the types delivered by the end user.
+	# These types can be "targeted", "strict", "mcs" and "mls".
+	for i in ${POLICY_TYPES}; do
+		cp -a "${S}/refpolicy" "${S}/${i}"
+
+		cd "${S}/${i}";
+		make conf || die "Make conf in ${i} failed"
+
+		# Define what we see as "base" and what we want to remain modular.
+		cp "${FILESDIR}/modules.conf" \
+			"${S}/${i}/policy/modules.conf" \
+			|| die "failed to set up modules.conf"
+		# In case of "targeted", we add the "unconfined" to the base policy
+		if [[ "${i}" == "targeted" ]];
+		then
+			echo "unconfined = base" >> "${S}/${i}/policy/modules.conf"
+		fi
+
+		sed -i -e '/^QUIET/s/n/y/' -e "/^NAME/s/refpolicy/$i/" \
+			"${S}/${i}/build.conf" || die "build.conf setup failed."
+
+		if [[ "${i}" == "mls" ]] || [[ "${i}" == "mcs" ]];
+		then
+			# MCS/MLS require additional settings
+			sed -i -e "/^TYPE/s/standard/${i}/" "${S}/${i}/build.conf" \
+				|| die "failed to set type to mls"
+		fi
+
+		if [ "${i}" == "targeted" ]; then
+			sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \
+			"${S}/${i}/config/appconfig-standard/seusers" \
+			|| die "targeted seusers setup failed."
+		fi
+	done
+}
+
+src_compile() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+		make base || die "${i} compile failed"
+		if use doc; then
+			make html || die
+		fi
+	done
+}
+
+src_install() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		cd "${S}/${i}"
+
+		make DESTDIR="${D}" install \
+			|| die "${i} install failed."
+
+		make DESTDIR="${D}" install-headers \
+			|| die "${i} headers install failed."
+
+		echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type"
+
+		echo "textrel_shlib_t" >> "${D}/etc/selinux/${i}/contexts/customizable_types"
+
+		# libsemanage won't make this on its own
+		keepdir "/etc/selinux/${i}/policy"
+
+		if use doc; then
+			dohtml doc/html/*;
+		fi
+	done
+
+	dodoc doc/Makefile.example doc/example.{te,fc,if}
+
+	insinto /etc/selinux
+	doins "${FILESDIR}/config"
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-2.20101213-r13"
+	previous_less_than_r13=$?
+}
+
+pkg_postinst() {
+	[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="targeted strict mls mcs"
+
+	for i in ${POLICY_TYPES}; do
+		einfo "Inserting base module into ${i} module store."
+
+		cd "${ROOT}/usr/share/selinux/${i}"
+		semodule -s "${i}" -b base.pp || die "Could not load in new base policy"
+	done
+	elog "Updates on policies might require you to relabel files. If you, after"
+	elog "installing new SELinux policies, get 'permission denied' errors,"
+	elog "relabelling your system using 'rlpkg -a -r' might resolve the issues."
+}
diff --git a/sec-policy/selinux-denyhosts/Manifest b/sec-policy/selinux-denyhosts/Manifest
new file mode 100644
index 000000000000..9d7c2f7e14f8
--- /dev/null
+++ b/sec-policy/selinux-denyhosts/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
+DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-denyhosts/metadata.xml b/sec-policy/selinux-denyhosts/metadata.xml
new file mode 100644
index 000000000000..181c8fcc10be
--- /dev/null
+++ b/sec-policy/selinux-denyhosts/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for denyhosts</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20110726.ebuild b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20110726.ebuild
new file mode 100644
index 000000000000..efe3dfa3da09
--- /dev/null
+++ b/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20110726.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-denyhosts/selinux-denyhosts-2.20110726.ebuild,v 1.1 2011/12/04 19:02:17 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="denyhosts"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for denyhosts"
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dhcp/Manifest b/sec-policy/selinux-dhcp/Manifest
index cb1f2438a0f7..9d7c2f7e14f8 100644
--- a/sec-policy/selinux-dhcp/Manifest
+++ b/sec-policy/selinux-dhcp/Manifest
@@ -1 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
 DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-dhcp/selinux-dhcp-2.20110726-r1.ebuild b/sec-policy/selinux-dhcp/selinux-dhcp-2.20110726-r1.ebuild
new file mode 100644
index 000000000000..6f8c8cdc33f8
--- /dev/null
+++ b/sec-policy/selinux-dhcp/selinux-dhcp-2.20110726-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dhcp/selinux-dhcp-2.20110726-r1.ebuild,v 1.1 2011/12/04 19:02:18 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dhcp"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dhcp"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-dpkg/Manifest b/sec-policy/selinux-dpkg/Manifest
new file mode 100644
index 000000000000..9d7c2f7e14f8
--- /dev/null
+++ b/sec-policy/selinux-dpkg/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
+DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-dpkg/metadata.xml b/sec-policy/selinux-dpkg/metadata.xml
new file mode 100644
index 000000000000..3381586f0909
--- /dev/null
+++ b/sec-policy/selinux-dpkg/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for dpkg</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-dpkg/selinux-dpkg-2.20110726.ebuild b/sec-policy/selinux-dpkg/selinux-dpkg-2.20110726.ebuild
new file mode 100644
index 000000000000..56787f1988b0
--- /dev/null
+++ b/sec-policy/selinux-dpkg/selinux-dpkg-2.20110726.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dpkg/selinux-dpkg-2.20110726.ebuild,v 1.1 2011/12/04 19:02:18 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="dpkg"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for dpkg"
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-howl/Manifest b/sec-policy/selinux-howl/Manifest
new file mode 100644
index 000000000000..9d7c2f7e14f8
--- /dev/null
+++ b/sec-policy/selinux-howl/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
+DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-howl/metadata.xml b/sec-policy/selinux-howl/metadata.xml
new file mode 100644
index 000000000000..6a79e57f667b
--- /dev/null
+++ b/sec-policy/selinux-howl/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for howl</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-howl/selinux-howl-2.20110726.ebuild b/sec-policy/selinux-howl/selinux-howl-2.20110726.ebuild
new file mode 100644
index 000000000000..cb425e2bb37e
--- /dev/null
+++ b/sec-policy/selinux-howl/selinux-howl-2.20110726.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-howl/selinux-howl-2.20110726.ebuild,v 1.1 2011/12/04 19:02:18 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="howl"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for howl"
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-inetd/Manifest b/sec-policy/selinux-inetd/Manifest
index cc478a516ac5..b81ae43c66bc 100644
--- a/sec-policy/selinux-inetd/Manifest
+++ b/sec-policy/selinux-inetd/Manifest
@@ -1,2 +1,3 @@
 DIST patchbundle-selinux-base-policy-2.20110726-r6.tar.bz2 23875 RMD160 f39dfcde7ab79bc8c5b5fc9d5744922c1d1fdf94 SHA1 2aa434dc720f70ef7f4b64acc5da6028f853cef5 SHA256 f74b8385520846597532d56d4952fd001fc6cd044a6b876508a398e1cc865619
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
 DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-inetd/selinux-inetd-2.20110726-r2.ebuild b/sec-policy/selinux-inetd/selinux-inetd-2.20110726-r2.ebuild
new file mode 100644
index 000000000000..9354d6cce8b2
--- /dev/null
+++ b/sec-policy/selinux-inetd/selinux-inetd-2.20110726-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-inetd/selinux-inetd-2.20110726-r2.ebuild,v 1.1 2011/12/04 19:02:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="inetd"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for inetd"
+
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-mpd/Manifest b/sec-policy/selinux-mpd/Manifest
new file mode 100644
index 000000000000..9d7c2f7e14f8
--- /dev/null
+++ b/sec-policy/selinux-mpd/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
+DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-mpd/metadata.xml b/sec-policy/selinux-mpd/metadata.xml
new file mode 100644
index 000000000000..8d1d1e650398
--- /dev/null
+++ b/sec-policy/selinux-mpd/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for mpd</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-mpd/selinux-mpd-2.20110726.ebuild b/sec-policy/selinux-mpd/selinux-mpd-2.20110726.ebuild
new file mode 100644
index 000000000000..f9807686b18c
--- /dev/null
+++ b/sec-policy/selinux-mpd/selinux-mpd-2.20110726.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-mpd/selinux-mpd-2.20110726.ebuild,v 1.1 2011/12/04 19:02:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="mpd"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for mpd"
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ncftool/Manifest b/sec-policy/selinux-ncftool/Manifest
new file mode 100644
index 000000000000..9d7c2f7e14f8
--- /dev/null
+++ b/sec-policy/selinux-ncftool/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
+DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-ncftool/metadata.xml b/sec-policy/selinux-ncftool/metadata.xml
new file mode 100644
index 000000000000..cec13cb02c25
--- /dev/null
+++ b/sec-policy/selinux-ncftool/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for ncftool</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-ncftool/selinux-ncftool-2.20110726.ebuild b/sec-policy/selinux-ncftool/selinux-ncftool-2.20110726.ebuild
new file mode 100644
index 000000000000..844043943384
--- /dev/null
+++ b/sec-policy/selinux-ncftool/selinux-ncftool-2.20110726.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ncftool/selinux-ncftool-2.20110726.ebuild,v 1.1 2011/12/04 19:02:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ncftool"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ncftool"
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-networkmanager/Manifest b/sec-policy/selinux-networkmanager/Manifest
index e73797d7cc46..c940631cded0 100644
--- a/sec-policy/selinux-networkmanager/Manifest
+++ b/sec-policy/selinux-networkmanager/Manifest
@@ -1,2 +1,3 @@
 DIST patchbundle-selinux-base-policy-2.20110726-r1.tar.bz2 18052 RMD160 cff13706b370498cf7193d968b3bff47a718ed84 SHA1 68dbdf8366068f80b85333ecc8bbc578567218c5 SHA256 ebfb12f861447c8865e28ff5ee06ff0d89f870db3b9745c2b18558772a783023
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
 DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20110726-r2.ebuild b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20110726-r2.ebuild
new file mode 100644
index 000000000000..9b69432f879c
--- /dev/null
+++ b/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20110726-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-networkmanager/selinux-networkmanager-2.20110726-r2.ebuild,v 1.1 2011/12/04 19:02:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="networkmanager"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for networkmanager"
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-plymouthd/Manifest b/sec-policy/selinux-plymouthd/Manifest
new file mode 100644
index 000000000000..9d7c2f7e14f8
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
+DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-plymouthd/metadata.xml b/sec-policy/selinux-plymouthd/metadata.xml
new file mode 100644
index 000000000000..4eef3756148b
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for plymouthd</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20110726.ebuild b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20110726.ebuild
new file mode 100644
index 000000000000..f819f598a705
--- /dev/null
+++ b/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20110726.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-plymouthd/selinux-plymouthd-2.20110726.ebuild,v 1.1 2011/12/04 19:02:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="plymouthd"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for plymouthd"
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-qemu/Manifest b/sec-policy/selinux-qemu/Manifest
index e73797d7cc46..c940631cded0 100644
--- a/sec-policy/selinux-qemu/Manifest
+++ b/sec-policy/selinux-qemu/Manifest
@@ -1,2 +1,3 @@
 DIST patchbundle-selinux-base-policy-2.20110726-r1.tar.bz2 18052 RMD160 cff13706b370498cf7193d968b3bff47a718ed84 SHA1 68dbdf8366068f80b85333ecc8bbc578567218c5 SHA256 ebfb12f861447c8865e28ff5ee06ff0d89f870db3b9745c2b18558772a783023
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
 DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-qemu/selinux-qemu-2.20110726-r2.ebuild b/sec-policy/selinux-qemu/selinux-qemu-2.20110726-r2.ebuild
new file mode 100644
index 000000000000..00361500e103
--- /dev/null
+++ b/sec-policy/selinux-qemu/selinux-qemu-2.20110726-r2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-qemu/selinux-qemu-2.20110726-r2.ebuild,v 1.1 2011/12/04 19:02:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="qemu"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for qemu"
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-rpm/Manifest b/sec-policy/selinux-rpm/Manifest
new file mode 100644
index 000000000000..9d7c2f7e14f8
--- /dev/null
+++ b/sec-policy/selinux-rpm/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
+DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-rpm/metadata.xml b/sec-policy/selinux-rpm/metadata.xml
new file mode 100644
index 000000000000..97163ee01560
--- /dev/null
+++ b/sec-policy/selinux-rpm/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for rpm</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-rpm/selinux-rpm-2.20110726.ebuild b/sec-policy/selinux-rpm/selinux-rpm-2.20110726.ebuild
new file mode 100644
index 000000000000..6d1b15206541
--- /dev/null
+++ b/sec-policy/selinux-rpm/selinux-rpm-2.20110726.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-rpm/selinux-rpm-2.20110726.ebuild,v 1.1 2011/12/04 19:02:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="rpm"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for rpm"
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-ucspitcp/Manifest b/sec-policy/selinux-ucspitcp/Manifest
new file mode 100644
index 000000000000..9d7c2f7e14f8
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
+DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-ucspitcp/metadata.xml b/sec-policy/selinux-ucspitcp/metadata.xml
new file mode 100644
index 000000000000..0b51f5c3f1d6
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for ucspitcp</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20110726.ebuild b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20110726.ebuild
new file mode 100644
index 000000000000..ff0f215ce425
--- /dev/null
+++ b/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20110726.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-ucspitcp/selinux-ucspitcp-2.20110726.ebuild,v 1.1 2011/12/04 19:02:19 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="ucspitcp"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for ucspitcp"
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-uucp/Manifest b/sec-policy/selinux-uucp/Manifest
new file mode 100644
index 000000000000..9d7c2f7e14f8
--- /dev/null
+++ b/sec-policy/selinux-uucp/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
+DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-uucp/metadata.xml b/sec-policy/selinux-uucp/metadata.xml
new file mode 100644
index 000000000000..81b3601287db
--- /dev/null
+++ b/sec-policy/selinux-uucp/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for uucp</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-uucp/selinux-uucp-2.20110726.ebuild b/sec-policy/selinux-uucp/selinux-uucp-2.20110726.ebuild
new file mode 100644
index 000000000000..fbcf275017fc
--- /dev/null
+++ b/sec-policy/selinux-uucp/selinux-uucp-2.20110726.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-uucp/selinux-uucp-2.20110726.ebuild,v 1.1 2011/12/04 19:02:20 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="uucp"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for uucp"
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-vnstatd/Manifest b/sec-policy/selinux-vnstatd/Manifest
new file mode 100644
index 000000000000..9d7c2f7e14f8
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
+DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-vnstatd/metadata.xml b/sec-policy/selinux-vnstatd/metadata.xml
new file mode 100644
index 000000000000..78279e20ce48
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for vnstatd</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20110726.ebuild b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20110726.ebuild
new file mode 100644
index 000000000000..2ababd64a364
--- /dev/null
+++ b/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20110726.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-vnstatd/selinux-vnstatd-2.20110726.ebuild,v 1.1 2011/12/04 19:02:20 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="vnstatd"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for vnstatd"
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-wm/Manifest b/sec-policy/selinux-wm/Manifest
new file mode 100644
index 000000000000..9d7c2f7e14f8
--- /dev/null
+++ b/sec-policy/selinux-wm/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
+DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-wm/metadata.xml b/sec-policy/selinux-wm/metadata.xml
new file mode 100644
index 000000000000..abb4afe838dc
--- /dev/null
+++ b/sec-policy/selinux-wm/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for wm</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-wm/selinux-wm-2.20110726.ebuild b/sec-policy/selinux-wm/selinux-wm-2.20110726.ebuild
new file mode 100644
index 000000000000..cea0187bcfd4
--- /dev/null
+++ b/sec-policy/selinux-wm/selinux-wm-2.20110726.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-wm/selinux-wm-2.20110726.ebuild,v 1.1 2011/12/04 19:02:20 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="wm"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for wm"
+KEYWORDS="~amd64 ~x86"
diff --git a/sec-policy/selinux-xprint/Manifest b/sec-policy/selinux-xprint/Manifest
new file mode 100644
index 000000000000..9d7c2f7e14f8
--- /dev/null
+++ b/sec-policy/selinux-xprint/Manifest
@@ -0,0 +1,2 @@
+DIST patchbundle-selinux-base-policy-2.20110726-r7.tar.bz2 24545 RMD160 b85b95f4da29a11cfa7ff0b3209933741b1918be SHA1 b2a99809b5a293c1d6dbff3686b6120a2a779560 SHA256 cd8c9e78dcfdc78a957fe6231667eb7982146ab3523baa8d9a738d7cbee53f65
+DIST refpolicy-2.20110726.tar.bz2 588033 RMD160 9803effffe1dbb28d52bee03432e052f4fdc8d3f SHA1 cc27b06c3f541d8f2c57c52804ab6893afcd9db2 SHA256 8159b7535aa0f805510e4e3504b1317d7083b227f0ef3df51c6f002ed70ecedb
diff --git a/sec-policy/selinux-xprint/metadata.xml b/sec-policy/selinux-xprint/metadata.xml
new file mode 100644
index 000000000000..859bf937bb56
--- /dev/null
+++ b/sec-policy/selinux-xprint/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>selinux</herd>
+	<longdescription>Gentoo SELinux policy for xprint</longdescription>
+</pkgmetadata>
diff --git a/sec-policy/selinux-xprint/selinux-xprint-2.20110726.ebuild b/sec-policy/selinux-xprint/selinux-xprint-2.20110726.ebuild
new file mode 100644
index 000000000000..f2ed4767aa5d
--- /dev/null
+++ b/sec-policy/selinux-xprint/selinux-xprint-2.20110726.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-xprint/selinux-xprint-2.20110726.ebuild,v 1.1 2011/12/04 19:02:20 swift Exp $
+EAPI="4"
+
+IUSE=""
+MODS="xprint"
+BASEPOL="2.20110726-r7"
+
+inherit selinux-policy-2
+
+DESCRIPTION="SELinux policy for xprint"
+KEYWORDS="~amd64 ~x86"
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 7788ac6c78a6..e566cc7ed980 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,4 +1,3 @@
-DIST ack-1.92.tar.gz 103454 RMD160 c5fe12050ef8a2698f4d0d68085dcc3bcb8bde92 SHA1 6ea70ccab642909e7f274b372efdb6b0161e0d1e SHA256 8689156cb0639ff60adee47fc4b77e656cf0fc58e6c123ee6c481d9d48e99b88
 DIST ack-1.94.tar.gz 109343 RMD160 3482437ad0796740fa2375797831d25e74100f76 SHA1 5d0261413138eddeec68a52fe5d18769e959cec8 SHA256 5def0df74e17eb87f7848997879c958e42ed93554113c655c7ca5c0066c3156d
 DIST ack-1.96.tar.gz 111986 RMD160 36cb15996f2b0d0d3a27ab10281c589f693b05a9 SHA1 00f50aeffa38f0db73f03e69ce213d22f086bf4f SHA256 bb9d29842d8c5c1ec7ad9b577707aca0e1d278e8e21560dbed76ea3b5aa6cb64
 DIST ack-gentoo-r1.patch.bz2 325 RMD160 d55ade1514fd0bc09d101bffd38d1808e29f42a0 SHA1 130c958c995aac9a9f4b63b4232ebd040dc94fb5 SHA256 8848e5476fb5e4b0a86944da79207b6db20b2ade85cf4add418dcf777c428fc3
diff --git a/sys-apps/ack/ack-1.92.ebuild b/sys-apps/ack/ack-1.92.ebuild
deleted file mode 100644
index 694420fa9088..000000000000
--- a/sys-apps/ack/ack-1.92.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ack/ack-1.92.ebuild,v 1.3 2010/05/06 07:03:06 tove Exp $
-
-inherit perl-module bash-completion
-
-DESCRIPTION="ack is a tool like grep, aimed at programmers with large trees of heterogeneous source code"
-HOMEPAGE="http://www.petdance.com/ack/"
-SRC_URI="mirror://cpan/authors/id/P/PE/PETDANCE/${P}.tar.gz"
-
-LICENSE="|| ( Artistic-2 GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-SRC_TEST=do
-
-DEPEND=">=dev-perl/File-Next-1.02
-	dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	perl-module_src_install
-	dobashcompletion etc/ack.bash_completion.sh
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-	bash-completion_pkg_postinst
-}
diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest
index 43a1f409adb1..c8650c861c63 100644
--- a/sys-apps/elfix/Manifest
+++ b/sys-apps/elfix/Manifest
@@ -1,2 +1,2 @@
 DIST elfix-0.3.2.tar.gz 124040 RMD160 5db202c06877924ab871dc66d9ca9256db1ea542 SHA1 b371dc8dad4c19ec303fdc9d662136a96aacc38f SHA256 71a738eea3c2f3132e243425ff694073e89ef3c8395bea79c5ee54ba51822713
-DIST elfix-0.4.0.tar.gz 130476 RMD160 e5f1e21cc7e629b830044f5f21d7a81c0caa5e6b SHA1 fa77882118db1d92022d14108bc9636bf9b8cb93 SHA256 38348ce5205700b5deb0141cb31a1d99edf4e125218fc7535f22664da478ceb3
+DIST elfix-0.4.1.tar.gz 130576 RMD160 627c94fcc0fe34727e93820b4cf9cc8be75c97bb SHA1 f4b8fa684aa76a6cd1e0568ccfeae27c52eab6cd SHA256 119dbbbbdb500d3b8f20c5039afce47404eee2ad7a9cca52e7743dc082fdb47c
diff --git a/sys-apps/elfix/elfix-0.4.0.ebuild b/sys-apps/elfix/elfix-0.4.1.ebuild
similarity index 84%
rename from sys-apps/elfix/elfix-0.4.0.ebuild
rename to sys-apps/elfix/elfix-0.4.1.ebuild
index dae7ffaaa139..7f5fd74311f7 100644
--- a/sys-apps/elfix/elfix-0.4.0.ebuild
+++ b/sys-apps/elfix/elfix-0.4.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/elfix/elfix-0.4.0.ebuild,v 1.1 2011/11/27 03:29:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/elfix/elfix-0.4.1.ebuild,v 1.1 2011/12/04 22:07:17 blueness Exp $
 
-EAPI=4
+EAPI="4"
 
 DESCRIPTION="Tools to fix ELF binaries to work on Hardened Gentoo"
 HOMEPAGE="http://dev.gentoo.org/~blueness/elfix/"
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 984ff39f37aa..53b8e875848e 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.95 2011/11/30 16:15:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.96 2011/12/04 23:38:53 williamh Exp $
 
 EAPI=4
 
@@ -235,9 +235,6 @@ pkg_preinst() {
 	# termencoding was added in 0.2.1 and needed in boot
 	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
 
-	# migrate-run was added in 0.9.6 and is needed in boot
-	use kernel_linux && add_boot_init migrate-run
-
 	# set default interactive shell to sulogin if it exists
 	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
 
diff --git a/sys-apps/smartmontools/smartmontools-5.42.ebuild b/sys-apps/smartmontools/smartmontools-5.42.ebuild
index dec4b6362abc..a498e6244f3b 100644
--- a/sys-apps/smartmontools/smartmontools-5.42.ebuild
+++ b/sys-apps/smartmontools/smartmontools-5.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.42.ebuild,v 1.3 2011/11/30 03:44:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.42.ebuild,v 1.4 2011/12/04 17:34:03 armin76 Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-linux"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-linux"
 fi
 
 DESCRIPTION="Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.) monitoring tools"
diff --git a/sys-devel/gcc/gcc-3.3.6-r1.ebuild b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
index 14bb6b751b32..d9542cfdc0d0 100644
--- a/sys-devel/gcc/gcc-3.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.21 2011/12/02 23:43:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.22 2011/12/04 23:00:46 vapier Exp $
 
-MAN_VER=""
 PATCH_VER="1.7"
 UCLIBC_VER="1.0"
 PIE_VER="8.7.8"
diff --git a/sys-devel/gcc/gcc-3.4.6-r2.ebuild b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
index 4cbe4b283d67..ab46a4d7cb7b 100644
--- a/sys-devel/gcc/gcc-3.4.6-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.29 2011/12/02 23:43:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.30 2011/12/04 23:00:46 vapier Exp $
 
-MAN_VER=""
 PATCH_VER="1.6"
 UCLIBC_VER="1.1"
 UCLIBC_GCC_VER="3.4.5"
diff --git a/sys-fs/encfs/encfs-1.7.4.ebuild b/sys-fs/encfs/encfs-1.7.4.ebuild
index c3865b1469ef..606805968698 100644
--- a/sys-fs/encfs/encfs-1.7.4.ebuild
+++ b/sys-fs/encfs/encfs-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/encfs-1.7.4.ebuild,v 1.3 2011/11/28 11:43:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/encfs-1.7.4.ebuild,v 1.4 2011/12/04 16:43:32 hwoarang Exp $
 
 EAPI=2
 inherit eutils multilib versionator
@@ -11,7 +11,7 @@ SRC_URI="http://encfs.googlecode.com/files/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE="xattr"
 
 RDEPEND=">=dev-libs/boost-1.34
diff --git a/sys-fs/quota/quota-4.00.ebuild b/sys-fs/quota/quota-4.00.ebuild
index a97a76bc076c..d9dbf8f80454 100644
--- a/sys-fs/quota/quota-4.00.ebuild
+++ b/sys-fs/quota/quota-4.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-4.00.ebuild,v 1.1 2011/09/14 04:58:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quota/quota-4.00.ebuild,v 1.2 2011/12/04 16:48:58 vapier Exp $
 
 EAPI="2"
 
@@ -16,7 +16,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ldap netlink nls rpc tcpd"
 
 RDEPEND="ldap? ( >=net-nds/openldap-2.3.35 )
-	netlink? ( sys-apps/dbus dev-libs/libnl )
+	netlink? (
+		sys-apps/dbus
+		dev-libs/libnl:1.1
+	)
 	rpc? ( net-nds/rpcbind )
 	tcpd? ( sys-apps/tcp-wrappers )"
 DEPEND="${RDEPEND}
diff --git a/sys-fs/vhba/vhba-20101015-r1.ebuild b/sys-fs/vhba/vhba-20101015-r1.ebuild
index 14c76ae28812..5705401eeded 100644
--- a/sys-fs/vhba/vhba-20101015-r1.ebuild
+++ b/sys-fs/vhba/vhba-20101015-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-20101015-r1.ebuild,v 1.4 2011/11/28 11:47:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-20101015-r1.ebuild,v 1.5 2011/12/04 16:44:57 hwoarang Exp $
 
 # Use svn snapshots:
 # https://sourceforge.net/tracker/?func=detail&atid=603423&aid=3041832&group_id=93175
@@ -18,7 +18,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="virtual/linux-sources"
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index f5d75ec68988..af721572d8e1 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -55,6 +55,7 @@ DIST hardened-patches-2.6.32-77.extras.tar.bz2 500970 RMD160 2ad6967945d3998f726
 DIST hardened-patches-2.6.32-78.extras.tar.bz2 511955 RMD160 7a309e73ba13f1b147dc5d7bd727e3d19f3ffacd SHA1 f5190a1eedca3993405a4ef77925ee967ff05923 SHA256 b44cb691fae9faf1979b0f051a7135c8a5bda087ef920ee70845cfecf0cebb55
 DIST hardened-patches-2.6.32-79.extras.tar.bz2 511382 RMD160 a834552cec03b09c1621d263b6ba91af6707b5e3 SHA1 819ace7c9672ec64d1a659d75c012456060bd015 SHA256 29e67427383fffb1808971995d23471abf0b36831838207353196842c0a64918
 DIST hardened-patches-2.6.32-80.extras.tar.bz2 511275 RMD160 7d22fdfd1bf370e91fca9a13546ce1b789404f5b SHA1 a5773a0ef2c7a5aa3e81757db3a050df36528ac7 SHA256 57b2fbee1d5b0dbc14a872db4f31f96ee9e2a357fecae4c14b26fdd15a0b1b02
+DIST hardened-patches-2.6.32-81.extras.tar.bz2 510801 RMD160 17ba9076d1c05ad6317ba4cf98ddbb6dd4ebb635 SHA1 0dc3b4cd6d5ef47898fc76a4f087a6d107d4a01b SHA256 3603f4d3ae83188a774912259b5d7e43d32cf050a10a0db2b86f60c7135ba1f0
 DIST hardened-patches-2.6.36-10.extras.tar.bz2 363448 RMD160 a656acbca00a3f238f83a14566dbeade33c69092 SHA1 c53dd6aae4c779cb135a612c416f2f623f9a9ce5 SHA256 e818e8bd2066f32aa209309aa17a482e7a006ae748d850860b900226720ce8dc
 DIST hardened-patches-2.6.37-8.extras.tar.bz2 367417 RMD160 d2a3fa214047d8fd232557f5bc6383ab01132d1f SHA1 f8a39d414d63dfcaa408eed1d9f2d5ff4fd0f72e SHA256 2593fcfa4c8363bbf9ee95bd7fa1befb15ee830262664a163da58a975548682d
 DIST hardened-patches-2.6.38-7.extras.tar.bz2 442689 RMD160 bd661205cd9f5976a702d55ff0aa0399c1cd8fcc SHA1 f1844f17fcb61a4fd569b45cddaf8a9869f932ee SHA256 a42f0c5d38621f92302a5250e59881b86858173f775a1d0a2db35bcd07066d4b
@@ -67,6 +68,7 @@ DIST hardened-patches-3.0.8-2.extras.tar.bz2 498271 RMD160 9d3b1699a5e10f339b2e1
 DIST hardened-patches-3.1.1-1.extras.tar.bz2 484847 RMD160 b445905722b085357d34d9abc2a90baf2c979ece SHA1 36f2b3bc3ccccee6121864c346bd142a12d67bfe SHA256 1982fcf33ff765121bc1b47d607e6eae58ee25845a6c2d92fab9b7633257c36f
 DIST hardened-patches-3.1.1-2.extras.tar.bz2 483003 RMD160 ee59a32244dd5819c90d8162e42bc1d41206e159 SHA1 0ecc015e1facc85f4b554fdd5b48af16ed383f35 SHA256 e81a34081b9a6a31430f9da16444892985dee7b794b3d6090029921ebfad9f56
 DIST hardened-patches-3.1.3-1.extras.tar.bz2 483600 RMD160 4bb5f38c9dec850a7d212ea1e82686518b7d1425 SHA1 8d039fb7da9a5ae9e050a6cc571a4597957436b2 SHA256 8dd47888cd78ed58b69377e3c702b09086c3e47c3cec6920902eb9d3881d0051
+DIST hardened-patches-3.1.4-1.extras.tar.bz2 491020 RMD160 58b83175266b2e7c014949186a5c73f466924ae2 SHA1 a2cf7c22c02afe59d398f711bf780269def8cd0f SHA256 e1c82cfbaa4997675db3e001a3575983606c12fa74833c4a5dfaeaf493c4d449
 DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
 DIST linux-2.6.36.tar.bz2 70277083 RMD160 d739da505a79e71a1370d36e1373b36be055c123 SHA1 b546ab66458d7d614151d80adbc03b4d28977ae2 SHA256 15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04
 DIST linux-2.6.37.tar.bz2 73577826 RMD160 fced3801f3c94aa545c90e10981de616376a3b41 SHA1 eba83c89e71a86060ef6ff76aefff660aef819e2 SHA256 edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.32-r79.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r79.ebuild
new file mode 100644
index 000000000000..74f5e2e42a5a
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.32-r79.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.32-r79.ebuild,v 1.1 2011/12/04 22:57:08 blueness Exp $
+
+EAPI="4"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="45"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-81"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="2901_kbuild-fix-passing-wno-options-to-gcc-4.4.patch 4200_fbcondecor-0.9.6.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-2.2.2*"
+
+	ewarn
+	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
+	ewarn "[server], [workstation], and [virtualization]."
+	ewarn
+	ewarn "Those who intend to use one of these predefined grsecurity levels"
+	ewarn "should read the help associated with the level.  Users importing a"
+	ewarn "kernel configuration from a kernel prior to ${PN}-2.6.32,"
+	ewarn "should review their selected grsecurity/PaX options carefully."
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.1.4.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.1.4.ebuild
new file mode 100644
index 000000000000..b054cf207a62
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-3.1.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.1.4.ebuild,v 1.1 2011/12/04 22:59:35 blueness Exp $
+
+EAPI="4"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="6"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-2.2.2*"
+
+	ewarn
+	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
+	ewarn "[server], [workstation], and [virtualization]."
+	ewarn
+	ewarn "Those who intend to use one of these predefined grsecurity levels"
+	ewarn "should read the help associated with the level.  Users importing a"
+	ewarn "kernel configuration from a kernel prior to ${PN}-2.6.32,"
+	ewarn "should review their selected grsecurity/PaX options carefully."
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.39.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.39.ebuild
index 6491190d23af..561b28e8897c 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.39.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.39.ebuild,v 1.7 2011/10/31 00:24:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.39.ebuild,v 1.8 2011/12/04 15:33:02 armin76 Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz"
 [[ -n ${PATCH_VER} ]] && SRC_URI="${SRC_URI} mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-libs/glibc/glibc-2.13-r4.ebuild b/sys-libs/glibc/glibc-2.13-r4.ebuild
index bc1355745413..e775a5d00f2c 100644
--- a/sys-libs/glibc/glibc-2.13-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.13-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r4.ebuild,v 1.5 2011/12/03 10:42:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.13-r4.ebuild,v 1.6 2011/12/04 16:27:51 hwoarang Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -8,7 +8,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="http://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
diff --git a/sys-libs/libixp/libixp-0.5_p20110208.ebuild b/sys-libs/libixp/libixp-0.5_p20110208-r2.ebuild
similarity index 68%
rename from sys-libs/libixp/libixp-0.5_p20110208.ebuild
rename to sys-libs/libixp/libixp-0.5_p20110208-r2.ebuild
index b9da094a1d33..858bb259f96c 100644
--- a/sys-libs/libixp/libixp-0.5_p20110208.ebuild
+++ b/sys-libs/libixp/libixp-0.5_p20110208-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/libixp-0.5_p20110208.ebuild,v 1.3 2011/03/17 15:29:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/libixp-0.5_p20110208-r2.ebuild,v 1.2 2011/12/04 21:40:10 ssuominen Exp $
 
 # hg clone http://hg.suckless.org/libixp
 
-EAPI=3
+EAPI=4
 inherit multilib toolchain-funcs
 
 DESCRIPTION="A stand-alone client/server 9P library including ixpc client"
@@ -27,16 +27,21 @@ pkg_setup() {
 		LD="$(tc-getCC) ${LDFLAGS}"
 		AR="$(tc-getAR) crs"
 		MAKESO="1"
-		SOLDFLAGS="-shared -Wl,-soname"
+		SOLDFLAGS="-shared"
 		)
 }
 
+src_prepare() {
+	# http://code.google.com/p/libixp/issues/detail?id=2
+	sed -i -e 's:ixp_serve9pconn:ixp_serve9conn:' include/ixp.h || die
+}
+
 src_compile() {
-	emake "${myixpconf[@]}" || die
+	emake "${myixpconf[@]}"
 }
 
 src_install() {
-	emake "${myixpconf[@]}" DESTDIR="${D}" install || die
-	dolib.so lib/libixp{,_pthread}.so || die
+	emake "${myixpconf[@]}" DESTDIR="${D}" install
+	dolib.so lib/libixp{,_pthread}.so
 	dodoc NEWS
 }
diff --git a/sys-process/psmisc/psmisc-22.14.ebuild b/sys-process/psmisc/psmisc-22.14.ebuild
index 9b3e54b4cf36..1245dff357ac 100644
--- a/sys-process/psmisc/psmisc-22.14.ebuild
+++ b/sys-process/psmisc/psmisc-22.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.14.ebuild,v 1.3 2011/12/02 22:31:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.14.ebuild,v 1.4 2011/12/04 15:42:12 armin76 Exp $
 
 EAPI=3
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/psmisc/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="ipv6 nls selinux X"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2
diff --git a/virtual/ruby-minitest/ruby-minitest-0-r1.ebuild b/virtual/ruby-minitest/ruby-minitest-0-r1.ebuild
index 466321f159b3..566d7988ff19 100644
--- a/virtual/ruby-minitest/ruby-minitest-0-r1.ebuild
+++ b/virtual/ruby-minitest/ruby-minitest-0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-minitest/ruby-minitest-0-r1.ebuild,v 1.10 2011/07/10 22:48:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-minitest/ruby-minitest-0-r1.ebuild,v 1.11 2011/12/05 00:22:12 naota Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="ruby_targets_ruby18? ( dev-ruby/minitest[ruby_targets_ruby18] )
diff --git a/www-apps/tt-rss/tt-rss-1.5.7.ebuild b/www-apps/tt-rss/tt-rss-1.5.7.ebuild
index 4e74473e2343..1a7ac143990c 100644
--- a/www-apps/tt-rss/tt-rss-1.5.7.ebuild
+++ b/www-apps/tt-rss/tt-rss-1.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-1.5.7.ebuild,v 1.1 2011/12/04 10:53:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tt-rss/tt-rss-1.5.7.ebuild,v 1.2 2011/12/04 22:23:17 mr_bones_ Exp $
 
 EAPI="2"
 
@@ -53,7 +53,7 @@ src_install() {
 	insinto "/${MY_HTDOCSDIR}"
 	doins -r * || die "Could not copy the files to ${MY_HTDOCSDIR}."
 	keepdir "/${MY_HTDOCSDIR}"/feed-icons
-	
+
 	insinto /etc/logrotate.d/
 	newins "${FILESDIR}"/ttrssd.logrotated ttrssd || die "Installing ttrssd logrotate config failed."
 
diff --git a/x11-libs/libfm/libfm-0.1.17.ebuild b/x11-libs/libfm/libfm-0.1.17.ebuild
index 30399a97c0fb..424f8b6f77be 100644
--- a/x11-libs/libfm/libfm-0.1.17.ebuild
+++ b/x11-libs/libfm/libfm-0.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.17.ebuild,v 1.2 2011/12/04 09:56:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.17.ebuild,v 1.3 2011/12/04 16:51:08 hwoarang Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ DESCRIPTION="A library for file management"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
 SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~x86 ~x86-linux"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug examples udev"
diff --git a/x11-misc/devilspie/devilspie-0.22.ebuild b/x11-misc/devilspie/devilspie-0.22.ebuild
index c5bc73a74e3d..34e9cc1ff2bc 100644
--- a/x11-misc/devilspie/devilspie-0.22.ebuild
+++ b/x11-misc/devilspie/devilspie-0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/devilspie/devilspie-0.22.ebuild,v 1.10 2011/03/21 22:35:23 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/devilspie/devilspie-0.22.ebuild,v 1.11 2011/12/04 17:20:18 jer Exp $
 
 EAPI=2
 inherit autotools
@@ -14,9 +14,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.10
+RDEPEND="
+	>=dev-libs/glib-2.10
 	x11-libs/gtk+:2
-	>=x11-libs/libwnck-2.10:1"
+	>=x11-libs/libwnck-2.10:1
+	x11-libs/libX11
+"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool
@@ -27,6 +30,7 @@ src_prepare() {
 	sed -i -e "s:\(/usr/share/doc/devilspie\):\1-${PVR}:" devilspie.1 || die
 	sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am || die
 	eautoreconf
+	export LIBS="-lX11"
 }
 
 src_install() {
diff --git a/x11-misc/i855crt/files/i855crt-i915support.diff b/x11-misc/i855crt/files/i855crt-i915support.diff
index 83c9c38dd19a..5aea3a7dd96c 100644
--- a/x11-misc/i855crt/files/i855crt-i915support.diff
+++ b/x11-misc/i855crt/files/i855crt-i915support.diff
@@ -1,6 +1,5 @@
-diff -ur ../i855-crt-0.4/dumpreg.c ./dumpreg.c
---- ../i855-crt-0.4/dumpreg.c	2004-05-01 17:50:45.000000000 +0100
-+++ ./dumpreg.c	2005-05-31 15:18:12.927156400 +0100
+--- a/dumpreg.c
++++ b/dumpreg.c
 @@ -36,10 +36,11 @@
  		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
  		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
@@ -24,9 +23,8 @@ diff -ur ../i855-crt-0.4/dumpreg.c ./dumpreg.c
  		exit(1);
  	}
  	pclose(pci_f);
-diff -ur ../i855-crt-0.4/i855crt.c ./i855crt.c
---- ../i855-crt-0.4/i855crt.c	2004-05-08 13:27:20.000000000 +0100
-+++ ./i855crt.c	2005-05-31 15:17:57.100562408 +0100
+--- a/i855crt.c
++++ b/i855crt.c
 @@ -254,14 +254,15 @@
  		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
  		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
@@ -55,9 +53,8 @@ diff -ur ../i855-crt-0.4/i855crt.c ./i855crt.c
  		exit(1);
  	}
  	pclose(pci_f);
-diff -ur ../i855-crt-0.4/i855crt.h ./i855crt.h
---- ../i855-crt-0.4/i855crt.h	2004-05-01 17:06:28.000000000 +0100
-+++ ./i855crt.h	2005-05-31 15:07:53.232364328 +0100
+--- a/i855crt.h
++++ b/i855crt.h
 @@ -1,3 +1,4 @@
 +
  /* 
diff --git a/x11-misc/i855crt/i855crt-0.4-r1.ebuild b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
index 28202162afcf..e3a9fe666dd1 100644
--- a/x11-misc/i855crt/i855crt-0.4-r1.ebuild
+++ b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/i855crt-0.4-r1.ebuild,v 1.2 2010/07/21 14:41:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i855crt/i855crt-0.4-r1.ebuild,v 1.3 2011/12/04 17:10:39 jer Exp $
 
-inherit eutils
+EAPI=4
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Intel Montara 855GM CRT out auxiliary driver"
 HOMEPAGE="http://i855crt.sourceforge.net/"
@@ -13,21 +15,28 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="x11-libs/libXext
-	x11-libs/libXv"
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXv
+"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-i915support.diff
 
+	# respect CC, fix underlinking
+	sed -i Makefile \
+		-e 's|gcc|$(CC)|g;/LDFLAGS/{s|$| -lX11|g};s|-lXext||g' \
+		|| die
+	export LIBS="-lX11"
+	tc-export CC
+
 	# upstream ships it with the binary, we want to make sure we compile it
-	make clean || die
+	emake clean
 }
 
 src_install() {
-	dobin i855crt || die
+	dobin i855crt
 	insinto /etc
-	doins i855crt.conf || die
+	doins i855crt.conf
 }
diff --git a/x11-misc/i855crt/metadata.xml b/x11-misc/i855crt/metadata.xml
index 765213152ab6..64053a557335 100644
--- a/x11-misc/i855crt/metadata.xml
+++ b/x11-misc/i855crt/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>desktop-misc</herd>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 i855crt is a tool to send the output of a i855-based graphic card to the
 external VGA, primarily used for presentations.
diff --git a/x11-misc/macopix/macopix-1.7.4.ebuild b/x11-misc/macopix/macopix-1.7.4.ebuild
index a45becff1fcb..dd9c779bb6b6 100644
--- a/x11-misc/macopix/macopix-1.7.4.ebuild
+++ b/x11-misc/macopix/macopix-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/macopix-1.7.4.ebuild,v 1.4 2011/03/02 17:44:48 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/macopix-1.7.4.ebuild,v 1.5 2011/12/04 16:38:00 jer Exp $
 
 EAPI=2
 DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application on UNIX / X Window system."
@@ -42,6 +42,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_configure() {
+	export LIBS="-lX11"
 	econf \
 		--with-gtk2 \
 		$(use_enable nls) \
diff --git a/x11-misc/pcmanfm/pcmanfm-0.9.10.ebuild b/x11-misc/pcmanfm/pcmanfm-0.9.10.ebuild
index 5070a0b50bfc..6651b759791a 100644
--- a/x11-misc/pcmanfm/pcmanfm-0.9.10.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-0.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-0.9.10.ebuild,v 1.2 2011/12/04 09:58:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/pcmanfm/pcmanfm-0.9.10.ebuild,v 1.3 2011/12/04 16:51:18 hwoarang Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ DESCRIPTION="Fast lightweight tabbed filemanager"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
 SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~x86 ~x86-linux"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug"
diff --git a/x11-misc/xautomation/Manifest b/x11-misc/xautomation/Manifest
index 269ce5bd5131..cc9394bcc00b 100644
--- a/x11-misc/xautomation/Manifest
+++ b/x11-misc/xautomation/Manifest
@@ -1,2 +1,3 @@
 DIST xautomation-1.01.tar.gz 94175 RMD160 aa19d9454d575dc9a39996881bd6e9c2ef8debf8 SHA1 f9c9726c37ae7d857758a7323403f77658aa3f9f SHA256 c46e5b7c0801fd58da51fe2f8515ac35a939e204fd8c5443558dff4339e399d0
 DIST xautomation-1.03.tar.gz 103565 RMD160 34154ee1cfc278d0dcc6baf2d81a926d4c06073e SHA1 0e9d1d030134b1d5fe25540edad8fbbd297b70ef SHA256 11667ddb4713302b8a3be997f77cc5a672c55c362f52d8bbdc058ab11ff5f9c5
+DIST xautomation-1.05.tar.gz 114472 RMD160 05c07dd2b9036aaa77bfbf074cbe70f37b02932f SHA1 f8b06d9573802880bc4bd866b71890ae9a0e640b SHA256 b57056699c405f12ad07254bd2486202df56bbfe2ca9db60cf4f3bedf7425d93
diff --git a/x11-misc/xautomation/xautomation-1.01.ebuild b/x11-misc/xautomation/xautomation-1.01.ebuild
index 0e7e587e84a9..61f86e3ab435 100644
--- a/x11-misc/xautomation/xautomation-1.01.ebuild
+++ b/x11-misc/xautomation/xautomation-1.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautomation/xautomation-1.01.ebuild,v 1.5 2008/04/12 15:35:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautomation/xautomation-1.01.ebuild,v 1.6 2011/12/04 16:53:52 jer Exp $
 
 DESCRIPTION="Control X from command line and find things on screen"
 HOMEPAGE="http://hoopajoo.net/projects/xautomation.html"
@@ -11,14 +11,17 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
 IUSE=""
 
-RDEPEND="x11-libs/libXtst
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
+RDEPEND="
+	media-libs/libpng
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
 	x11-proto/inputproto
 	x11-proto/xextproto
 	x11-proto/xproto
-	media-libs/libpng"
+"
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
diff --git a/x11-misc/xautomation/xautomation-1.03.ebuild b/x11-misc/xautomation/xautomation-1.03.ebuild
index f80f53cbd777..0f950ff5d374 100644
--- a/x11-misc/xautomation/xautomation-1.03.ebuild
+++ b/x11-misc/xautomation/xautomation-1.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautomation/xautomation-1.03.ebuild,v 1.2 2011/11/06 17:12:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautomation/xautomation-1.03.ebuild,v 1.3 2011/12/04 16:53:53 jer Exp $
 
 DESCRIPTION="Control X from command line and find things on screen"
 HOMEPAGE="http://hoopajoo.net/projects/xautomation.html"
@@ -11,14 +11,17 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/libXtst
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
+RDEPEND="
+	media-libs/libpng
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
 	x11-proto/inputproto
 	x11-proto/xextproto
 	x11-proto/xproto
-	media-libs/libpng"
+"
 
 src_install() {
 	emake DESTDIR="${D}" install || die
diff --git a/x11-misc/xautomation/xautomation-1.05.ebuild b/x11-misc/xautomation/xautomation-1.05.ebuild
new file mode 100644
index 000000000000..ea72902ad6e6
--- /dev/null
+++ b/x11-misc/xautomation/xautomation-1.05.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xautomation/xautomation-1.05.ebuild,v 1.1 2011/12/04 16:53:53 jer Exp $
+
+EAPI=4
+
+DESCRIPTION="Control X from command line and find things on screen"
+HOMEPAGE="http://hoopajoo.net/projects/xautomation.html"
+SRC_URI="http://hoopajoo.net/static/projects/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libpng
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+
+DOCS=( AUTHORS ChangeLog )
+
+src_prepare() {
+	export LIBS="-lX11"
+}
diff --git a/x11-wm/wmii/wmii-3.9.2-r1.ebuild b/x11-wm/wmii/wmii-3.9.2-r2.ebuild
similarity index 63%
rename from x11-wm/wmii/wmii-3.9.2-r1.ebuild
rename to x11-wm/wmii/wmii-3.9.2-r2.ebuild
index cd66b2237c9b..8bd9cc45aa79 100644
--- a/x11-wm/wmii/wmii-3.9.2-r1.ebuild
+++ b/x11-wm/wmii/wmii-3.9.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.9.2-r1.ebuild,v 1.5 2011/05/29 08:36:05 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.9.2-r2.ebuild,v 1.2 2011/12/04 21:44:40 ssuominen Exp $
 
 EAPI=2
 inherit flag-o-matic multilib toolchain-funcs
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
-COMMON_DEPEND="x11-libs/libXft
+COMMON_DEPEND=">=sys-libs/libixp-0.5_p20110208-r2
+	x11-libs/libXft
 	x11-libs/libXext
 	x11-libs/libXrandr
 	x11-libs/libXrender
@@ -36,35 +37,40 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
 	mywmiiconf=(
-		"PREFIX=/usr"
-		"DOC=/usr/share/doc/${PF}"
-		"ETC=/etc"
-		"LIBDIR=/usr/$(get_libdir)"
-		"CC=$(tc-getCC) -c"
-		"LD=$(tc-getCC)"
-		"AR=$(tc-getAR) crs"
-		"DESTDIR=${D}"
+		PREFIX=/usr
+		DOC=/usr/share/doc/${PF}
+		ETC=/etc
+		LIBDIR=/usr/$(get_libdir)
+		CC="$(tc-getCC) -c"
+		LD="$(tc-getCC)"
+		AR="$(tc-getAR) crs"
+		DESTDIR="${D}"
+		LIBIXP=/usr/$(get_libdir)/libixp.so
 		)
 }
 
 src_prepare() {
+	# punt internal copy of sys-libs/libixp #323037
+	rm -f include/ixp{,_srvutil}.h || die
+	sed -i -e '/libixp/d' Makefile || die
+
 	sed -i -e "/BINSH \!=/d" mk/hdr.mk || die #335083
 	sed -i -e 's/-lXext/& -lXrender -lX11/' cmd/Makefile || die #369115
 }
 
 src_compile() {
 	append-flags -I/usr/include/freetype2
-	emake "${mywmiiconf[@]}" || die
+	emake "${mywmiiconf[@]}"
 }
 
 src_install() {
-	emake "${mywmiiconf[@]}" install || die
+	emake "${mywmiiconf[@]}" install
 	dodoc NEWS NOTES README TODO
 
 	echo wmii > "${T}"/wmii
 	exeinto /etc/X11/Sessions
-	doexe "${T}"/wmii || die
+	doexe "${T}"/wmii
 
 	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop || die
+	doins "${FILESDIR}"/${PN}.desktop
 }