Sync with portage [Mon Dec 5 09:06:05 MSK 2011].

2011-12-05 09:06:06 +04:00 · 2011-12-05 09:06:06 +04:00 · c66b9b7ef8
commit c66b9b7ef8
parent 9a7c1ec077
492 changed files with 5820 additions and 1810 deletions
--- 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 )"
--- 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}
--- 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
--- a/app-admin/puppet/files/puppetmaster-2.7.6.confd
+++ 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)
--- a/app-admin/puppet/files/puppetmaster-2.7.6.init
+++ 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}"
+}
--- a/app-admin/puppet/puppet-2.6.11.ebuild
+++ b/app-admin/puppet/puppet-2.6.11.ebuild
@ -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
-}
--- a/app-admin/puppet/puppet-2.7.6-r1.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() {
--- 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
--- a/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
+++ 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"
--- 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}"
--- 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"
--- 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
--- 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 )"
--- a/app-office/abiword/abiword-2.8.6-r2.ebuild
+++ 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]"
+}
--- a/app-office/abiword/files/abiword-2.8.6-libwpd.patch
+++ 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
+
+
--- 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
 }

--- 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) \
--- 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) \
--- 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>
--- 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
--- 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>
--- 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"
--- 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"
--- 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"

--- 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
--- a/app-vim/bash-support/bash-support-3.8.ebuild
+++ 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
+}
--- 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=""
--- a/app-vim/tagbar/Manifest
+++ b/app-vim/tagbar/Manifest
@ -0,0 +1 @@
+DIST tagbar-2.2.tar.gz 33517 RMD160 4a8d9c49d0d216f7979a822bbb03560d1cf7fece SHA1 db9db629b84af29b16a1bb9e09315e0f3b1e84ab SHA256 b95207079af0baff0fc3c670e5fd1a064d90aa81874160ed62c5b6ca3878a4c5
--- a/app-vim/tagbar/metadata.xml
+++ 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>
--- a/app-vim/tagbar/tagbar-2.2.ebuild
+++ 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}"
+}
--- 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
--- a/app-vim/zencoding-vim/zencoding-vim-0.58.ebuild
+++ 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
+}
--- a/dev-haskell/base-unicode-symbols/Manifest
+++ 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
--- 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
@ -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"
--- a/dev-haskell/base-unicode-symbols/metadata.xml
+++ 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>
--- 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
--- a/dev-haskell/binary/binary-0.4.1.ebuild
+++ b/dev-haskell/binary/binary-0.4.1.ebuild
@ -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"
--- a/dev-haskell/binary/binary-0.4.2.ebuild
+++ b/dev-haskell/binary/binary-0.4.2.ebuild
@ -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"
--- 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"
--- 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>
--- a/dev-haskell/crypto/Manifest
+++ b/dev-haskell/crypto/Manifest
@ -0,0 +1 @@
+DIST Crypto-4.2.4.tar.gz 57027 RMD160 05b00b9407f7d9e5f531ea7dc0b9ead6b58debfc SHA1 e057284972efba38353f80dbd9b8508f37d4e860 SHA256 77986dd8100b678adc784e682180ba659617ff5708089847420166ead0768a17
--- a/dev-haskell/crypto/crypto-4.2.4.ebuild
+++ 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
+}
--- a/dev-haskell/crypto/metadata.xml
+++ 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>
--- 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
--- a/dev-haskell/dataenc/dataenc-0.14.0.2.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")
--- a/dev-haskell/dataenc/files/dataenc-0.14-ghc-7.2.patch
+++ b/dev-haskell/dataenc/files/dataenc-0.14-ghc-7.2.patch
@ -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
--- a/dev-haskell/hs3/Manifest
+++ b/dev-haskell/hs3/Manifest
@ -0,0 +1 @@
+DIST hS3-0.5.6.tar.gz 19626 RMD160 53c74e2ab19a09d69176cd976b7601585995f37f SHA1 1ff5380800f8fe129cbc350b4187eef755a2ed3a SHA256 ec0be701f8e46d725b2ceb5d54a1889823cb41668e53c43f05d74d07f76fa6b1
--- a/dev-haskell/hs3/hs3-0.5.6.ebuild
+++ 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}"
--- a/dev-haskell/hs3/metadata.xml
+++ 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>
--- 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
--- a/dev-haskell/hslogger/hslogger-1.1.5.ebuild
+++ 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"
--- 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
--- a/dev-haskell/http/http-4000.1.2.ebuild
+++ 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}"
--- 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
--- a/dev-haskell/hunit/hunit-1.2.4.2.ebuild
+++ 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"
+}
--- a/dev-haskell/hxt-charproperties/Manifest
+++ b/dev-haskell/hxt-charproperties/Manifest
@ -0,0 +1 @@
+DIST hxt-charproperties-9.1.0.tar.gz 225351 RMD160 ff8d45a7eb9eb1936736f594bc0f9b4ad6843d94 SHA1 da02d32aa63c8ccc07d6810db7bfa8960dd88ed5 SHA256 4330da34a0277d292f24acac2a50bf3974c2bc776536c15ebc88aff53f3b42a8
--- a/dev-haskell/hxt-charproperties/hxt-charproperties-9.1.0.ebuild
+++ 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"
--- a/dev-haskell/hxt-charproperties/metadata.xml
+++ 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>
--- a/dev-haskell/hxt-regex-xmlschema/Manifest
+++ 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
--- 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
@ -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
--- 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
@ -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")
--- a/dev-haskell/hxt-regex-xmlschema/metadata.xml
+++ 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>
--- a/dev-haskell/hxt-unicode/Manifest
+++ b/dev-haskell/hxt-unicode/Manifest
@ -0,0 +1 @@
+DIST hxt-unicode-9.0.1.tar.gz 13980 RMD160 9848ee9da7fb7072e0f57f6a8cffdd5991c35c48 SHA1 49d1cd97137a19cd2293d274c926b89921a56e48 SHA256 d59bab6541d01e8c7e260c5084f6c2f4346c564bb2c53262d3ffdca8f8f9183d
--- a/dev-haskell/hxt-unicode/hxt-unicode-9.0.1.ebuild
+++ 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"
--- a/dev-haskell/hxt-unicode/metadata.xml
+++ 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>
--- 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
--- 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
@ -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,
--- a/dev-haskell/hxt/hxt-7.3.ebuild
+++ b/dev-haskell/hxt/hxt-7.3.ebuild
@ -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
-}
--- a/dev-haskell/hxt/hxt-9.1.5.ebuild
+++ 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")
--- 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>
--- 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
--- a/dev-haskell/missingh/missingh-1.1.1.0.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"
+}
--- a/dev-haskell/monad-control/Manifest
+++ 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
--- a/dev-haskell/monad-control/metadata.xml
+++ 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>
--- a/dev-haskell/monad-control/monad-control-0.2.0.3.ebuild
+++ 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)
+}
--- 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
--- a/dev-haskell/network/network-2.3.0.7.ebuild
+++ 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)
+}
--- a/dev-haskell/pcre-light/Manifest
+++ b/dev-haskell/pcre-light/Manifest
@ -0,0 +1 @@
+DIST pcre-light-0.4.tar.gz 28943 RMD160 636603e48c30535dd2619244de7b2aa102d7c460 SHA1 134d23bd00248b8b5ba4e4f2caab62b619f87cef SHA256 b37f6ffab07b56540ba4cc410f3ad3c4e0e6e226c610c33f4b7daf70559c31f6
--- a/dev-haskell/pcre-light/metadata.xml
+++ 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>
--- a/dev-haskell/pcre-light/pcre-light-0.4.ebuild
+++ 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"
--- 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
--- a/dev-haskell/quickcheck/quickcheck-2.4.1.1.ebuild
+++ 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}"
--- 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
--- a/dev-haskell/regex-base/regex-base-0.93.2.ebuild
+++ 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"
--- 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
--- a/dev-haskell/regex-compat/regex-compat-0.95.1.ebuild
+++ 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"
--- 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
--- a/dev-haskell/regex-posix/regex-posix-0.95.1.ebuild
+++ 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"
--- a/dev-haskell/sha/Manifest
+++ b/dev-haskell/sha/Manifest
@ -0,0 +1 @@
+DIST SHA-1.5.0.0.tar.gz 2714032 RMD160 c0347e52366c50116dbb3e7e17ac3439e6ee0ff2 SHA1 397a1ff44b098d22f862ccae1a34e861d94b3b86 SHA256 9361cf9dffb8640e435b7b61bc4922c7bdf4c26d96bb42de423ede4a570b5f8b
--- a/dev-haskell/sha/metadata.xml
+++ 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>
--- a/dev-haskell/sha/sha-1.5.0.0.ebuild
+++ 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}"
--- 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
--- a/dev-haskell/testpack/testpack-2.1.1.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"
--- a/dev-haskell/transformers/Manifest
+++ b/dev-haskell/transformers/Manifest
@ -0,0 +1 @@
+DIST transformers-0.2.2.0.tar.gz 17148 RMD160 1b0f20324b5ceb3e9c8073d7f18c2e2b2cdbff3e SHA1 69361d6afeef9eb7cc0c759c34844db367a64f89 SHA256 bf2d197dbcad9cf964f537b926719b41510b286134bc6d4e5385832b7cff6ada
--- a/dev-haskell/transformers/metadata.xml
+++ 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>
--- a/dev-haskell/transformers/transformers-0.2.2.0.ebuild
+++ 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"
--- 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
--- a/dev-haskell/utf8-string/utf8-string-0.3.7.ebuild
+++ 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"
--- 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"
 }

