Sync with portage [Fri Jan 13 14:26:47 MSK 2012].

12 years ago · bcc708ba55
parent d94f18ae3e
commit bcc708ba55
404 changed files with 7857 additions and 1624 deletions
--- a/app-accessibility/sphinx3/sphinx3-0.8.ebuild
+++ b/app-accessibility/sphinx3/sphinx3-0.8.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinx3/sphinx3-0.8.ebuild,v 1.1 2011/11/17 17:45:56 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinx3/sphinx3-0.8.ebuild,v 1.2 2012/01/12 16:34:10 mgorny Exp $

 EAPI=3
 PYTHON_DEPEND="python? 2:2.6"
@ -22,18 +22,16 @@ RDEPEND="${DEPEND}"

 RESTRICT_PYTHON_ABIS="3*"

+# Due to generated Python setup.py.
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 src_prepare() {
 	epatch "${FILESDIR}/${P}_heap_fix.patch"
 	eprefixify 'python/setup.py'
 }

-src_configure() {
-	econf \
-		$( use_enable static-libs static )
-}
-
 src_compile() {
-	default
+	autotools-utils_src_compile

 	if use python; then
 		python_copy_sources python
@ -47,9 +45,8 @@ src_compile() {
 }

 src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
+	local DOCS=( AUTHORS ChangeLog NEWS README )
+	autotools-utils_src_install

 	if use doc; then
 		cd doc
@ -57,7 +54,6 @@ src_install() {
 	fi

 	if use python; then
-
 		installing() {
 			"$(PYTHON)" setup.py install \
 				--install-lib="${D}/$(python_get_sitedir)"
@ -65,6 +61,4 @@ src_install() {

 		python_execute_function -s --source-dir python installing
 	fi
-
-	remove_libtool_files
 }
--- a/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild
+++ b/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild,v 1.1 2011/11/17 17:35:05 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinxbase/sphinxbase-0.7.ebuild,v 1.2 2012/01/12 16:33:37 mgorny Exp $

 EAPI=3
 PYTHON_DEPEND="python? 2:2.6"
@ -23,15 +23,22 @@ DEPEND="${RDEPEND}

 RESTRICT_PYTHON_ABIS="3*"

+# Due to generated Python setup.py.
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 src_configure() {
-	econf \
-		$( use_with lapack ) \
-		$( use_with python ) \
-		$( use_enable static-libs static )
+	local myeconfargs=(
+		$( use_with lapack )
+		# python modules are built through distutils
+		# so disable the ugly wrapper
+		--without-python
+	)
+
+	autotools-utils_src_configure
 }

 src_compile() {
-	default
+	autotools-utils_src_compile

 	if use python; then
 		python_copy_sources python
@ -45,7 +52,7 @@ src_compile() {
 }

 src_install() {
-	emake DESTDIR="${D}" install || die
+	autotools-utils_src_install

 	if use python; then
 		python_execute_function -s --source-dir python -d
@ -54,6 +61,4 @@ src_install() {
 	if use doc; then
 		dohtml doc/html/*
 	fi
-
-	remove_libtool_files
 }
--- a/app-admin/fam/fam-2.7.0-r6.ebuild
+++ b/app-admin/fam/fam-2.7.0-r6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r6.ebuild,v 1.6 2012/01/09 17:00:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r6.ebuild,v 1.7 2012/01/12 20:57:45 maekke Exp $

 EAPI="2"

@ -14,7 +14,7 @@ SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz

 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"

 DEPEND="|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 )
--- a/app-arch/sharutils/sharutils-4.11.1.ebuild
+++ b/app-arch/sharutils/sharutils-4.11.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.11.1.ebuild,v 1.2 2012/01/04 19:31:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.11.1.ebuild,v 1.3 2012/01/12 21:00:38 maekke Exp $

 EAPI="2"

@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"

 DEPEND="sys-apps/texinfo
--- a/app-benchmarks/ioping/Manifest
+++ b/app-benchmarks/ioping/Manifest
@ -0,0 +1 @@
+DIST ioping-0.6.tar.gz 6957 RMD160 1142f2a59a51434eadc4a4b4893b94f4b604f071 SHA1 4b3860a6af0755467ebe67c09f36ddaebd9be3e7 SHA256 1d14469b1bfa9243f992be784cc0e3cd86c66bb7edc1b83e22360075c5435ceb
--- a/app-benchmarks/ioping/files/ioping-0.6-makefile.patch
+++ b/app-benchmarks/ioping/files/ioping-0.6-makefile.patch
@ -0,0 +1,26 @@
+ Makefile |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b3d741e..79022e9 100644
+--- a/Makefile
+++ b/Makefile
+@@ -1,6 +1,6 @@
+-CFLAGS+=-std=c99 -g -Wall -Wextra -pedantic -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+-LDFLAGS=-lm
+-PREFIX=/usr/local
+CFLAGS+=-std=c99 -Wall -Wextra -pedantic -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+LIBS=-lm
+PREFIX?=/usr/local
+ BINDIR=$(PREFIX)/bin
+ MAN1DIR=$(PREFIX)/share/man/man1
+ 
+@@ -30,7 +30,7 @@ install: $(BINS) $(MANS)
+ 	$(CC) $(CFLAGS) -DVERSION=\"${VERSION}\" -c -o $@ $^
+ 
+ ioping: $(OBJS)
+-	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ dist: $(DISTDIR).tar.gz
+ 
--- a/app-benchmarks/ioping/ioping-0.6.ebuild
+++ b/app-benchmarks/ioping/ioping-0.6.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/ioping/ioping-0.6.ebuild,v 1.1 2012/01/13 08:12:28 jlec Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Simple disk I/0 latency measuring tool"
+HOMEPAGE="http://code.google.com/p/ioping/"
+SRC_URI="http://ioping.googlecode.com/files/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-3"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PREFIX="${EPREFIX}/usr"
+}
--- a/app-benchmarks/ioping/metadata.xml
+++ b/app-benchmarks/ioping/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/app-cdr/k9copy/Manifest
+++ b/app-cdr/k9copy/Manifest
@ -1,2 +1,2 @@
-DIST k9copy-2.3.6-Source.tar.gz 1562476 RMD160 c61a2f3802b50fd99058f448f1687d7bbd543267 SHA1 e0399b42a8dc8b9ea5b0bb332a1e2d7bfa18e104 SHA256 d2ebbb6ee72b8e6b3e7daf62746442e8e3a2edb54603333a418d7da753045436
 DIST k9copy-2.3.7-Source.tar.gz 1571305 RMD160 c3b57c77bdb32365f9f694101f1eaf59059d22d9 SHA1 8b0aa8f1e63e4a396746f88ca9c763808895b7d0 SHA256 516f4108a189a050f0aadf5b617d151b6b0e52c18823941f2b895073c104e74e
+DIST k9copy-2.3.8-Source.tar.gz 1589535 RMD160 1855649ca84140718fc26d97a79ee23e8eb90fa2 SHA1 15c9900c689d4d98d8ebae9fbe6e7f7de158cc32 SHA256 cf5e2d9faf7821561e478ed1fc9b63bbcc3448405d7b7866f68b018d16b42fdf
--- a/app-cdr/k9copy/files/k9copy-2.3.6-return.patch
+++ b/app-cdr/k9copy/files/k9copy-2.3.6-return.patch
@ -1,10 +0,0 @@
--- kde4/src/mpeg2/kdecmpeg2.cpp	2009/11/23 21:58:43	450
-+++ kde4/src/mpeg2/kdecmpeg2.cpp	2011/02/06 20:41:08	561
-@@ -286,6 +286,7 @@
- 	      }
-     	}
-     }
-+    return 0;
- }
- 
- void kDecMPEG2::sync() {
--- a/app-cdr/k9copy/k9copy-2.3.8.ebuild
+++ b/app-cdr/k9copy/k9copy-2.3.8.ebuild
@ -1,37 +1,31 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.6.ebuild,v 1.7 2011/11/29 22:00:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.8.ebuild,v 1.1 2012/01/12 16:05:44 johu Exp $

-EAPI=3
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ca cs da de el es_AR es fr it ja nl pl pt_BR ru sr@Latn sr tr zh_TW"
-
-	MY_P=${P}-Source
-
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-	S=${WORKDIR}/${MY_P}
-else
-	ESVN_REPO_URI="https://k9copy.svn.sourceforge.net/svnroot/k9copy/kde4"
-	ESVN_PROJECT="k9copy"
-fi
+EAPI=4

+KDE_DOC_DIRS="doc"
 KDE_HANDBOOK="optional"
+KDE_LINGUAS="ca cs da de el es es_AR fr it ja nl pl pt_BR ru sr sr@Latn tr uk zh_TW"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
+MY_P=${P}-Source

 inherit kde4-base

+ESVN_REPO_URI="https://k9copy.svn.sourceforge.net/svnroot/k9copy/kde4"
+ESVN_PROJECT="k9copy"
 DESCRIPTION="k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5."
 HOMEPAGE="http://k9copy.sourceforge.net/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"

 DEPEND="
 	media-libs/libdvdread
-	>=media-libs/libmpeg2-0.5.1
+	media-libs/libmpeg2
 	media-libs/xine-lib
 	virtual/ffmpeg
 "
@ -39,10 +33,9 @@ RDEPEND="${DEPEND}
 	media-video/dvdauthor
 	media-video/mplayer
 "
-
 DOCS=( README )

-PATCHES=( "${FILESDIR}/${P}-return.patch" )
+S=${WORKDIR}/${MY_P}

 pkg_postinst() {
 	kde4-base_pkg_postinst
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@ -1 +1,2 @@
 DIST pius-2.0.8.tar.bz2 23780 RMD160 cecca6104035ed6e54b354c280c2817f1c2b3fb1 SHA1 1275abdea6beed728dac858c110aff305f64aa2f SHA256 097ab2354ff39486408117cb10ef175b58b13b9d63dff2515ec8417320ab6f29
+DIST pius-2.0.9.tar.bz2 30225 RMD160 de72307a76a9fea8976db3752a903ab0b939b9ae SHA1 c8ecdf74b3f704a29f828fdbe0575eb247e21524 SHA256 6d2cd48207a76e530b0082bc1cd21ffb44c204f5cfcfe611347a12ca87a732bc
--- a/app-crypt/pius/pius-2.0.9.ebuild
+++ b/app-crypt/pius/pius-2.0.9.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pius/pius-2.0.9.ebuild,v 1.1 2012/01/12 06:17:12 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit python
+
+DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys."
+HOMEPAGE="http://www.phildev.net/pius/"
+SRC_URI="mirror://sourceforge/pgpius/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-crypt/gnupg"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	python_convert_shebangs 2 ${PN} ${PN}-keyring-mgr
+}
+
+src_install() {
+	dobin ${PN} ${PN}-keyring-mgr ${PN}-party-worksheet
+	dodoc Changelog README README.keyring-mgr
+}
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@ -1,2 +1 @@
-DIST mg-20110120.tar.gz 137905 RMD160 6f950825cecd266dc69feb8a24e6d1ea7fca540e SHA1 1f0f3eb31f72cbf92513339aa681e289a00d654b SHA256 bd03b584fc16a5b5f61e7e41b38c8d9f5a30b2dd9777d1f7f94616811cbd9983
 DIST mg-20110905.tar.gz 138805 RMD160 721b2a2e9059ddf6ea637dafd205575150b58c8c SHA1 51d2bac801cab33c9b552c36db5f8637fbbe9363 SHA256 1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229
--- a/app-editors/mg/mg-20110120.ebuild
+++ b/app-editors/mg/mg-20110120.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20110120.ebuild,v 1.7 2011/09/25 17:49:10 ulm Exp $
-
-EAPI=3
-
-inherit toolchain-funcs
-
-DESCRIPTION="Micro GNU/emacs, a port from the BSDs"
-HOMEPAGE="http://homepage.boetes.org/software/mg/"
-SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
-
-LICENSE="public-domain BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="livecd"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# econf won't work, as this script does not accept any parameters
-	./configure || die "configure failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install()  {
-	einstall || die
-	dodoc README tutorial || die
-}
-
-pkg_postinst() {
-	if use livecd; then
-		[[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
-	fi
-}
--- a/app-emacs/cedet/cedet-1.0.1.ebuild
+++ b/app-emacs/cedet/cedet-1.0.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0.1.ebuild,v 1.2 2012/01/11 22:44:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/cedet/cedet-1.0.1.ebuild,v 1.3 2012/01/12 17:30:27 phajdan.jr Exp $

 EAPI=4
 NEED_EMACS=22
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/cedet/${MY_P}.tar.gz"

 LICENSE="GPL-2 FDL-1.2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""

 S="${WORKDIR}/${MY_P}"
--- a/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch
+++ b/app-emulation/wine/files/wine-1.2.3-msxml3-libxml2-headers.patch
@ -0,0 +1,574 @@
+From 26603f25f73142a45b5b964bb9bb2e59bc0908d4 Mon Sep 17 00:00:00 2001
+From: Alexandre Julliard <julliard@winehq.org>
+Date: Thu, 24 Feb 2011 13:11:53 +0100
+Subject: [PATCH] msxml3: Include the system libxml headers before the Windows
+ headers.
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to wine-1.2.3]
+---
+ dlls/msxml3/attribute.c     |    6 ++++++
+ dlls/msxml3/bsc.c           |    6 ++++++
+ dlls/msxml3/cdata.c         |    5 +++++
+ dlls/msxml3/comment.c       |    5 +++++
+ dlls/msxml3/dispex.c        |    5 +++++
+ dlls/msxml3/docfrag.c       |    5 +++++
+ dlls/msxml3/domdoc.c        |   11 +++++++++--
+ dlls/msxml3/domimpl.c       |    5 +++++
+ dlls/msxml3/element.c       |    5 +++++
+ dlls/msxml3/entityref.c     |    5 +++++
+ dlls/msxml3/factory.c       |    5 +++++
+ dlls/msxml3/httprequest.c   |    6 ++++++
+ dlls/msxml3/main.c          |   15 +++++++++++++++
+ dlls/msxml3/msxml_private.h |   23 -----------------------
+ dlls/msxml3/node.c          |   31 +++++++++++++++++++++++++++----
+ dlls/msxml3/nodelist.c      |    5 +++++
+ dlls/msxml3/nodemap.c       |    5 +++++
+ dlls/msxml3/parseerror.c    |    5 +++++
+ dlls/msxml3/pi.c            |    5 +++++
+ dlls/msxml3/queryresult.c   |    9 +++++++--
+ dlls/msxml3/regsvr.c        |    4 ++++
+ dlls/msxml3/saxreader.c     |   10 +++++++---
+ dlls/msxml3/schema.c        |   12 ++++++++++++
+ dlls/msxml3/text.c          |    5 +++++
+ dlls/msxml3/xmldoc.c        |    5 +++++
+ dlls/msxml3/xmlelem.c       |    5 +++++
+ 26 files changed, 174 insertions(+), 34 deletions(-)
+
+diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
+index d78fa47..3df93d6 100644
+--- a/dlls/msxml3/attribute.c
+++ b/dlls/msxml3/attribute.c
+@@ -23,6 +23,12 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+# include <libxml/HTMLtree.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c
+index b24e04c..01a09a5 100644
+--- a/dlls/msxml3/bsc.c
+++ b/dlls/msxml3/bsc.c
+@@ -23,6 +23,12 @@
+ 
+ #include <stdarg.h>
+ #include <assert.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+# include <libxml/HTMLtree.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
+index 3fba66c..caf8cd8 100644
+--- a/dlls/msxml3/cdata.c
+++ b/dlls/msxml3/cdata.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
+index e74de07..1cabfa3 100644
+--- a/dlls/msxml3/comment.c
+++ b/dlls/msxml3/comment.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c
+index 09b71fe..6b01b15 100644
+--- a/dlls/msxml3/dispex.c
+++ b/dlls/msxml3/dispex.c
+@@ -22,6 +22,11 @@
+ 
+ #include <stdarg.h>
+ #include <assert.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
+index fff3f62..bebd252 100644
+--- a/dlls/msxml3/docfrag.c
+++ b/dlls/msxml3/docfrag.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
+index 0007503..e6a61e4 100644
+--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
+@@ -25,6 +25,15 @@
+ 
+ #include <stdarg.h>
+ #include <assert.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+# include <libxml/xpathInternals.h>
+# include <libxml/xmlsave.h>
+# include <libxml/SAX2.h>
+# include <libxml/parserInternals.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+@@ -47,8 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+ 
+ #ifdef HAVE_LIBXML2
+ 
+-#include <libxml/xmlsave.h>
+-
+ /* not defined in older versions */
+ #define XML_SAVE_FORMAT     1
+ #define XML_SAVE_NO_DECL    2
+diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c
+index dd518a1..c6794ac 100644
+--- a/dlls/msxml3/domimpl.c
+++ b/dlls/msxml3/domimpl.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
+index 617c008..1b5c693 100644
+--- a/dlls/msxml3/element.c
+++ b/dlls/msxml3/element.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c
+index db46193..1baea6e 100644
+--- a/dlls/msxml3/entityref.c
+++ b/dlls/msxml3/entityref.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
+index 3fd229c..45df9f0 100644
+--- a/dlls/msxml3/factory.c
+++ b/dlls/msxml3/factory.c
+@@ -24,6 +24,11 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
+index 4585484..be1a5f7 100644
+--- a/dlls/msxml3/httprequest.c
+++ b/dlls/msxml3/httprequest.c
+@@ -22,6 +22,12 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+# include <libxml/encoding.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
+index 60b0cbd..47a89b1 100644
+--- a/dlls/msxml3/main.c
+++ b/dlls/msxml3/main.c
+@@ -25,6 +25,21 @@
+ #define COBJMACROS
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+# ifdef SONAME_LIBXSLT
+#  ifdef HAVE_LIBXSLT_PATTERN_H
+#   include <libxslt/pattern.h>
+#  endif
+#  ifdef HAVE_LIBXSLT_TRANSFORM_H
+#   include <libxslt/transform.h>
+#  endif
+#  include <libxslt/xsltutils.h>
+#  include <libxslt/xsltInternals.h>
+# endif
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
+index e0279f1..e1fbb59 100644
+--- a/dlls/msxml3/msxml_private.h
+++ b/dlls/msxml3/msxml_private.h
+@@ -102,10 +102,6 @@ BOOL dispex_query_interface(DispatchEx*,REFIID,void**);
+ 
+ #ifdef HAVE_LIBXML2
+ 
+-#ifdef HAVE_LIBXML_PARSER_H
+-#include <libxml/parser.h>
+-#endif
+-
+ /* constructors */
+ extern IUnknown         *create_domdoc( xmlNodePtr document );
+ extern IUnknown         *create_xmldoc( void );
+@@ -184,25 +180,6 @@ static inline BSTR bstr_from_xmlChar(const xmlChar *str)
+ 
+ #endif
+ 
+-void* libxslt_handle;
+-#ifdef SONAME_LIBXSLT
+-# ifdef HAVE_LIBXSLT_PATTERN_H
+-#  include <libxslt/pattern.h>
+-# endif
+-# ifdef HAVE_LIBXSLT_TRANSFORM_H
+-#  include <libxslt/transform.h>
+-# endif
+-# include <libxslt/xsltutils.h>
+-# include <libxslt/xsltInternals.h>
+-
+-# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
+-MAKE_FUNCPTR(xsltApplyStylesheet);
+-MAKE_FUNCPTR(xsltCleanupGlobals);
+-MAKE_FUNCPTR(xsltFreeStylesheet);
+-MAKE_FUNCPTR(xsltParseStylesheetDoc);
+-# undef MAKE_FUNCPTR
+-#endif
+-
+ extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText,
+                                              LONG line, LONG linepos, LONG filepos );
+ extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj );
+diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
+index bbdcb5d..2980566 100644
+--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
+@@ -24,6 +24,23 @@
+ 
+ #include <stdarg.h>
+ #include <assert.h>
+
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+# include <libxml/HTMLtree.h>
+# ifdef SONAME_LIBXSLT
+#  ifdef HAVE_LIBXSLT_PATTERN_H
+#   include <libxslt/pattern.h>
+#  endif
+#  ifdef HAVE_LIBXSLT_TRANSFORM_H
+#   include <libxslt/transform.h>
+#  endif
+#  include <libxslt/xsltutils.h>
+#  include <libxslt/xsltInternals.h>
+# endif
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+@@ -33,16 +50,22 @@
+ 
+ #include "msxml_private.h"
+ 
+-#ifdef HAVE_LIBXML2
+-# include <libxml/HTMLtree.h>
+-#endif
+-
+ #include "wine/debug.h"
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+ 
+ #ifdef HAVE_LIBXML2
+ 
+#ifdef SONAME_LIBXSLT
+extern void* libxslt_handle;
+# define MAKE_FUNCPTR(f) extern typeof(f) * p##f
+MAKE_FUNCPTR(xsltApplyStylesheet);
+MAKE_FUNCPTR(xsltCleanupGlobals);
+MAKE_FUNCPTR(xsltFreeStylesheet);
+MAKE_FUNCPTR(xsltParseStylesheetDoc);
+# undef MAKE_FUNCPTR
+#endif
+
+ static const WCHAR szBinBase64[]  = {'b','i','n','.','b','a','s','e','6','4',0};
+ static const WCHAR szString[]     = {'s','t','r','i','n','g',0};
+ static const WCHAR szNumber[]     = {'n','u','m','b','e','r',0};
+diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c
+index f643c5e..4b2bba9 100644
+--- a/dlls/msxml3/nodelist.c
+++ b/dlls/msxml3/nodelist.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
+index 7d23ec8..d3d9c38 100644
+--- a/dlls/msxml3/nodemap.c
+++ b/dlls/msxml3/nodemap.c
+@@ -23,6 +23,11 @@
+ #define COBJMACROS
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c
+index 4b0dc57..89f14ca 100644
+--- a/dlls/msxml3/parseerror.c
+++ b/dlls/msxml3/parseerror.c
+@@ -25,6 +25,11 @@
+ 
+ #include <stdarg.h>
+ #include <assert.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winerror.h"
+diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
+index 0baefe4..3ebc1bf 100644
+--- a/dlls/msxml3/pi.c
+++ b/dlls/msxml3/pi.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c
+index 2c6f23e..8613b20 100644
+--- a/dlls/msxml3/queryresult.c
+++ b/dlls/msxml3/queryresult.c
+@@ -24,6 +24,13 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+# include <libxml/xpath.h>
+# include <libxml/xpathInternals.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+@@ -48,8 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+ 
+ #ifdef HAVE_LIBXML2
+ 
+-#include <libxml/xpath.h>
+-
+ typedef struct _queryresult
+ {
+     DispatchEx dispex;
+diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c
+index 415e5af..864d61e 100644
+--- a/dlls/msxml3/regsvr.c
+++ b/dlls/msxml3/regsvr.c
+@@ -24,6 +24,10 @@
+ 
+ #include <stdarg.h>
+ #include <string.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+ 
+ #define COBJMACROS
+ 
+diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
+index eca9f1d..f2d340e 100644
+--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
+@@ -24,6 +24,13 @@
+ 
+ #include <stdarg.h>
+ #include <assert.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+# include <libxml/SAX2.h>
+# include <libxml/parserInternals.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+@@ -43,9 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+ 
+ #ifdef HAVE_LIBXML2
+ 
+-#include <libxml/SAX2.h>
+-#include <libxml/parserInternals.h>
+-
+ typedef struct _saxreader
+ {
+     const struct IVBSAXXMLReaderVtbl *lpVBSAXXMLReaderVtbl;
+diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
+index 72d7854..c1465c0 100644
+--- a/dlls/msxml3/schema.c
+++ b/dlls/msxml3/schema.c
+@@ -23,6 +23,18 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+# include <libxml/tree.h>
+# include <libxml/xmlschemas.h>
+# include <libxml/schemasInternals.h>
+# include <libxml/hash.h>
+# include <libxml/parser.h>
+# include <libxml/parserInternals.h>
+# include <libxml/xmlIO.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
+index fdcb06b..72b2ffd 100644
+--- a/dlls/msxml3/text.c
+++ b/dlls/msxml3/text.c
+@@ -24,6 +24,11 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c
+index d1a010f..0d1006e 100644
+--- a/dlls/msxml3/xmldoc.c
+++ b/dlls/msxml3/xmldoc.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
+index a71b18b..a818d14 100644
+--- a/dlls/msxml3/xmlelem.c
+++ b/dlls/msxml3/xmlelem.c
+@@ -23,6 +23,11 @@
+ #include "config.h"
+ 
+ #include <stdarg.h>
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+# include <libxml/xmlerror.h>
+#endif
+
+ #include "windef.h"
+ #include "winbase.h"
+ #include "winuser.h"
+-- 
+1.7.8.3
+
--- a/app-emulation/wine/wine-1.2.3.ebuild
+++ b/app-emulation/wine/wine-1.2.3.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.10 2011/09/18 09:08:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.3.ebuild,v 1.11 2012/01/13 00:08:55 tetromino Exp $

 EAPI="2"

@ -117,6 +117,7 @@ src_prepare() {
 		eautoreconf
 	fi
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	epatch "${FILESDIR}"/${PN}-1.2.3-msxml3-libxml2-headers.patch #397993
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
--- a/app-emulation/xen-tools/files/xendomains.initd-r2
+++ b/app-emulation/xen-tools/files/xendomains.initd-r2
@ -1,13 +1,13 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.3 2011/11/28 18:29:19 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xendomains.initd-r2,v 1.4 2012/01/12 13:40:01 alexxy Exp $

 opts="start stop status restart"

 depend() {
-	need xenstored xenconsoled
-	after dhcp xend
+	need xenstored
+	after dhcp xend xenconsoled
 }

 get_domname() {
--- a/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild,v 1.2 2011/11/30 19:39:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r2.ebuild,v 1.3 2012/01/12 13:40:01 alexxy Exp $

 EAPI="4"
 PYTHON_DEPEND="2"
@ -256,8 +256,8 @@ src_install() {
 	newconfd "${FILESDIR}"/xenstored.confd xenstored
 	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
 	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd xenstored \
-		"${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled

 	if use screen; then
 		cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@ -1,3 +1,3 @@
 DIST skrooge-0.8.0.tar.bz2 8262568 RMD160 094659591763bf757cf5bb050f191492163b072a SHA1 47182435735a9abbe733782814ff770ddb5f0ab6 SHA256 67cb3f557bbeb55afa77f7b306187cead45915d1cf0161bbd1206a942d2af66e
-DIST skrooge-0.9.1.tar.bz2 7246125 RMD160 4a7cb0be10e1e006d429c7b483e1b24c53b0cc37 SHA1 e08ab33dc1e35934d5fd21e320dbefbfe44dcd05 SHA256 896e61a65b33b0403c62eb5bf0ec0ffb80dffa571355f9f674d115d34f7afffd
 DIST skrooge-1.0.0.tar.bz2 7083506 RMD160 3d40192242621231ef6761d633a1e55cc3ce6ab9 SHA1 f67a9c4fe1dc53c8fd4e26d2e37935fa3f96c1b6 SHA256 8c78cec3ff873d46cf45c809029d72c61e789226ca337b47f75dc41a128de98e
+DIST skrooge-1.1.1.tar.bz2 8559953 RMD160 030e9f16f9ec9a81a48c7610fc0df5b7d73442bf SHA1 063af1a04c2406babc59203e0d57912e834e46f1 SHA256 6553a61a74bb4f5d0272fff4844e47d983fa38cd6af0481658f4d1e3150c6d62
--- a/app-office/skrooge/skrooge-1.1.1.ebuild
+++ b/app-office/skrooge/skrooge-1.1.1.ebuild
@ -1,11 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-0.9.1.ebuild,v 1.1 2011/09/06 19:45:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.1.1.ebuild,v 1.1 2012/01/12 22:23:05 dilfridge Exp $

 EAPI=4
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hu it ja ko lt ms nb
-nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_TW"
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hu it ja lt nb
+nl pl pt pt_BR ro ru sk sv tr ug zh_CN"
 KDE_DOC_DIRS="doc"
+KDE_HANDBOOK=optional
 inherit kde4-base

 DESCRIPTION="personal finances manager for KDE4, aiming at being simple and intuitive"
@ -15,13 +16,17 @@ SRC_URI="http://skrooge.org/files/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug +handbook"
+IUSE="debug"

-DEPEND=">=dev-libs/libofx-0.9.1
+DEPEND="
 	app-crypt/qca:2
-	x11-libs/qt-sql:4[sqlite]"
+	dev-libs/grantlee
+	>=dev-libs/libofx-0.9.1
+	x11-libs/qt-sql:4[sqlite]
+"
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesdk-scripts)"
+	$(add_kdebase_dep kdesdk-scripts)
+"

 DOCS="AUTHORS CHANGELOG README TODO"

--- a/app-office/taxbird/Manifest
+++ b/app-office/taxbird/Manifest
@ -1,2 +1,3 @@
 DIST taxbird-0.15.tar.gz 410501 RMD160 bf0c5037ae5595c659d81e96e90de95f6f11d889 SHA1 90e33c06abaf6dd1e32aa1aa29372c073e26aa0b SHA256 0a573fd5400acdeb1b3f580bf4be010bd684dd1e46f307506350df5f776e0bbb
 DIST taxbird-0.16.tar.gz 419770 RMD160 0e598a491a2cf491ef19f975b7faea1a945a9648 SHA1 9fc9aa6baf1e415beda58a50dcc6ba818bb2d6db SHA256 afb582a37d1879ebdbbb6ae40fdea7092386dac840a38c191be3a799f2742f82
+DIST taxbird-0.18.tar.gz 414988 RMD160 af77d931f00f2001aa32971684b5029e16188c31 SHA1 2fec2f7f3744ae89c3d7e025bbe0bd45824daeab SHA256 4ed073989eb9d17b06e120e3e9a5669fc48c2b2df26b118521baa98f11e81413
--- a/app-office/taxbird/taxbird-0.18.ebuild
+++ b/app-office/taxbird/taxbird-0.18.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/taxbird/taxbird-0.18.ebuild,v 1.1 2012/01/13 01:07:39 xmw Exp $
+
+EAPI="2"
+
+inherit eutils fdo-mime
+
+DESCRIPTION="Taxbird provides a GUI to submit tax forms to the german digital tax project ELSTER."
+HOMEPAGE="http://www.taxbird.de/"
+SRC_URI="http://www.taxbird.de/download/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/libgeier-0.13
+	>=gnome-extra/gtkhtml-3.8:3.14
+	gnome-base/libgnomeui
+	sys-devel/gettext
+	>=dev-scheme/guile-1.8.0[regex,deprecated]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dodoc README* || die "dodoc failed"
+
+	einstall || die "Installation failed!"
+
+	# clean out the installed mime files, those get recreated in the pkg_postinst function
+	einfo "Deleting mime files in ${D}/usr/share/mime"
+	find "${D}/usr/share/mime/" -maxdepth 1 -type f -delete
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@ -1,4 +1,5 @@
 DIST texmaker-2.3.tar.bz2 4364743 RMD160 a4db04cb6135d393671a916edb3c272420a98ca3 SHA1 bcd21a3a16ed0a4c38ac4deece29f03d0964431e SHA256 75934ad2fd03f000e65306e336d88e5166284a9222312f88780a492555cc8fd8
 DIST texmaker-3.1.tar.bz2 6018840 RMD160 cf7c457319d6f1ed55ec09fc1d06a9d05f848b9f SHA1 3fe9d72ebad63ef68dcf34248f4a46cec388da3c SHA256 f8d0f4a5b70bd352b328376d7946ceb67e9af325d48ee027d0f4e7b7416bbb78
 DIST texmaker-3.2.1.tar.bz2 6712701 RMD160 c5f7d0c9c2341880b6bbcb1976ab63c4468518cb SHA1 73d520c945ac1bb8e79c40dc423ae20f16dd02eb SHA256 48d0ce105e5ec4dc2e58edf18c5d9c53e592d1c396bce30366e3a103f01497f6
+DIST texmaker-3.2.2.tar.bz2 6721777 RMD160 931e30ff53ca92edd13ff3f367fd0e786d8a2496 SHA1 d8d0fd35c699c543a52c875e4c9e15551917a966 SHA256 7d6bb234c6b7df42d672970fceec44e8f662ac265ca9a3bb8e61cdcb323c145a
 DIST texmaker-3.2.tar.bz2 6706557 RMD160 ddd476ae3342ddef70138c87a2269434933c0022 SHA1 9022ed0f3e1881036eaad93cfa5bb630f6e5f290 SHA256 40c7d2a9bf0f8d0a987c1a250369f9dcb0b7a1978b83c7f08e8325f8f9ab3675
--- a/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch
+++ b/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch
@ -0,0 +1,190 @@
+From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001
+Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@gentoo.org>
+From: Justin Lecher <jlec@gentoo.org>
+Date: Thu, 22 Dec 2011 12:09:32 +0100
+Subject: [PATCH] 3.1-hunspell.patch
+
+Conflicts:
+
+	latexeditor.h
+	texmaker.pro
+---
+ configdialog.cpp   |    4 ++--
+ latexeditor.h      |    2 +-
+ latexeditorview.h  |    2 +-
+ latexhighlighter.h |    2 +-
+ spellerdialog.h    |    2 +-
+ texmaker.h         |    2 +-
+ texmaker.pro       |   44 +++++++-------------------------------------
+ 7 files changed, 14 insertions(+), 44 deletions(-)
+
+diff --git a/configdialog.cpp b/configdialog.cpp
+index 144bddc..89e4059 100644
+--- a/configdialog.cpp
+++ b/configdialog.cpp
+@@ -187,9 +187,9 @@ void ConfigDialog::browseAspell()
+ QDir spelldir(QCoreApplication::applicationDirPath());
+ #else
+ #ifdef DEBIAN_SPELLDIR
+-QDir spelldir(PREFIX"/share/myspell/dicts");
+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
+ #else
+-QDir spelldir(PREFIX"/share/texmaker");
+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
+ #endif
+ #endif
+ 
+diff --git a/latexeditor.h b/latexeditor.h
+index 40cc2f6..d46150f 100644
+--- a/latexeditor.h
+++ b/latexeditor.h
+@@ -28,7 +28,7 @@
+ 
+ #include "latexhighlighter.h"
+ #include "textblockselection.h"
+-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
+ 
+ typedef  int UserBookmarkList[3];
+ 
+diff --git a/latexeditorview.h b/latexeditorview.h
+index 283fd8a..1ba39cc 100644
+--- a/latexeditorview.h
+++ b/latexeditorview.h
+@@ -22,7 +22,7 @@
+ #include "gotolinewidget.h"
+ #include "replacewidget.h"
+ #include "minisplitter.h"
+-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
+ 
+ class LatexEditorView : public QWidget  {
+    Q_OBJECT
+diff --git a/latexhighlighter.h b/latexhighlighter.h
+index 029c7ad..9fbb532 100644
+--- a/latexhighlighter.h
+++ b/latexhighlighter.h
+@@ -20,7 +20,7 @@
+ #include <QColor>
+ #include <QTextBlockUserData>
+ //#include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
+ 
+ class QTextDocument;
+ class LatexEditor;
+diff --git a/spellerdialog.h b/spellerdialog.h
+index 83248ae..cd16dad 100644
+--- a/spellerdialog.h
+++ b/spellerdialog.h
+@@ -13,7 +13,7 @@
+ 
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
+ 
+ #include <QTextCursor>
+ 
+diff --git a/texmaker.h b/texmaker.h
+index b1a2c65..0806731 100644
+--- a/texmaker.h
+++ b/texmaker.h
+@@ -47,7 +47,7 @@
+ #include "symbollistwidget.h"
+ #include "xmltagslistwidget.h"
+ #include "logeditor.h"
+-#include "hunspell/hunspell.hxx"
+#include <hunspell.hxx>
+ #include "browser.h"
+ #include "pdfviewerwidget.h"
+ #include "pdfviewer.h"
+diff --git a/texmaker.pro b/texmaker.pro
+index 5d017ad..87fac99 100644
+--- a/texmaker.pro
+++ b/texmaker.pro
+@@ -4,7 +4,8 @@ TARGET	 = texmaker
+ QT += network \
+       xml \
+       webkit
+-CONFIG	+= qt warn_off release
+CONFIG	+= qt warn_off release link_pkgconfig
+PKGCONFIG = hunspell
+ TEXMAKERVERSION=3.2.2
+ DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
+ DEFINES += HAVE_SPLASH
+@@ -65,25 +66,6 @@ HEADERS	+= texmaker.h \
+ 	scandialog.h \
+ 	synctex_parser.h \
+ 	synctex_parser_utils.h \
+-	hunspell/affentry.hxx \
+-	hunspell/affixmgr.hxx \
+-	hunspell/atypes.hxx \
+-	hunspell/baseaffix.hxx \
+-	hunspell/csutil.hxx \
+-	hunspell/dictmgr.hxx \
+-	hunspell/hashmgr.hxx \
+-	hunspell/htypes.hxx \
+-	hunspell/hunspell.hxx \
+-	hunspell/hunspell.h \
+-	hunspell/langnum.hxx \
+-	hunspell/license.hunspell \
+-	hunspell/phonet.hxx \
+-	hunspell/suggestmgr.hxx \
+-	hunspell/license.myspell \
+-	hunspell/filemgr.hxx \
+-	hunspell/hunzip.hxx \
+-	hunspell/replist.hxx \
+-	hunspell/w_char.hxx \
+ 	singleapp/qtlocalpeer.h \
+ 	singleapp/qtlockedfile.h \
+ 	singleapp/qtsingleapplication.h \
+@@ -110,7 +92,7 @@ HEADERS	+= texmaker.h \
+ 	encodingprober/nsSJISProber.h \
+ 	encodingprober/nsUniversalDetector.h \
+ 	encodingprober/qencodingprober.h \
+-	encodingprober/UnicodeGroupProber.h
+	encodingprober/UnicodeGroupProber.h 
+ SOURCES	+= main.cpp \
+ 	texmakerapp.cpp \
+ 	texmaker.cpp \
+@@ -167,18 +149,6 @@ SOURCES	+= main.cpp \
+ 	scandialog.cpp \
+ 	synctex_parser.c \
+ 	synctex_parser_utils.c \
+-	hunspell/affentry.cxx \
+-	hunspell/affixmgr.cxx \
+-	hunspell/csutil.cxx \
+-	hunspell/dictmgr.cxx \
+-	hunspell/hashmgr.cxx \
+-	hunspell/hunspell.cxx \
+-	hunspell/phonet.cxx \
+-	hunspell/suggestmgr.cxx \
+-	hunspell/utf_info.cxx \
+-	hunspell/filemgr.cxx \
+-	hunspell/replist.cxx \
+-	hunspell/hunzip.cxx \
+ 	singleapp/qtlocalpeer.cpp \
+ 	singleapp/qtlockedfile.cpp \
+ 	singleapp/qtsingleapplication.cpp \
+@@ -271,13 +241,13 @@ isEmpty( ICONDIR ) {
+     ICONDIR=/usr/share/pixmaps
+ }
+ 
+-INCLUDEPATH  += /usr/include/poppler/qt4
+-LIBS         += -L/usr/lib -lpoppler-qt4
+-LIBS         += -L/usr/lib -lz
+INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
+LIBS         += -lpoppler-qt4
+LIBS         += -lz
+ DEFINES += PREFIX=\\\"$${PREFIX}\\\"
+ target.path = $${PREFIX}/bin
+ 
+-#DEFINES += DEBIAN_SPELLDIR
+DEFINES += DEBIAN_SPELLDIR
+ 
+ 
+ INSTALLS = target
+-- 
+1.7.8.1
+
--- a/app-office/texmaker/texmaker-3.2.2.ebuild
+++ b/app-office/texmaker/texmaker-3.2.2.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.2.2.ebuild,v 1.1 2012/01/12 10:49:59 jlec Exp $
+
+EAPI="3"
+
+inherit base prefix qt4-r2 versionator
+
+# The upstream version numbering is bad, so we have to remove a dot in the
+# minor version number
+MAJOR="$(get_major_version)"
+MINOR_1="$(($(get_version_component_range 2)/10))"
+MINOR_2="$(($(get_version_component_range 2)%10))"
+if [ ${MINOR_2} -eq "0" ] ; then
+	MY_P="${PN}-${MAJOR}.${MINOR_1}"
+else
+	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
+fi
+
+MY_P="${P}"
+
+DESCRIPTION="A nice LaTeX-IDE"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	app-text/poppler[qt4]
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	>=x11-libs/qt-gui-4.6.1:4
+	>=x11-libs/qt-core-4.6.1:4
+	>=x11-libs/qt-webkit-4.6.1:4
+	>=app-text/hunspell-1.2.4"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
+
+src_prepare() {
+	qt4-r2_src_prepare
+	eprefixify ${PN}.pro configdialog.cpp
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install || die "make install failed"
+
+	insinto /usr/share/pixmaps/texmaker
+	doins utilities/texmaker*.png || die "doins failed."
+	doins utilities/texmaker.svg || die "doins failed."
+
+	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}
--- a/app-text/dvisvgm/dvisvgm-1.0.10.ebuild
+++ b/app-text/dvisvgm/dvisvgm-1.0.10.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.0.10.ebuild,v 1.1 2011/12/22 12:59:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.0.10.ebuild,v 1.2 2012/01/12 22:10:10 maekke Exp $

 EAPI=4

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

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
--- a/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild,v 1.3 2011/12/09 12:52:53 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dvisvgm/dvisvgm-1.0.9-r1.ebuild,v 1.4 2012/01/12 22:10:10 maekke Exp $

 EAPI=4

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

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
--- a/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild
@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild,v 1.3 2012/01/04 17:14:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/lcdf-typetools/lcdf-typetools-2.91.ebuild,v 1.4 2012/01/12 21:03:04 maekke Exp $

 EAPI=2

 DESCRIPTION="Font utilities for eg manipulating OTF"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
--- a/app-text/pspdftool/pspdftool-0.03.ebuild
+++ b/app-text/pspdftool/pspdftool-0.03.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspdftool/pspdftool-0.03.ebuild,v 1.1 2011/06/19 20:09:40 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pspdftool/pspdftool-0.03.ebuild,v 1.2 2012/01/12 16:21:24 mgorny Exp $

 EAPI=4

@ -8,7 +8,7 @@ ESVN_REPO_URI="https://pspdftool.svn.sourceforge.net/svnroot/pspdftool/trunk"
 ESVN_PROJECT="pspdftool"

 [[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
-inherit autotools-utils ${EXTRA_ECLASS}
+inherit autotools ${EXTRA_ECLASS}
 unset EXTRA_ECLASS

 DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
--- a/app-text/pspdftool/pspdftool-9999.ebuild
+++ b/app-text/pspdftool/pspdftool-9999.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pspdftool/pspdftool-9999.ebuild,v 1.1 2011/06/19 20:09:40 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pspdftool/pspdftool-9999.ebuild,v 1.2 2012/01/12 16:21:24 mgorny Exp $

 EAPI=4

@ -8,7 +8,7 @@ ESVN_REPO_URI="https://pspdftool.svn.sourceforge.net/svnroot/pspdftool/trunk"
 ESVN_PROJECT="pspdftool"

 [[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
-inherit autotools-utils ${EXTRA_ECLASS}
+inherit autotools ${EXTRA_ECLASS}
 unset EXTRA_ECLASS

 DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@ -1,4 +1,3 @@
-DIST xmlto-0.0.22.tar.bz2 103939 RMD160 7e2bf68d114473a6ca5162c2d88eaf46ed3a5f46 SHA1 dfe5a5a80bfd814d9e048be55cf8e3d176ad2d0a SHA256 afccc4712f22e0b1773d45803187d7998319662766b10a963f5452d83c0324aa
-DIST xmlto-0.0.23.tar.bz2 105201 RMD160 bbf1e1ee8674a7faeb10643f74a6025d4421d66e SHA1 69aab42d941089db3edb32987299290e2472f675 SHA256 a9ffb2760ded55924708cf42f575aaa87cf38fce4d9019ad287213303a8cb1c4
 DIST xmlto-0.0.24-mans.tar.bz2 4575 RMD160 6687bf4d59b823f416b37b179a24ed6d9a315227 SHA1 e5c44ec88dd3e473d0be5151008b00d5fe190dc1 SHA256 1a5b78cf9b349023aaed17c2b39d94e123da58d9b682693013fb3bcdaac7735b
 DIST xmlto-0.0.24.tar.bz2 111860 RMD160 c3aa05569571aa7c2acbe0cc93c136a0d77a7d80 SHA1 68b1664e9ba4d76c37c373f2f0082d62c41506c8 SHA256 30f59f4cc87a5e86f74fc1d2e63ceb6adc7a260d438e0439689efc2588976e13
+DIST xmlto-0.0.25.tar.bz2 116496 RMD160 cba4f99be538cd08b73e9b1a6956c318f132284f SHA1 5d1aecd59d519066f94b4591722767c4e41bdc0f SHA256 361cb70d5d0b4b753db00b67ed8bc1d53d0bc96c407d0310aefe854470b7e536
--- a/app-text/xmlto/files/xmlto-0.0.22-parallelmake.patch
+++ b/app-text/xmlto/files/xmlto-0.0.22-parallelmake.patch
@ -1,19 +0,0 @@
-Index: xmlto-0.0.22/Makefile.am
-===================================================================
--- xmlto-0.0.22.orig/Makefile.am
-+++ xmlto-0.0.22/Makefile.am
-@@ -67,11 +67,9 @@ EXTRA_DIST = xmlto.spec \
- 	doc/xmlif.xml \
- 	xmlto.mak
- 
-$(man1_MANS): $(top_srcdir)/doc/xmlto.xml $(top_srcdir)/doc/xmlif.xml
-	for xml in xmlif.xml xmlto.xml; do \
-	  FORMAT_DIR=$(top_srcdir)/format \
-	   $(BASH) ./xmlto -o man/man1 man $(top_srcdir)/doc/$$xml ; \
-	done || ( RC=$$?; exit $$RC )
-+man/man1/%.1: doc/%.xml
-+	FORMAT_DIR=$(top_srcdir)/format \
-+	$(BASH) ./xmlto -o $(dir $@) man $<
- 
- TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) top_builddir=$(top_builddir)
- TESTS = xmlif/test/run-test
--- a/app-text/xmlto/xmlto-0.0.22.ebuild
+++ b/app-text/xmlto/xmlto-0.0.22.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.22.ebuild,v 1.15 2009/12/21 03:53:53 vapier Exp $
-
-EAPI=2
-inherit eutils autotools
-
-DESCRIPTION="A bash script for converting XML and DocBook formatted documents to a variety of output formats"
-HOMEPAGE="https://fedorahosted.org/xmlto/"
-SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="latex"
-
-RDEPEND="app-shells/bash
-	|| ( sys-apps/which sys-freebsd/freebsd-ubin )
-	dev-libs/libxslt
-	>=app-text/docbook-xsl-stylesheets-1.62.0-r1
-	~app-text/docbook-xml-dtd-4.2
-	|| ( sys-apps/util-linux
-		app-misc/getopt )
-	|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp
-		sys-freebsd/freebsd-ubin )
-	latex? ( >=app-text/passivetex-1.25
-		>=dev-tex/xmltex-1.9-r2 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-format_fo_passivetex_check.patch \
-		"${FILESDIR}"/${P}-parallelmake.patch
-	eautoreconf
-}
-
-src_configure() {
-	has_version sys-apps/util-linux || export GETOPT="getopt-long"
-	econf --prefix=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS
-	insinto /usr/share/doc/${PF}/xml
-	doins doc/*.xml
-}
--- a/app-text/xmlto/xmlto-0.0.23.ebuild
+++ b/app-text/xmlto/xmlto-0.0.23.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.23.ebuild,v 1.8 2011/07/10 23:46:16 halcy0n Exp $
-
-EAPI=3
-
-inherit eutils autotools
-
-DESCRIPTION="A bash script for converting XML and DocBook formatted documents to a variety of output formats"
-HOMEPAGE="https://fedorahosted.org/xmlto/"
-SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="latex"
-
-RDEPEND="app-shells/bash
-	|| ( sys-apps/which sys-freebsd/freebsd-ubin )
-	dev-libs/libxslt
-	>=app-text/docbook-xsl-stylesheets-1.62.0-r1
-	~app-text/docbook-xml-dtd-4.2
-	|| ( sys-apps/util-linux app-misc/getopt )
-	|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
-	latex? ( >=app-text/passivetex-1.25
-		>=dev-tex/xmltex-1.9-r2 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch \
-		"${FILESDIR}"/${PN}-0.0.22-parallelmake.patch
-	eautoreconf
-}
-
-src_configure() {
-	export BASH
-	has_version sys-apps/util-linux || export GETOPT="getopt-long"
-	econf --prefix="${EPREFIX}"/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install || die
-	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS
-	insinto /usr/share/doc/${PF}/xml
-	doins doc/*.xml
-}
--- a/app-text/xmlto/xmlto-0.0.24-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.24-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.24-r1.ebuild,v 1.6 2011/11/07 00:23:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.24-r1.ebuild,v 1.7 2012/01/12 16:53:16 ssuominen Exp $

 EAPI="3"

@ -14,7 +14,7 @@ SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="latex"

 RDEPEND="app-shells/bash
--- a/app-text/xmlto/xmlto-0.0.24.ebuild
+++ b/app-text/xmlto/xmlto-0.0.24.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.24.ebuild,v 1.1 2011/07/30 22:10:37 patrick Exp $
-
-EAPI=3
-
-inherit eutils autotools
-
-DESCRIPTION="A bash script for converting XML and DocBook formatted documents to a variety of output formats"
-HOMEPAGE="https://fedorahosted.org/xmlto/"
-SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="latex"
-
-RDEPEND="app-shells/bash
-	|| ( sys-apps/which sys-freebsd/freebsd-ubin )
-	dev-libs/libxslt
-	>=app-text/docbook-xsl-stylesheets-1.62.0-r1
-	~app-text/docbook-xml-dtd-4.2
-	|| ( sys-apps/util-linux app-misc/getopt )
-	|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
-	latex? ( >=app-text/passivetex-1.25
-		>=dev-tex/xmltex-1.9-r2 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch \
-		"${FILESDIR}"/${PN}-0.0.22-parallelmake.patch
-	eautoreconf
-}
-
-src_configure() {
-	export BASH
-	has_version sys-apps/util-linux || export GETOPT="getopt-long"
-	econf --prefix="${EPREFIX}"/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install || die
-	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS
-	insinto /usr/share/doc/${PF}/xml
-	doins doc/*.xml
-}
--- a/app-text/xmlto/xmlto-0.0.25.ebuild
+++ b/app-text/xmlto/xmlto-0.0.25.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.25.ebuild,v 1.1 2012/01/12 17:11:36 ssuominen Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="script for converting XML and DocBook formatted documents to a variety of output formats"
+HOMEPAGE="https://fedorahosted.org/xmlto/"
+SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="latex"
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
+	app-text/docbook-xml-dtd:4.2
+	app-shells/bash
+	dev-libs/libxslt
+	sys-apps/grep
+	|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
+	|| ( sys-apps/util-linux app-misc/getopt )
+	|| ( sys-apps/which sys-freebsd/freebsd-ubin )
+	latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+}
+
+src_configure() {
+	export BASH
+	has_version sys-apps/util-linux || export GETOPT=getopt-long
+	econf
+}
--- a/dev-haskell/data-binary-ieee754/Manifest
+++ b/dev-haskell/data-binary-ieee754/Manifest
@ -0,0 +1 @@
+DIST data-binary-ieee754-0.4.2.1.tar.gz 3977 RMD160 aa72390c580bb5ad948f93eeb3a4175abfa00469 SHA1 7f716a8851bda26e83410270acb541772718e4fd SHA256 7f26a8f647ee77ba4d7674df4fb39c5eb96c3eff6c502deea50e158430651644
--- a/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.2.1.ebuild
+++ b/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.2.1.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/data-binary-ieee754/data-binary-ieee754-0.4.2.1.ebuild,v 1.1 2012/01/12 16:35:53 slyfox Exp $
+
+EAPI="3"
+
+CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Parser/Serialiser for IEEE-754 floating-point values"
+HOMEPAGE="http://john-millikin.com/software/data-binary-ieee754/"
+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.6
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
--- a/dev-haskell/data-binary-ieee754/metadata.xml
+++ b/dev-haskell/data-binary-ieee754/metadata.xml
@ -0,0 +1,11 @@
+<?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>
+		Convert Float and Decimal values to/from raw octets.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/dbus-core/Manifest
+++ b/dev-haskell/dbus-core/Manifest
@ -0,0 +1 @@
+DIST dbus-core-0.9.2.1.tar.gz 216825 RMD160 5a1240cb8e0e5f8d43981b6df2558cc59a1c1eee SHA1 af8c29b64638f3300abf2543bcade9ea01718860 SHA256 fd286723fc7b906eb7ff2daa581cd33c06c31cd2fb808f6707a43da2319fdbbc
--- a/dev-haskell/dbus-core/dbus-core-0.9.2.1.ebuild
+++ b/dev-haskell/dbus-core/dbus-core-0.9.2.1.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dbus-core/dbus-core-0.9.2.1.ebuild,v 1.1 2012/01/12 17:10:56 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Low-level D-Bus protocol implementation"
+HOMEPAGE="https://john-millikin.com/software/dbus-core/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/binary-0.4
+		<dev-haskell/binary-0.6
+		>=dev-haskell/data-binary-ieee754-0.3
+		<dev-haskell/data-binary-ieee754-0.5
+		=dev-haskell/libxml-sax-0.7*
+		>=dev-haskell/network-2.2
+		<dev-haskell/network-2.4
+		>=dev-haskell/parsec-2.0
+		<dev-haskell/parsec-3.2
+		>=dev-haskell/text-0.11.1.5
+		<dev-haskell/text-0.12
+		>=dev-haskell/vector-0.7
+		<dev-haskell/vector-0.10
+		=dev-haskell/xml-types-0.3*
+		>=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+src_prepare() {
+	if has_version "<dev-haskell/haddock-2.9.2"; then
+		# Workaround http://hackage.haskell.org/trac/hackage/ticket/626
+		# The haddock --hoogle option does not like unicode characters, which causes
+		# haddock 2.7.2 to fail like:
+		# haddock: internal Haddock or GHC error: dist/doc/html/enumerator/enumerator.txt: commitAndReleaseBuffer: invalid argument (Invalid or incomplete multibyte or wide character)
+		sed -e 's@&#8208;@-@g' \
+			-e "s@&#8217;@'@g" \
+			-i "${S}/hs/DBus/Connection.hs" \
+			-i "${S}/hs/DBus/Client/Internal.hs" \
+			-i "${S}/hs/DBus/Client/Simple.hs" \
+			-i "${S}/hs/DBus/Message/Internal.hs" \
+			-i "${S}/hs/DBus/Types/Internal.hs" \
+			-i "${S}/hs/DBus/Wire/Internal.hs"
+	fi
+}
--- a/dev-haskell/dbus-core/metadata.xml
+++ b/dev-haskell/dbus-core/metadata.xml
@ -0,0 +1,11 @@
+<?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>
+		Low-level D-Bus protocol implementation
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/libxml-sax/Manifest
+++ b/dev-haskell/libxml-sax/Manifest
@ -0,0 +1 @@
+DIST libxml-sax-0.7.2.tar.gz 8520 RMD160 7cb427ca54fadf632e5a2810fba70b060432287d SHA1 0f9cc4691d61ae158e7618227841a8ef2480f987 SHA256 bfffec7c2078a31d14a427d9d2f094995f38a92816ca795758a5655a0f7bb5d5
--- a/dev-haskell/libxml-sax/libxml-sax-0.7.2.ebuild
+++ b/dev-haskell/libxml-sax/libxml-sax-0.7.2.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/libxml-sax/libxml-sax-0.7.2.ebuild,v 1.1 2012/01/12 16:44:25 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Bindings for the libXML2 SAX interface"
+HOMEPAGE="http://john-millikin.com/software/bindings/libxml-sax/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="<dev-haskell/text-0.12
+		=dev-haskell/xml-types-0.3*
+		>=dev-lang/ghc-6.10.1
+		dev-libs/libxml2"
+DEPEND="${RDEPEND}
+		dev-haskell/c2hs
+		>=dev-haskell/cabal-1.6"
--- a/dev-haskell/libxml-sax/metadata.xml
+++ b/dev-haskell/libxml-sax/metadata.xml
@ -0,0 +1,11 @@
+<?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>
+		Bindings for the libXML2 SAX interface
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/pcap/Manifest
+++ b/dev-haskell/pcap/Manifest
@ -0,0 +1 @@
+DIST pcap-0.4.5.1.tar.gz 48534 RMD160 0a91385be5177a7020a1f2c1243229e0461d08af SHA1 debadd06490fb97f4b79b8f25e7f7e05f9ed12da SHA256 b21f220ecdd854f3bf371dec9c082f626e2757c11495d00e41dd8b63b67e6c5c
--- a/dev-haskell/pcap/metadata.xml
+++ b/dev-haskell/pcap/metadata.xml
@ -0,0 +1,11 @@
+<?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 system-independent interface for user-level packet capture
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/pcap/pcap-0.4.5.1.ebuild
+++ b/dev-haskell/pcap/pcap-0.4.5.1.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pcap/pcap-0.4.5.1.ebuild,v 1.1 2012/01/12 17:14:37 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="A system-independent interface for user-level packet capture"
+HOMEPAGE="http://bitbucket.org/bos/pcap"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/network
+		dev-haskell/time
+		>=dev-lang/ghc-6.8.2
+		net-libs/libpcap"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
--- a/dev-haskell/primitive/Manifest
+++ b/dev-haskell/primitive/Manifest
@ -0,0 +1 @@
+DIST primitive-0.4.1.tar.gz 9058 RMD160 164e14d35b321033a3c834c217ff2c8ab3d5a9d1 SHA1 04394cb2cbb818c04f8b1ef56b0204b459b52fd4 SHA256 c69dd5e2a4da743037c51d5b626ab4f4bc3d7f023664bb9ae372c39e4a4c2919
--- a/dev-haskell/primitive/metadata.xml
+++ b/dev-haskell/primitive/metadata.xml
@ -0,0 +1,34 @@
+<?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 provides wrappers for primitive array operations from
+		GHC.Prim.
+		
+		Changes in version 0.4.0.1
+		
+		* Critical bug fix in @fillByteArray@
+		
+		Changes in version 0.4
+		
+		* Support for GHC 7.2 array copying primitives
+		
+		* New in &quot;Data.Primitive.ByteArray&quot;: @copyByteArray@,
+		@copyMutableByteArray@, @moveByteArray@, @fillByteArray@
+		
+		* Deprecated in &quot;Data.Primitive.ByteArray&quot;: @memcpyByteArray@,
+		@memcpyByteArray&#39;@, @memmoveByteArray@, @memsetByteArray@
+		
+		* New in &quot;Data.Primitive.Array&quot;: @copyArray@, @copyMutableByteArray@
+		
+		* New in &quot;Data.Primitive.Addr&quot;: @copyAddr@, @moveAddr@
+		
+		* Deprecated in &quot;Data.Primitive.Addr&quot;: @memcpyAddr@
+		
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/primitive/primitive-0.4.1.ebuild
+++ b/dev-haskell/primitive/primitive-0.4.1.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/primitive/primitive-0.4.1.ebuild,v 1.1 2012/01/12 16:52:26 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Wrappers for primitive operations"
+HOMEPAGE="http://code.haskell.org/primitive"
+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.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@ -1 +1,2 @@
 DIST text-0.11.1.1.tar.gz 119505 RMD160 304746b8e3c0298babcc0099186d7a242e401b12 SHA1 65ea09e6770ddc11524ab027d51c76c10e859630 SHA256 4e228d33022f751a6023e092bc64c071daeb4560e8358575e58623a542f975df
+DIST text-0.11.1.12.tar.gz 120261 RMD160 fdfc9b080b8653918b15f6c8ef62ad82102e5da0 SHA1 d2f4e55c52e813087068fd259d508299d8c4ce13 SHA256 b4ce2d05ad1c2f4c2fa75a7e1c10b1aaf15b055bb2bd8a7b9dac0f0939214048
--- a/dev-haskell/text/files/text-0.11.1.6-disable-tests-that-fail-in-non-latin1-locales.patch
+++ b/dev-haskell/text/files/text-0.11.1.6-disable-tests-that-fail-in-non-latin1-locales.patch
@ -0,0 +1,18 @@
+--- text-0.11.1.6-orig/tests/tests/src/Data/Text/Tests/Properties.hs	2011-10-26 09:22:13.000000000 +1100
+++ text-0.11.1.6/tests/tests/src/Data/Text/Tests/Properties.hs	2011-10-30 00:23:25.547365548 +1100
+@@ -1097,10 +1097,11 @@
+     ],
+ 
+     testGroup "input-output" [
+-      testProperty "t_write_read" t_write_read,
+-      testProperty "tl_write_read" tl_write_read,
+-      testProperty "t_write_read_line" t_write_read_line,
+-      testProperty "tl_write_read_line" tl_write_read_line
+      -- These tests fail in locales other than latin1 locales.
+      -- testProperty "t_write_read" t_write_read,
+      -- testProperty "tl_write_read" tl_write_read,
+      -- testProperty "t_write_read_line" t_write_read_line,
+      -- testProperty "tl_write_read_line" tl_write_read_line
+       -- These tests are subject to I/O race conditions when run under
+       -- test-framework-quickcheck2.
+       -- testProperty "t_put_get" t_put_get
--- a/dev-haskell/text/text-0.11.1.12.ebuild
+++ b/dev-haskell/text/text-0.11.1.12.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/text-0.11.1.12.ebuild,v 1.2 2012/01/12 17:09:35 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit eutils haskell-cabal
+
+DESCRIPTION="An efficient packed Unicode text type."
+HOMEPAGE="https://github.com/bos/text"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-macos"
+IUSE="test"
+
+RDEPEND=">=dev-haskell/deepseq-1.1.0.0
+		>=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.10
+		test? ( >=dev-haskell/quickcheck-2.4.0.1
+			<dev-haskell/test-framework-0.5
+			<dev-haskell/test-framework-hunit-0.3
+			<dev-haskell/test-framework-quickcheck2-0.3
+		)"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.11.1.6-disable-tests-that-fail-in-non-latin1-locales.patch"
+}
+
+src_configure() {
+	cabal_src_configure $(use_enable test tests)
+}
--- a/dev-haskell/vector/Manifest
+++ b/dev-haskell/vector/Manifest
@ -0,0 +1 @@
+DIST vector-0.9.1.tar.gz 104997 RMD160 0d85065d116ba4e7557634ef2fedcb4c92feeefd SHA1 b6764277b1a80f34e47b3bcb21112623fd3bb606 SHA256 5a2507f633c8b61a203b34ca29a30fca20fde1d6261f1f8417903b447c4bd7d4
--- a/dev-haskell/vector/metadata.xml
+++ b/dev-haskell/vector/metadata.xml
@ -0,0 +1,69 @@
+<?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>
+		
+		An efficient implementation of Int-indexed arrays (both mutable
+		and immutable), with a powerful loop optimisation framework .
+		
+		It is structured as follows:
+		
+		[&quot;Data.Vector&quot;] Boxed vectors of arbitrary types.
+		
+		[&quot;Data.Vector.Unboxed&quot;] Unboxed vectors with an adaptive
+		representation based on data type families.
+		
+		[&quot;Data.Vector.Storable&quot;] Unboxed vectors of &#39;Storable&#39; types.
+		
+		[&quot;Data.Vector.Primitive&quot;] Unboxed vectors of primitive types as
+		defined by the @primitive@ package. &quot;Data.Vector.Unboxed&quot; is more
+		flexible at no performance cost.
+		
+		[&quot;Data.Vector.Generic&quot;] Generic interface to the vector types.
+		
+		Each module has a @Safe@ version with is marked as @Trustworthy@
+		(see &lt;http://hackage.haskell.org/trac/ghc/wiki/SafeHaskell&gt;).
+		
+		There is also a (draft) tutorial on common uses of vector.
+		
+		* &lt;http://haskell.org/haskellwiki/Numeric_Haskell:_A_Vector_Tutorial&gt;
+		
+		Please use the project trac to submit bug reports and feature
+		requests.
+		
+		* &lt;http://trac.haskell.org/vector&gt;
+		
+		Changes in version 0.9
+		
+		* &#39;MonadPlus&#39; instance for boxed vectors
+		
+		* Export more @construct@ and @constructN@ from @Safe@ modules
+		
+		* Require @primitive-0.4.0.1@
+		
+		Changes in version 0.8
+		
+		* New functions: @constructN@, @constructrN@
+		
+		* Support for GHC 7.2 array copying primitives
+		
+		* New fixity for @(!)@
+		
+		* Safe Haskell support (contributed by David Terei)
+		
+		* &#39;Functor&#39;, &#39;Monad&#39;, &#39;Applicative&#39;, &#39;Alternative&#39;, &#39;Foldable&#39; and
+		&#39;Traversable&#39; instances for boxed vectors
+		(/WARNING: they tend to be slow and are only provided for completeness/)
+		
+		* &#39;Show&#39; instances for immutable vectors follow containers conventions
+		
+		* &#39;Read&#39; instances for all immutable vector types
+		
+		* Performance improvements
+		
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/vector/vector-0.9.1.ebuild
+++ b/dev-haskell/vector/vector-0.9.1.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.9.1.ebuild,v 1.1 2012/01/12 16:55:23 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Efficient Arrays"
+HOMEPAGE="http://code.haskell.org/vector"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=dev-haskell/primitive-0.4*
+		>=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2.3"
--- a/dev-haskell/xml-types/Manifest
+++ b/dev-haskell/xml-types/Manifest
@ -0,0 +1 @@
+DIST xml-types-0.3.tar.gz 3659 RMD160 7d070934bf80f066751dcba80c2eeda0bd446a9d SHA1 89e2fddadf922265976063ddbfa9ec31099e6e22 SHA256 c7531a5bc1009a1dc2e39f07d3a615a2fdfbfd3fdadca9995e47b162903e1d34
--- a/dev-haskell/xml-types/metadata.xml
+++ b/dev-haskell/xml-types/metadata.xml
@ -0,0 +1,11 @@
+<?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>
+		Basic types for representing XML
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/xml-types/xml-types-0.3.ebuild
+++ b/dev-haskell/xml-types/xml-types-0.3.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xml-types/xml-types-0.3.ebuild,v 1.1 2012/01/12 16:42:11 slyfox Exp $
+
+# ebuild generated by hackport 0.2.14
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Basic types for representing XML"
+HOMEPAGE="http://hackage.haskell.org/package/xml-types"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/text
+		>=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@ -1,3 +1,4 @@
 DIST jffi-0.6.0.2.tar.bz2 1855529 RMD160 be9ecd77eb17fb80c75f8dfe21f1bdd62d34596b SHA1 b957f8b52573f4e96a3c242d016cb7fc100a3399 SHA256 a2e5cd14484027807a2ab757d8010fb9903d33a4a0e5e1f045ad8de806a0cb24
 DIST jffi-1.0.0.tar.gz 1627422 RMD160 0b20a343239b8480e1b6ee787288862b02a4f575 SHA1 fa7d9c3ca58afea36e9ef643f882c828e7ce96d0 SHA256 9950edbaf897cc1fa10fb944336a86ceba92674f54a1eaf59b2ab4881825d25e
+DIST jffi-1.0.11.tar.gz 1899655 RMD160 7780cc45e4c777d5d70814bc3a25bbd96bb9146e SHA1 744fa907573b37801c9a4085f83cdc8b1ed2f2c6 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a
 DIST jffi-git-0.7_pre20100131.tgz 1484965 RMD160 8efaecd9575926e268a3b63160a196f6ea466ce2 SHA1 b58cd19600acf6ea8a2adf04b1f1d72b7f84bce5 SHA256 b2256550a38cd120cd61bebd61a76dd373994b62a1c31191c74aec3a0970e30a
--- a/dev-java/jffi/files/jffi-1.0.11_no-werror.patch
+++ b/dev-java/jffi/files/jffi-1.0.11_no-werror.patch
@ -0,0 +1,13 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index efe6230..25053c7 100755
+--- a/jni/GNUmakefile
+++ b/jni/GNUmakefile
+@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
+ OFLAGS = -O2 $(JFLAGS)
+ 
+ # MacOS headers aren't completely warning free, so turn them off
+-WERROR = -Werror
+WERROR =
+ ifneq ($(OS),darwin)
+   WFLAGS += -Wundef $(WERROR)
+ endif
--- a/dev-java/jffi/files/jffi_maven-build.xml
+++ b/dev-java/jffi/files/jffi_maven-build.xml
@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 1/9/12 9:52 AM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jffi-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="jffi-1.0.11"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+  <target name="get-deps" 
+          depends="test-offline" 
+          description="Download all dependencies" 
+          unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.8.2"/>
+    <get src="http://repository.jboss.com/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://snapshots.jboss.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repository.jboss.org/maven2//junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repository.jboss.org/nexus/content/groups/public-jboss//junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
--- a/dev-java/jffi/jffi-1.0.11.ebuild
+++ b/dev-java/jffi/jffi-1.0.11.ebuild
@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.0.11.ebuild,v 1.1 2012/01/12 09:52:45 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEP="
+	virtual/libffi"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	dev-util/pkgconfig
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mv jnr-jffi-* "${P}" || die
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	epatch "${FILESDIR}"/${P}_no-werror.patch
+
+	find "${WORKDIR}" -iname '*.jar' -delete
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+src_compile() {
+	# generate Version.java
+	cat <<-EOF > src/main/java/com/kenai/jffi/Version.java
+		package com.kenai.jffi;
+		public final class Version {
+			private Version() {}
+			public static final int MAJOR = $(get_version_component_range 1);
+			public static final int MINOR = $(get_version_component_range 2);
+			public static final int MICRO = $(get_version_component_range 3);
+		}
+	EOF
+
+	java-pkg-2_src_compile
+
+	# generate headers
+	mkdir -p build/jni
+	javah -d build/jni -classpath target/classes \
+		com.kenai.jffi.Foreign \
+		com.kenai.jffi.ObjectBuffer \
+		com.kenai.jffi.Version \
+		|| die
+
+	#build native library.
+	local args=(
+		SRC_DIR=jni
+		JNI_DIR=jni
+		BUILD_DIR=build/jni
+		VERSION=$(get_version_component_range 1-2)
+		USE_SYSTEM_LIBFFI=1
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djffi.boot.library.path=build/jni" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	cat <<-EOF > boot.properties
+		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+	EOF
+	jar -uf target/${PN}.jar boot.properties || die
+
+	java-pkg_dojar target/${PN}.jar
+	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
--- a/dev-java/jnr-constants/Manifest
+++ b/dev-java/jnr-constants/Manifest
@ -0,0 +1 @@
+DIST jnr-constants-0.8.2.tar.gz 110511 RMD160 0782daf04bba7284012b68418dd2f93791eba3d5 SHA1 2c6925b670d6723b1bbfc98081e6d1eae102ccbe SHA256 924b242877a8472e5828a5ae5f9d5a1f0c0981b7629cd68600d76c9536f2f323
--- a/dev-java/jnr-constants/files/jnr-constants_maven-build.xml
+++ b/dev-java/jnr-constants/files/jnr-constants_maven-build.xml
@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 1/11/12 12:52 PM                      -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jnr-constants-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="jnr-constants-0.8.2"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+  <target name="get-deps" 
+          depends="test-offline" 
+          description="Download all dependencies" 
+          unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.8.2"/>
+    <get src="http://repository.jboss.com/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://snapshots.jboss.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repository.jboss.org/maven2//junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repository.jboss.org/nexus/content/groups/public-jboss//junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
--- a/dev-java/jnr-constants/jnr-constants-0.8.2.ebuild
+++ b/dev-java/jnr-constants/jnr-constants-0.8.2.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-constants/jnr-constants-0.8.2.ebuild,v 1.1 2012/01/12 11:34:14 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A set of platform constants (e.g. errno values)"
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.5"
+DEPEND="
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/junit-4.8:4
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mv jnr-jnr-constants-* ${P} || die
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_ENCODING="UTF-8"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_EXTRA_ARGS="-Dmaven.build.testDir.0=test"
+EANT_TEST_GENTOO_CLASSPATH="junit-4"
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
--- a/dev-java/jnr-constants/metadata.xml
+++ b/dev-java/jnr-constants/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@ -0,0 +1,2 @@
+DIST jnr-ffi-0.5.10.tar.gz 559174 RMD160 9c7794644b7f22b84859f847a2e13e359123799b SHA1 55b0af8b65353373a799fbad7152e98676739d20 SHA256 6d13ae0ca2a63bcee0fcdb81263d676925658b0b466769e893279b453b636c9a
+DIST jnr-ffi-0.6.0.tar.gz 97712 RMD160 cb0ed527d24b055d211bf34371d2f105b2eb0ca5 SHA1 8ca1fc9ceed63eec6a3a656cc9e2633c9d88f3d8 SHA256 91f7a1c21020892332849b9edc5ab7ad98dd7fabe03756fe0a48189ab796a24a
--- a/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml
+++ b/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml
@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 1/9/12 11:18 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jnr-ffi-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="jnr-ffi-0.6.0"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11-native.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+  <target name="get-deps" 
+          depends="test-offline" 
+          description="Download all dependencies" 
+          unless="maven.mode.offline">
+  <!-- removed -->
+  </target>
+
+</project>
--- a/dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-0.5.10.ebuild,v 1.1 2012/01/12 11:27:05 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0.5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jffi:1.0
+	dev-java/jnr-x86asm:1.0
+	dev-java/asm:3"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/junit-4.8:4
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mv jnr-jnr-ffi-* "${P}" || die
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+
+	find "${WORKDIR}" -name '*.jar' -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="asm-3,jffi-1.0,jnr-x86asm-1.0"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN} -Dmaven.build.srcDir.0=src"
+
+EANT_TEST_EXTRA_ARGS="-Dmaven.build.testDir.0=test"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djna.library.path=build" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/*
+}
--- a/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-0.6.0.ebuild,v 1.1 2012/01/12 11:27:05 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0.6"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Fail, upstream pom has ignore test failures enabled.
+RESTRICT="test"
+
+COMMON_DEP="
+	dev-java/jffi:1.0
+	dev-java/jnr-x86asm:1.0
+	dev-java/asm:3"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/junit-4.8:4
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mv jnr-jnr-ffi-* "${P}" || die
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="asm-3,jffi-1.0,jnr-x86asm-1.0"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
--- a/dev-java/jnr-ffi/metadata.xml
+++ b/dev-java/jnr-ffi/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@ -1 +1,3 @@
 DIST jnr-posix-1.1.4.tar.gz 195235 RMD160 ff676df8f8192ce8fdc9743b29c5318ff1fb9439 SHA1 fd7e262510196b7d54eea1d843cd688f76907ce8 SHA256 efac5b9239a2d89036d26e647b55a3dac52eb0383d133ca44914de8c35d9006f
+DIST jnr-posix-1.1.8.tar.gz 206617 RMD160 a668159c4f51276280961443a087036c5e2256fe SHA1 d54f8dd3d681d7df115c355189e830a39fa9dbea SHA256 c66c469cd97ed5a1f1cee10f71ea4a50c18c96f47019d93508aaef3d2a6fa9b1
+DIST jnr-posix-2.0.0.tar.gz 54286 RMD160 919671a430b52988b95cc563cfc6f15ce8182dfb SHA1 668a039b2da45b5b3ef12ab8d300e59484792a58 SHA256 e7121253092afd81adf2a28225ee92b5adb8bcb36e3d9aa159b5861fb8b27400
--- a/dev-java/jnr-posix/files/jnr-posix_maven-build.xml
+++ b/dev-java/jnr-posix/files/jnr-posix_maven-build.xml
@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 1/9/12 10:58 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jnr-posix-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="jnr-posix-2.0"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/0.6.0/jnr-ffi-0.6.0.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11-native.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.2/jnr-constants-0.8.2.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-ffi/0.6.0/jnr-ffi-0.6.0.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jffi/1.0.11/jffi-1.0.11-native.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm/3.2/asm-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-commons/3.2/asm-commons-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-analysis/3.2/asm-analysis-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-tree/3.2/asm-tree-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/asm/asm-util/3.2/asm-util-3.2.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-x86asm/1.0.1/jnr-x86asm-1.0.1.jar"/>
+    <pathelement location="${maven.repo.local}/com/github/jnr/jnr-constants/0.8.2/jnr-constants-0.8.2.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         manifest="MANIFEST.MF" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+  <target name="get-deps" 
+          depends="test-offline" 
+          description="Download all dependencies" 
+          unless="maven.mode.offline">
+    <!-- removed -->
+  </target>
+
+</project>
--- a/dev-java/jnr-posix/jnr-posix-1.1.8.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-1.1.8.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-1.1.8.ebuild,v 1.1 2012/01/12 12:06:53 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
+HOMEPAGE="http://github.com/jnr/"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="1.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jnr-constants:0
+	dev-java/jnr-ffi:0.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:4
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mv jnr-jnr-posix-* ${P} || die
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-0.5"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN} -Dmaven.build.srcDir.0=src"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_TEST_EXTRA_ARGS="-Dmaven.build.testDir.0=test"
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	dodoc README.txt
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/*
+}
--- a/dev-java/jnr-posix/jnr-posix-2.0.0.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-2.0.0.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-posix/jnr-posix-2.0.0.ebuild,v 1.1 2012/01/12 12:06:53 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
+HOMEPAGE="http://github.com/jnr/"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jnr-constants:0
+	dev-java/jnr-ffi:0.6"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:4
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mv jnr-jnr-posix-* ${P} || die
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-0.6"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	dodoc README.txt
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
--- a/dev-java/jnr-x86asm/Manifest
+++ b/dev-java/jnr-x86asm/Manifest
@ -1 +1,2 @@
 DIST jnr-x86asm-0.1.tar.gz 83289 RMD160 b0a85dc019c9e09458b1e8db945c585aa33776b0 SHA1 83b14d054f0df4e16c27411b013b4481732a7a56 SHA256 31c0fbcc1fa3eb9b51a2644bf302dc88afdbbac78537020488403012af552eca
+DIST jnr-x86asm-1.0.1.tar.gz 114159 RMD160 c91beedcf9e9fd529512576e09a8d8f7b1badc09 SHA1 a1b3060f69bf85d1aa0f91d11ebc7da0653f314d SHA256 7528e5f7103ab1a40e0473cff377eb2c14e616d17c69010a8366658ed2da3f0c
--- a/dev-java/jnr-x86asm/files/jnr-x86asm_maven-build.xml
+++ b/dev-java/jnr-x86asm/files/jnr-x86asm_maven-build.xml
@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 1/9/12 11:35 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jnr-x86asm-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="jnr-x86asm-1.0.1"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src/main/java"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="src/test/java"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath"/>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+  <target name="get-deps" 
+          depends="test-offline" 
+          description="Download all dependencies" 
+          unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.8.2"/>
+    <get src="http://repository.jboss.com/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://snapshots.jboss.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repository.jboss.org/maven2//junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://repository.jboss.org/nexus/content/groups/public-jboss//junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
--- a/dev-java/jnr-x86asm/jnr-x86asm-1.0.1.ebuild
+++ b/dev-java/jnr-x86asm/jnr-x86asm-1.0.1.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-x86asm/jnr-x86asm-1.0.1.ebuild,v 1.1 2012/01/12 11:18:36 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A pure-java port of asmjit."
+HOMEPAGE="http://github.com/jnr"
+SRC_URI="http://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+src_unpack() {
+	unpack ${A}
+	mv jnr-jnr-x86asm-* ${P} || die
+}
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+}
+
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+src_install() {
+	java-pkg_newjar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
--- a/dev-lang/php/php-5.3.9.ebuild
+++ b/dev-lang/php/php-5.3.9.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9.ebuild,v 1.4 2012/01/11 22:59:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.9.ebuild,v 1.5 2012/01/12 17:31:25 phajdan.jr Exp $

 EAPI=4

@ -12,7 +12,7 @@ SUHOSIN_VERSION="5.3.9-0.9.10-gentoo"
 FPM_VERSION="builtin"
 EXPECTED_TEST_FAILURES=""

-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"

 function php_get_uri ()
 {
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild
@ -0,0 +1,215 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild,v 1.1 2012/01/12 07:34:48 eras Exp $
+
+EAPI=4
+inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
+
+SASLAUTHD_CONF_VER="2.1.21"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
+HOMEPAGE="http://cyrusimap.web.cmu.edu/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
+srp ssl static-libs urandom"
+
+DEPEND="authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
+	berkdb? ( >=sys-libs/db-3.2 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	kerberos? ( virtual/krb5 )
+	openldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sasldb_al.patch
+	epatch "${FILESDIR}"/${P}-saslauthd_libtool.patch
+	epatch "${FILESDIR}"/${P}-avoid_pic_overwrite.patch
+	epatch "${FILESDIR}"/${P}-autotools_fixes.patch
+	epatch "${FILESDIR}"/${P}-as_needed.patch
+	epatch "${FILESDIR}"/${P}-missing_header.patch
+	epatch "${FILESDIR}"/${P}-gssapi.patch
+	epatch "${FILESDIR}"/${P}-lib_before_plugin.patch
+	epatch "${FILESDIR}"/${P}-fix_heimdal.patch
+	epatch "${FILESDIR}"/${P}-auxprop.patch
+	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
+	epatch "${FILESDIR}"/${PN}-2.1.23+db-5.0.patch
+#	epatch "${FILESDIR}"/${P}-fix_dovecot_authentication.patch
+
+	# Use plugindir for sasldir
+	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+	AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+
+	# Java support.
+	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+	local myconf
+
+	# Add authdaemond support (bug #56523).
+	if use authdaemond ; then
+		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
+	fi
+
+	# Fix for bug #59634.
+	if ! use ssl ; then
+		myconf="${myconf} --without-des"
+	fi
+
+	if use mysql || use postgres ; then
+		myconf="${myconf} --enable-sql"
+	else
+		myconf="${myconf} --disable-sql"
+	fi
+
+	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
+	if use gdbm ; then
+		einfo "Building with GNU DB as database backend for your SASLdb"
+		myconf="${myconf} --with-dblib=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB as database backend for your SASLdb"
+		myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
+	else
+		einfo "Building without SASLdb support"
+		myconf="${myconf} --with-dblib=none"
+	fi
+
+	# Use /dev/urandom instead of /dev/random (bug #46038).
+	if use urandom ; then
+		myconf="${myconf} --with-devrandom=/dev/urandom"
+	fi
+
+	econf \
+		--enable-login \
+		--enable-ntlm \
+		--enable-auth-sasldb \
+		--disable-cmulocal \
+		--disable-krb4 \
+		--enable-otp \
+		--without-sqlite \
+		--with-saslauthd=/var/lib/sasl2 \
+		--with-pwcheck=/var/lib/sasl2 \
+		--with-configdir=/etc/sasl2 \
+		--with-plugindir=/usr/$(get_libdir)/sasl2 \
+		--with-dbpath=/etc/sasl2/sasldb2 \
+		$(use_with ssl openssl) \
+		$(use_with pam) \
+		$(use_with openldap ldap) \
+		$(use_enable ldapdb) \
+		$(use_enable sample) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable java) \
+		$(use_with java javahome ${JAVA_HOME}) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
+		$(use_enable srp) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	emake
+
+	# Default location for java classes breaks OpenOffice (bug #60769).
+	# Thanks to axxo@gentoo.org for the solution.
+	cd "${S}"
+	if use java ; then
+		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
+	fi
+
+	# Add testsaslauthd (bug #58768).
+	cd "${S}/saslauthd"
+	emake testsaslauthd
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir /var/lib/sasl2 /etc/sasl2
+
+	if use sample ; then
+		docinto sample
+		dodoc sample/*.c
+		exeinto /usr/share/doc/${P}/sample
+		doexe sample/client sample/server
+	fi
+
+	# Default location for java classes breaks OpenOffice (bug #60769).
+	if use java ; then
+		java-pkg_dojar ${PN}.jar
+		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
+		# hackish, don't wanna dig through makefile
+		rm -Rf "${D}/usr/$(get_libdir)/java"
+		docinto "java"
+		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
+		dodir "/usr/share/doc/${PF}/java/Test"
+		insinto "/usr/share/doc/${PF}/java/Test"
+		doins "${S}"/java/Test/*.java
+	fi
+
+	docinto ""
+	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
+	newdoc pwcheck/README README.pwcheck
+	dohtml doc/*.html
+
+	docinto "saslauthd"
+	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
+
+	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+
+	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
+
+	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd
+	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
+
+	newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
+
+	use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2.0.23
+}
+
+pkg_postinst () {
+	# Generate an empty sasldb2 with correct permissions.
+	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
+		einfo "Generating an empty sasldb2 with correct permissions ..."
+		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
+			|| die "Failed to generate sasldb2"
+		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
+			|| die "Failed to delete temp user"
+		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
+		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
+			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
+	fi
+
+	if use authdaemond ; then
+		elog "You need to add a user running a service using Courier's"
+		elog "authdaemon to the 'mail' group. For example, do:"
+		elog "	gpasswd -a postfix mail"
+		elog "to add the 'postfix' user to the 'mail' group."
+	fi
+
+	preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2.0.23
+}
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-auxprop.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-auxprop.patch
@ -0,0 +1,16 @@
+https://bugzilla.cyrusimap.org/show_bug.cgi?id=3590
+https://bugs.gentoo.org/show_bug.cgi?id=392761
+
+--- cyrus-sasl-2.1.25/lib/auxprop.c~	2011-10-20 17:33:46.423015318 +0200
+++ cyrus-sasl-2.1.25/lib/auxprop.c	2011-10-20 17:48:49.336348654 +0200
+@@ -971,6 +971,10 @@
+     }
+ 
+     if(!found) {
+	/* compatibility with <= 2.1.23, ignore the lack of auxrop plugin */
+	if (!plist)
+	    result = SASL_OK;
+	else
+ 	_sasl_log(sparams->utils->conn, SASL_LOG_DEBUG,
+ 		  "could not find auxprop plugin, was searching for '%s'",
+ 		  plist ? plist : "[all]");
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@ -1,2 +1,3 @@
 DIST grantlee-0.1.7.tar.gz 636992 RMD160 36d38a3f7e5cb09980d1fff37dc29d726c295f7b SHA1 02362a6cfeb2865e28397d8a626e95072a3ea247 SHA256 e2a86c272533d713d9d37e7f66b0c4c939795d3a7b1924349e20a8f26874663f
 DIST grantlee-0.1.8.tar.gz 669703 RMD160 b8e700726aa4764f267919df2ac06bd549e1615b SHA1 322a98e10ff7be2096274f510f262b038fe63387 SHA256 d7d530419960e90c6253358c5a951ca344c2174752a431b4d81d1fd378927a7c
+DIST grantlee-0.1.9.tar.gz 1124725 RMD160 a1a313aadbd833335f9da61a7145a2d5157c7323 SHA1 ca959294d1b45eecd848f6f079731a57832f33e4 SHA256 67f058a65ff3654d1d5f5de8e528332d1dddfd7963ec857de15d83d0acf55984
--- a/dev-libs/grantlee/grantlee-0.1.9.ebuild
+++ b/dev-libs/grantlee/grantlee-0.1.9.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.1.9.ebuild,v 1.1 2012/01/12 16:32:56 johu Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="C++ string template engine based on the Django template system"
+HOMEPAGE="http://www.gitorious.org/grantlee/pages/Home"
+SRC_URI="http://www.loegria.net/grantlee/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="debug doc test"
+
+COMMON_DEPEND="
+	>=x11-libs/qt-core-4.5.0:4
+	>=x11-libs/qt-gui-4.5.0:4
+	>=x11-libs/qt-script-4.5.0:4
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen[-nodot] )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+DOCS=(AUTHORS CHANGELOG GOALS README)
+
+# Some tests fail
+RESTRICT="test"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build test TESTS)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && cmake-utils_src_compile docs
+}
+
+src_install() {
+	use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/apidox/")
+
+	cmake-utils_src_install
+}
--- a/dev-libs/libgeier/Manifest
+++ b/dev-libs/libgeier/Manifest
@ -1,2 +1,3 @@
 DIST libgeier-0.11.tar.gz 463121 RMD160 67bfde8950098537b41dc0844590c62911802167 SHA1 3e4a152d49afbf49ed260f71c8215a67ed6b53e4 SHA256 be786ae40c9a30e4695d0361aa575b0bb2968e0185d30a3560d5ae3e964a62c4
 DIST libgeier-0.12.tar.gz 452797 RMD160 ce7f19dcf528efafeccad2502f8bbe571b0443f1 SHA1 5ad8cdf7ba1e75f94d5f5b48f41f2b74b400d1e2 SHA256 5164f2095778a3017451e1ef651510f7389a1a91e3eed0e7d9224aff50e8a35a
+DIST libgeier-0.13.tar.gz 454129 RMD160 50f4fd9b649842d5d344d6ccf29ac39354cb7c5c SHA1 69e05471223741c03480a5b59a9a5ea4907ae626 SHA256 661d72323499aa6cb9a7b35a73f4499f69885c0ea59b3e5ec0106ace970ad863
--- a/dev-libs/libgeier/libgeier-0.13.ebuild
+++ b/dev-libs/libgeier/libgeier-0.13.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgeier/libgeier-0.13.ebuild,v 1.1 2012/01/12 20:09:00 xmw Exp $
+
+EAPI=2
+
+DESCRIPTION="Libgeier provides a library to access the german digital tax project ELSTER."
+HOMEPAGE="http://www.taxbird.de/"
+SRC_URI="http://www.taxbird.de/download/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-libs/xmlsec-1.2.16
+	dev-libs/nspr
+	dev-libs/nss
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	dev-lang/swig"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README || die
+	find "${D}" -name '*.la' -delete
+}
--- a/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild,v 1.3 2012/01/11 18:25:49 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8-r4.ebuild,v 1.4 2012/01/12 17:29:20 phajdan.jr Exp $

 EAPI="3"
 PYTHON_DEPEND="python? 2"
@ -16,7 +16,7 @@ HOMEPAGE="http://www.xmlsoft.org/"

 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples icu ipv6 python readline static-libs test"

 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
--- a/dev-libs/nss/nss-3.13.1-r1.ebuild
+++ b/dev-libs/nss/nss-3.13.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.1-r1.ebuild,v 1.3 2012/01/11 13:11:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.1-r1.ebuild,v 1.4 2012/01/12 15:33:01 phajdan.jr Exp $

 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}

 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="utils"

 DEPEND="dev-util/pkgconfig"
--- a/dev-libs/openssl/openssl-0.9.8s-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8s-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8s-r1.ebuild,v 1.2 2012/01/11 11:28:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8s-r1.ebuild,v 1.3 2012/01/12 17:32:16 phajdan.jr Exp $

 # this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat

@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz"

 LICENSE="openssl"
 SLOT="0.9.8"
-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="bindist gmp kerberos sse2 test zlib"

 RDEPEND="gmp? ( dev-libs/gmp )
--- a/dev-libs/openssl/openssl-1.0.0f-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.0f-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0f-r1.ebuild,v 1.3 2012/01/11 19:16:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0f-r1.ebuild,v 1.4 2012/01/12 17:32:16 phajdan.jr Exp $

 EAPI="4"

@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz

 LICENSE="openssl"
 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="bindist gmp kerberos rfc3779 sse2 static-libs test zlib"

 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
--- a/dev-libs/soprano/Manifest
+++ b/dev-libs/soprano/Manifest
@ -1,2 +1,3 @@
 DIST soprano-2.7.0.tar.bz2 1950793 RMD160 a23d3b6c81324b0c6548152580a0026ef4d51c00 SHA1 dada6fe40db5f230054e0dbd1c7ad7344838cf4e SHA256 5fecda00ffa713fd94b6da985ca67074c0048ba6acd5025db0d0a6081e1729ce
 DIST soprano-2.7.3.tar.bz2 1953606 RMD160 43af7e951b2779e5ada813b4c84ef6bf0c760fea SHA1 dd65c5aafa0cf33b537b5c7e1e4d9466f63056e9 SHA256 f0c5202f472f64b66e3a734f5b2cba36442dd39a5196049337cbee524f05f82b
+DIST soprano-2.7.4.tar.bz2 1953706 RMD160 9e4c192165616ca5eca3ed22b9f12554530c88cc SHA1 d16231dc021bd66eebb9d1975ba075d2169a2617 SHA256 17d6f6b10d6e30a740e1267b50ea8b3a94a41942de26ede88a0492b8d278d338
--- a/dev-libs/soprano/soprano-2.7.4.ebuild
+++ b/dev-libs/soprano/soprano-2.7.4.ebuild
@ -0,0 +1,91 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/soprano/soprano-2.7.4.ebuild,v 1.1 2012/01/12 12:38:36 johu Exp $
+
+EAPI=4
+
+if [[ ${PV} == *9999* ]]; then
+	git_eclass="git-2"
+	EGIT_REPO_URI="git://anongit.kde.org/soprano"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+inherit base cmake-utils flag-o-matic ${git_eclass}
+
+DESCRIPTION="Library that provides a nice Qt interface to RDF storage solutions"
+HOMEPAGE="http://sourceforge.net/projects/soprano"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="clucene +dbus debug doc elibc_FreeBSD +raptor +redland test +virtuoso"
+
+RESTRICT=test
+# bug 281712
+
+COMMON_DEPEND="
+	>=x11-libs/qt-core-4.5.0:4
+	clucene? ( dev-cpp/clucene )
+	dbus? ( >=x11-libs/qt-dbus-4.5.0:4 )
+	raptor? ( >=media-libs/raptor-2.0.4:2 )
+	redland? (
+		>=dev-libs/rasqal-0.9.26
+		>=dev-libs/redland-1.0.14
+	)
+	virtuoso? ( dev-db/libiodbc:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( >=x11-libs/qt-test-4.5.0:4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	virtuoso? ( >=dev-db/virtuoso-server-6.1.0 )
+"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-make-broken-redland-fatal.cmake"
+)
+
+pkg_setup() {
+	if [[ ${PV} = *9999* && -z $I_KNOW_WHAT_I_AM_DOING ]]; then
+		echo
+		ewarn "WARNING! This is an experimental ebuild of ${PN} Git tree. Use at your own risk."
+		ewarn "Do _NOT_ file bugs at bugs.gentoo.org because of this ebuild!"
+		echo
+	fi
+
+	if ! use virtuoso; then
+		echo
+		ewarn "You have explicitly disabled the default soprano backend."
+		ewarn "Applications using soprano may need at least one backend"
+		ewarn "to be functional. If you experience any problems, enable"
+		ewarn "the virtuoso USE flag."
+		echo
+	fi
+}
+
+src_configure() {
+	# Fix for missing pthread.h linking
+	# NOTE: temporarily fix until a better cmake files patch will be provided.
+	use elibc_FreeBSD && append-flags -pthread
+
+	local mycmakeargs=(
+		-DSOPRANO_BUILD_TESTS=OFF
+		-DCMAKE_SKIP_RPATH=OFF
+		-DSOPRANO_DISABLE_SESAME2_BACKEND=ON
+		$(cmake-utils_use !clucene SOPRANO_DISABLE_CLUCENE_INDEX)
+		$(cmake-utils_use !dbus SOPRANO_DISABLE_DBUS)
+		$(cmake-utils_use !raptor SOPRANO_DISABLE_RAPTOR_PARSER)
+		$(cmake-utils_use !redland SOPRANO_DISABLE_RAPTOR_SERIALIZER)
+		$(cmake-utils_use !redland SOPRANO_DISABLE_REDLAND_BACKEND)
+		$(cmake-utils_use !virtuoso SOPRANO_DISABLE_VIRTUOSO_BACKEND)
+		$(cmake-utils_use doc SOPRANO_BUILD_API_DOCS)
+		$(cmake-utils_use test SOPRANO_BUILD_TESTS)
+	)
+
+	cmake-utils_src_configure
+}
--- a/dev-libs/zthread/files/zthread-2.3.2-automake.patch
+++ b/dev-libs/zthread/files/zthread-2.3.2-automake.patch
@ -0,0 +1,45 @@
+use standard automake rules rather than hand coding the install rules
+
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -24,24 +24,13 @@
+ MIT.TXT \
+ depcomp
+ 
+bin_SCRIPTS = share/zthread-config
+ 
+-## install the config script
+-install-exec-hook:
+-	$(mkinstalldirs) $(bindir)
+-	$(INSTALL_PROGRAM) $(top_srcdir)/share/zthread-config $(bindir)
+aclocaldir = $(datadir)/aclocal
+aclocal_DATA = share/zthread.m4 share/pthread.m4
+ 
+-## install the config script & m4 macros
+-install-data-hook:
+-	$(mkinstalldirs) $(datadir)/aclocal
+-	$(INSTALL_DATA) $(top_srcdir)/share/zthread.m4 $(datadir)/aclocal
+-	$(INSTALL_DATA) $(top_srcdir)/share/pthread.m4 $(datadir)/aclocal
+-	mkdir -p $(DESTDIR)$(includedir)/zthread
+-	cp -pR $(top_srcdir)/include/zthread $(DESTDIR)$(includedir)/
+-
+-## uninstall the config script & m4 macros
+-uninstall-local:
+-	-rm -rf $(datadir)/aclocal/pthread.m4
+-	-rm -rf $(datadir)/aclocal/zthread.m4
+zincludedir = $(includedir)/zthread
+zinclude_HEADERS = include/zthread/*.h
+ 
+ distclean-local: 
+ 	-rm -rf $(top_srcdir)/$(PACKAGE)-$(VERSION).tar.gz
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -21,8 +21,6 @@
+ INCLUDES = -I$(top_srcdir)/include
+ SUBDIRS=.
+ 
+-libdir=$(prefix)/lib
+-
+ lib_LTLIBRARIES = libZThread.la
+ 
+ libZThread_la_LIBADD=@LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@
--- a/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch
+++ b/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch
@ -0,0 +1,26 @@
+fix m4 warnings:
+zthread.m4:34: warning: underquoted definition of AM_PATH_ZTHREAD
+pthread.m4:39: warning: underquoted definition of AM_DETECT_PTHREAD
+
+--- a/share/zthread.m4
+++ b/share/zthread.m4
+@@ -31,7 +31,7 @@
+ dnl ZTHREAD_CXXFLAGS
+ dnl ZTHREAD_LIBS
+ dnl 
+-AC_DEFUN(AM_PATH_ZTHREAD,
+AC_DEFUN([AM_PATH_ZTHREAD],
+ [
+ 
+ 
+--- a/share/pthread.m4
+++ b/share/pthread.m4
+@@ -36,7 +36,7 @@
+ GNU Pth can also be used if it was configured with --enable-pthread.
+ EOF
+ 
+-AC_DEFUN(AM_DETECT_PTHREAD,
+AC_DEFUN([AM_DETECT_PTHREAD],
+ [
+ 
+ pthread_explicit="no"
--- a/dev-libs/zthread/zthread-2.3.2-r2.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r2.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/zthread-2.3.2-r2.ebuild,v 1.1 2012/01/13 03:23:01 vapier Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+MY_P=ZThread-${PV}
+DESCRIPTION="platform-independent multi-threading and synchronization library for C++"
+HOMEPAGE="http://zthread.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="debug doc kernel_linux static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die
+	epatch "${FILESDIR}"/${P}-no-fpermissive.diff
+	epatch "${FILESDIR}"/${P}-m4-quote.patch
+	epatch "${FILESDIR}"/${P}-automake.patch
+
+	AT_M4DIR="share" eautoreconf
+}
+
+src_configure() {
+	local myconf
+	# Autoconf does not support --disable-debug properly.
+	use debug && myconf="--enable-debug"
+
+	econf \
+		$(use_enable kernel_linux atomic-linux) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	emake
+
+	if use doc; then
+		doxygen doc/zthread.doxygen || die
+		cp doc/documentation.html doc/html/index.html || die
+		cp doc/zthread.css doc/html/zthread.css || die
+		cp doc/bugs.js doc/html/bugs.js || die
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${ED}"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	use doc && dohtml doc/html/*
+
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
--- a/dev-python/coverage/coverage-3.5.1.ebuild
+++ b/dev-python/coverage/coverage-3.5.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.5.1.ebuild,v 1.2 2011/12/18 17:53:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/coverage/coverage-3.5.1.ebuild,v 1.3 2012/01/12 22:17:46 maekke Exp $

 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""

 DEPEND="dev-python/setuptools"
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST ioping-0.6.tar.gz 6957 RMD160 1142f2a59a51434eadc4a4b4893b94f4b604f071 SHA1 4b3860a6af0755467ebe67c09f36ddaebd9be3e7 SHA256 1d14469b1bfa9243f992be784cc0e3cd86c66bb7edc1b83e22360075c5435ceb`
				`@ -0,0 +1 @@`
				`DIST data-binary-ieee754-0.4.2.1.tar.gz 3977 RMD160 aa72390c580bb5ad948f93eeb3a4175abfa00469 SHA1 7f716a8851bda26e83410270acb541772718e4fd SHA256 7f26a8f647ee77ba4d7674df4fb39c5eb96c3eff6c502deea50e158430651644`
				`@ -0,0 +1 @@`
				`DIST dbus-core-0.9.2.1.tar.gz 216825 RMD160 5a1240cb8e0e5f8d43981b6df2558cc59a1c1eee SHA1 af8c29b64638f3300abf2543bcade9ea01718860 SHA256 fd286723fc7b906eb7ff2daa581cd33c06c31cd2fb808f6707a43da2319fdbbc`
				`@ -0,0 +1 @@`
				`DIST libxml-sax-0.7.2.tar.gz 8520 RMD160 7cb427ca54fadf632e5a2810fba70b060432287d SHA1 0f9cc4691d61ae158e7618227841a8ef2480f987 SHA256 bfffec7c2078a31d14a427d9d2f094995f38a92816ca795758a5655a0f7bb5d5`
				`@ -0,0 +1 @@`
				`DIST pcap-0.4.5.1.tar.gz 48534 RMD160 0a91385be5177a7020a1f2c1243229e0461d08af SHA1 debadd06490fb97f4b79b8f25e7f7e05f9ed12da SHA256 b21f220ecdd854f3bf371dec9c082f626e2757c11495d00e41dd8b63b67e6c5c`
				`@ -0,0 +1 @@`
				`DIST primitive-0.4.1.tar.gz 9058 RMD160 164e14d35b321033a3c834c217ff2c8ab3d5a9d1 SHA1 04394cb2cbb818c04f8b1ef56b0204b459b52fd4 SHA256 c69dd5e2a4da743037c51d5b626ab4f4bc3d7f023664bb9ae372c39e4a4c2919`
				`@ -0,0 +1 @@`
				`DIST vector-0.9.1.tar.gz 104997 RMD160 0d85065d116ba4e7557634ef2fedcb4c92feeefd SHA1 b6764277b1a80f34e47b3bcb21112623fd3bb606 SHA256 5a2507f633c8b61a203b34ca29a30fca20fde1d6261f1f8417903b447c4bd7d4`
				`@ -0,0 +1 @@`
				`DIST xml-types-0.3.tar.gz 3659 RMD160 7d070934bf80f066751dcba80c2eeda0bd446a9d SHA1 89e2fddadf922265976063ddbfa9ec31099e6e22 SHA256 c7531a5bc1009a1dc2e39f07d3a615a2fdfbfd3fdadca9995e47b162903e1d34`
				`@ -0,0 +1 @@`
				`DIST jnr-constants-0.8.2.tar.gz 110511 RMD160 0782daf04bba7284012b68418dd2f93791eba3d5 SHA1 2c6925b670d6723b1bbfc98081e6d1eae102ccbe SHA256 924b242877a8472e5828a5ae5f9d5a1f0c0981b7629cd68600d76c9536f2f323`