--- 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() {
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST tagbar-2.2.tar.gz 33517 RMD160 4a8d9c49d0d216f7979a822bbb03560d1cf7fece SHA1 db9db629b84af29b16a1bb9e09315e0f3b1e84ab SHA256 b95207079af0baff0fc3c670e5fd1a064d90aa81874160ed62c5b6ca3878a4c5`
				`@ -0,0 +1 @@`
				`DIST base-unicode-symbols-0.2.2.2.tar.gz 5549 RMD160 d674bdc90fe05a3e54a94f82d307df388f7d9b06 SHA1 dd68f26b87364a6b72e435b90c33cc19c9e506f4 SHA256 688d89faa433a3486b04997ec9cd298ee54d4524c06784577967f291012a768d`
				`@ -0,0 +1 @@`
				`DIST Crypto-4.2.4.tar.gz 57027 RMD160 05b00b9407f7d9e5f531ea7dc0b9ead6b58debfc SHA1 e057284972efba38353f80dbd9b8508f37d4e860 SHA256 77986dd8100b678adc784e682180ba659617ff5708089847420166ead0768a17`
				`@ -0,0 +1 @@`
				`DIST hS3-0.5.6.tar.gz 19626 RMD160 53c74e2ab19a09d69176cd976b7601585995f37f SHA1 1ff5380800f8fe129cbc350b4187eef755a2ed3a SHA256 ec0be701f8e46d725b2ceb5d54a1889823cb41668e53c43f05d74d07f76fa6b1`
				`@ -0,0 +1 @@`
				`DIST hxt-charproperties-9.1.0.tar.gz 225351 RMD160 ff8d45a7eb9eb1936736f594bc0f9b4ad6843d94 SHA1 da02d32aa63c8ccc07d6810db7bfa8960dd88ed5 SHA256 4330da34a0277d292f24acac2a50bf3974c2bc776536c15ebc88aff53f3b42a8`
				`@ -0,0 +1 @@`
				`DIST hxt-regex-xmlschema-9.0.1.tar.gz 27021 RMD160 27e347e5b1459ab0745ec5db7005e3437d7f5896 SHA1 ea4231c32b4d05217828b13152a66925787de44b SHA256 0cf8f52e64489cddd9802900967f9d9292043bc0ea173a5f928b01079413e2d5`
				`@ -0,0 +1 @@`
				`DIST hxt-unicode-9.0.1.tar.gz 13980 RMD160 9848ee9da7fb7072e0f57f6a8cffdd5991c35c48 SHA1 49d1cd97137a19cd2293d274c926b89921a56e48 SHA256 d59bab6541d01e8c7e260c5084f6c2f4346c564bb2c53262d3ffdca8f8f9183d`
				`@ -0,0 +1 @@`
				`DIST monad-control-0.2.0.3.tar.gz 13160 RMD160 229e944dcba41786a5153fe9ac800e6a051f5f0c SHA1 955e4e57879e88a35e40791615a87ef2edc5e993 SHA256 d00e24e47be81bcf27d44d0d099104ac0e1b7c2b66f3fe84c6f09a9e6994fc7c`
				`@ -0,0 +1 @@`
				`DIST pcre-light-0.4.tar.gz 28943 RMD160 636603e48c30535dd2619244de7b2aa102d7c460 SHA1 134d23bd00248b8b5ba4e4f2caab62b619f87cef SHA256 b37f6ffab07b56540ba4cc410f3ad3c4e0e6e226c610c33f4b7daf70559c31f6`
				`@ -0,0 +1 @@`
				`DIST SHA-1.5.0.0.tar.gz 2714032 RMD160 c0347e52366c50116dbb3e7e17ac3439e6ee0ff2 SHA1 397a1ff44b098d22f862ccae1a34e861d94b3b86 SHA256 9361cf9dffb8640e435b7b61bc4922c7bdf4c26d96bb42de423ede4a570b5f8b`