Sync with portage [Tue Sep 25 20:17:49 MSK 2012].

12 years ago · bf9d35dcc5
parent a28cd7faf0
commit bf9d35dcc5
714 changed files with 8339 additions and 7785 deletions
--- a/app-admin/eselect-opengl/eselect-opengl-1.2.6.1.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.2.6.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-admin/eselect-opengl/eselect-opengl-1.2.6.1.ebuild,v 1.5 2012/09/16 19:39:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.2.6.1.ebuild,v 1.6 2012/09/24 17:58:08 armin76 Exp $

 EAPI=4

@ -22,7 +22,7 @@ SRC_URI="${MIRROR}/glext.h.${GLEXT}.xz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 DEPEND="app-arch/xz-utils"
--- a/app-arch/lbzip2/lbzip2-2.2.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.2.ebuild,v 1.6 2012/09/18 17:56:35 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.2.ebuild,v 1.7 2012/09/25 05:37:40 mattst88 Exp $

 EAPI=4

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

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug symlink"

 PATCHES=( "${FILESDIR}"/${P}-s_isreg.patch )
--- a/app-arch/pbzip2/pbzip2-1.1.8.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.8.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/pbzip2/pbzip2-1.1.8.ebuild,v 1.6 2012/09/18 15:37:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pbzip2/pbzip2-1.1.8.ebuild,v 1.7 2012/09/25 05:34:24 mattst88 Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"

 LICENSE="PBZIP2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static symlink"

 LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@ -0,0 +1 @@
+DIST libsecret-0.10.tar.xz 473952 SHA256 4015ac83042fa408bf66ca8526709662d194fe566181db6ab3d86a6ea4ab8880 SHA512 28b09871e532c26f04b760d014b54cfb478997840e010a07d8862ebf9f8f87f7e67f5ec60e486577020aee29ea75701d7263891126aec638eaad9245e5c2c076 WHIRLPOOL 5b55093a83dfacefad59735ecae895d5145b289d7ee2b0181345fa0f6053b7c8f736ac7833fc686b9b180cd0b977d5048b25ee0952dccb6f28764359926b8165
--- a/app-crypt/libsecret/libsecret-0.10.ebuild
+++ b/app-crypt/libsecret/libsecret-0.10.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.10.ebuild,v 1.1 2012/09/25 10:06:41 tetromino Exp $
+
+EAPI="4"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://live.gnome.org/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+IUSE="+crypt debug +introspection"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.0:2
+	crypt? ( >=dev-libs/libgcrypt-1.2.2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.29 )"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-keyring-3"
+# Add ksecrets to RDEPEND when it's added to portage
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	sys-devel/gettext
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="
+		--enable-manpages
+		--disable-strict
+		--disable-coverage
+		--disable-static
+		--disable-vala
+		$(use_enable crypt gcrypt)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	gnome2_src_install
+	prune_libtool_files --all
+}
--- a/app-crypt/libsecret/metadata.xml
+++ b/app-crypt/libsecret/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<use>
+	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+		for introspection</flag>
+</use>
+</pkgmetadata>
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@ -1,6 +1,3 @@
-DIST krb5-1.10.1-signed.tar 10649600 SHA256 d57fcef50e8f113907c3bd94f33db352600bce0f9f1b6d0c15a6d67d6ad62f0a SHA512 8d72622e92604dfa388fb42706929ad778927d87ad2b27b012f266d43b9169ea7521721b7155020583d1a9977bf4b777ab78f819ea03ec74a0211cbbfd0c6657 WHIRLPOOL 32b0466ad4753a3cece6752224aac2d391fe3a0717fb2182a966610573964eab14296d0f62274bee63537a936380d50cbcc5185e917ce6ddf18d4e808376f188
 DIST krb5-1.10.2-signed.tar 11520000 SHA256 52c719de1a7f042109486a80e7b69e43555186a2acf26c1e5ab83a3ab1cebe3d SHA512 989d49e2b5cfa55ccf01fd075a9ebe27eb22e2682a3c59eac1489318c84ad8b950458cf6c7ea9a0bfc81423e91a9545fed164799d73a6f6c46ff8f8b97bb2475 WHIRLPOOL 98440f22f737fa9b6a4482d4e7483bf458464a02747ee947296e898fe1407d128c3e74c120ea356ec724a8b26ecbee910b85fb146cfd2b46af932f7e4a968460
 DIST krb5-1.10.3-signed.tar 11530240 SHA256 fc48f9f985bf04aa91c239dae0daaa0509c85b61b2d172d9d65ab0c52bcea3cf SHA512 1f2e3bff5b7485fb5b95a247216d952c4fd0b64ed4eaea14693b687a0268f4f88cf018b4c920329f806ecf7f2cde32ff033fc8f2136a7007fdb88c4b1759dfbb WHIRLPOOL f225650f97ca21526761467d83e05de7252d329724b6b88a2d89fa210abdf0d0248e01de50eaaac200deb6eabb9adfb2129cbe297355923a88f2e67e16c6ab70
-DIST krb5-1.8.3-signed.tar 11642880 SHA256 2c5988ddd8b409134cd0e77e9ce8f762605ce8d8fb0aa22f6500f53381567019 SHA512 a44661182a0f0e31d2aae6ce430dbbcf2a49a800959cf0e10fc35c29debe785ad48e2eb777658fc979e45a0342c8e6bfbc7414e4922cc2c5e5c457508acf787e WHIRLPOOL c2d8eab64d5cb7cc19f124142bc9c86547f2e358bb43b4f2fbd6d3acb069faca7970fde4a2404a681501199d9c1fec6a1b259c339badf883d16a964fe43cd05a
-DIST krb5-1.9.2-signed.tar 12185600 SHA256 96b213345b02862b5fef61ef1dd26f643f07e4207496c35179cea35ddb7ae68c SHA512 8918f6fbbd0d82109d408477ead82a668619608e8b90b364596e678a92dd1ddc6ad01c45004d7bc0687037aa62e4ff655fb6989e60e03875385f1cfcb2d836f5 WHIRLPOOL 538040ec7a67e7259f5b3d486c2c6aee9c17d2fd71f61c3380f0b36a10f01a6490eebbe8262ba4ff637134e7b0b862570a9283f4f848af7d7e81fa12322127b4
 DIST krb5-1.9.4-signed.tar 13025280 SHA256 42fd639b0cb9568c4ae3d92874a76f75ffdc0071cf466a967b7beb340c020961 SHA512 8638f679a3f93a145ec6c5304125c77743278e5912a2d0d5e96157d60639ce26d5a135caa528570b301b3896c4752e81c523ee71b99534fe71fdc6d8083cbc04 WHIRLPOOL 559098eb8654248c612a2d23533d953f3572052b74a469dd6b4054a25167f72d1ac65ad4f5b714d9d8b9101376728c0ac34e4fce1dc73ad0aab7fa6f4a49d3c0
--- a/app-crypt/mit-krb5/mit-krb5-1.10.1-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.10.1-r2.ebuild
@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.10.1-r2.ebuild,v 1.3 2012/08/18 09:16:11 eras Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic versionator
-
-MY_P="${P/mit-}"
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
-
-RDEPEND="!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.41.0
-	keyutils? ( sys-apps/keyutils )
-	openldap? ( net-nds/openldap )
-	pkinit? ( dev-libs/openssl )
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${RDEPEND}
-	virtual/yacc
-	doc? ( virtual/latex-base )
-	test? ( dev-lang/tcl
-	        dev-lang/python
-			dev-util/dejagnu )"
-
-S=${WORKDIR}/${MY_P}/src
-
-src_unpack() {
-	unpack ${A}
-	unpack ./"${MY_P}".tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_uninitialized_extra.patch"
-	epatch "${FILESDIR}/${P}_uninitialized_extra-2.patch"
-	epatch "${FILESDIR}/${P}_gcc470.patch"
-}
-
-src_configure() {
-	append-flags "-I${EPREFIX}/usr/include/et"
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-	use keyutils || export ac_cv_header_keyutils_h=no
-	econf \
-		$(use_with openldap ldap) \
-		"$(use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--disable-rpath
-}
-
-src_compile() {
-	emake -j1
-
-	if use doc ; then
-		cd ../doc
-		for dir in api implement ; do
-			emake -C "${dir}"
-		done
-	fi
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc NOTICE README
-	dodoc doc/*.{ps,txt}
-	doinfo doc/*.info*
-	dohtml -r doc/*.html
-
-	if use doc ; then
-	    dodoc doc/{api,implement}/*.ps
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd mit-krb5kpropd
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
-		elog "MIT split the Kerberos applications from the base Kerberos"
-		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
-		elog "ftp clients and telnet, ftp deamons now live in"
-		elog "\"app-crypt/mit-krb5-appl\" package."
-	fi
-}
--- a/app-crypt/mit-krb5/mit-krb5-1.8.3-r6.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.8.3-r6.ebuild
@ -1,119 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.8.3-r6.ebuild,v 1.1 2011/12/31 20:01:30 idl0r Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic versionator
-
-MY_P=${P/mit-}
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="m68k"
-IUSE="doc openldap test xinetd"
-
-RDEPEND="!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.41.0
-	sys-apps/keyutils
-	openldap? ( net-nds/openldap )
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )
-	test? (	dev-lang/tcl
-			dev-lang/perl
-			dev-util/dejagnu )"
-
-S=${WORKDIR}/${MY_P}/src
-
-src_unpack() {
-	unpack ${A}
-	unpack ./"${MY_P}".tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/CVE-2010-1322.patch"
-	epatch "${FILESDIR}/CVE-2010-1323.1324.4020.patch"
-	epatch "${FILESDIR}/CVE-2010-4022.patch"
-	epatch "${FILESDIR}/${P}-CVE-2011-0281.0282.0283.patch"
-	epatch "${FILESDIR}/CVE-2011-0284.patch"
-	epatch "${FILESDIR}/${P}-CVE-2011-0285.patch"
-	epatch "${FILESDIR}/mit-krb5_testsuite.patch"
-}
-
-src_configure() {
-	append-flags "-I/usr/include/et"
-	econf \
-		$(use_with openldap ldap) \
-		$(use_with test tcl /usr) \
-		--without-krb4 \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-replay-cache \
-		--disable-rpath
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-
-	if use doc ; then
-		cd ../doc
-		for dir in api implement ; do
-			emake -C "${dir}" || die "doc emake failed"
-		done
-	fi
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="/usr/share/doc/${PF}/examples" \
-		install || die "install failed"
-
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-	dodoc doc/*.{ps,txt}
-	doinfo doc/*.info*
-	dohtml -r doc/*.html
-
-	# die if we cannot respect a USE flag
-	if use doc ; then
-	    dodoc doc/{api,implement}/*.ps || die "dodoc failed"
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind || die
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc || die
-
-	insinto /etc
-	newins "${D}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${D}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema" || die
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
-		elog "MIT split the Kerberos applications from the base Kerberos"
-		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
-		elog "ftp clients and telnet, ftp deamons now live in"
-		elog "\"app-crypt/mit-krb5-appl\" package."
-	fi
-}
--- a/app-crypt/mit-krb5/mit-krb5-1.9.2-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.9.2-r2.ebuild
@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9.2-r2.ebuild,v 1.2 2012/08/18 09:16:11 eras Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic versionator
-
-MY_P="${P/mit-}"
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
-
-RDEPEND="!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.41.0
-	keyutils? ( sys-apps/keyutils )
-	openldap? ( net-nds/openldap )
-	pkinit? ( dev-libs/openssl )
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${RDEPEND}
-	virtual/yacc
-	doc? ( virtual/latex-base )
-	test? ( dev-lang/tcl
-	        dev-lang/python
-			dev-util/dejagnu )"
-
-S=${WORKDIR}/${MY_P}/src
-
-src_unpack() {
-	unpack ${A}
-	unpack ./"${MY_P}".tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-kprop_exit_on_error.patch"
-	epatch "${FILESDIR}/CVE-2011-1530.patch"
-}
-
-src_configure() {
-	append-flags "-I${EPREFIX}/usr/include/et"
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-	use keyutils || export ac_cv_header_keyutils_h=no
-	econf \
-		$(use_with openldap ldap) \
-		"$(use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--disable-rpath
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-
-	if use doc ; then
-		cd ../doc
-		for dir in api implement ; do
-			emake -C "${dir}" || die "doc emake failed"
-		done
-	fi
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install || die "install failed"
-
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc NOTICE README
-	dodoc doc/*.{ps,txt}
-	doinfo doc/*.info*
-	dohtml -r doc/*.html
-
-	# die if we cannot respect a USE flag
-	if use doc ; then
-	    dodoc doc/{api,implement}/*.ps || die "dodoc failed"
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind || die
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc || die
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd mit-krb5kpropd || die
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema" || die
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd || die
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
-		elog "MIT split the Kerberos applications from the base Kerberos"
-		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
-		elog "ftp clients and telnet, ftp deamons now live in"
-		elog "\"app-crypt/mit-krb5-appl\" package."
-	fi
-}
--- a/app-crypt/mit-krb5/mit-krb5-1.9.4.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.9.4.ebuild
@ -1,116 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9.4.ebuild,v 1.7 2012/08/18 09:16:11 eras Exp $
-
-EAPI=4
-inherit eutils flag-o-matic versionator
-
-MY_P="${P/mit-}"
-P_DIR=$(get_version_component_range 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="http://web.mit.edu/kerberos/www/"
-SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
-
-RDEPEND="!!app-crypt/heimdal
-	>=sys-libs/e2fsprogs-libs-1.41.0
-	keyutils? ( sys-apps/keyutils )
-	openldap? ( net-nds/openldap )
-	pkinit? ( dev-libs/openssl )
-	xinetd? ( sys-apps/xinetd )"
-DEPEND="${RDEPEND}
-	virtual/yacc
-	doc? ( virtual/latex-base )
-	test? ( dev-lang/tcl
-	        dev-lang/python
-			dev-util/dejagnu )"
-
-S=${WORKDIR}/${MY_P}/src
-
-src_unpack() {
-	unpack ${A}
-	unpack ./"${MY_P}".tar.gz
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-	append-flags -fno-strict-overflow
-	use keyutils || export ac_cv_header_keyutils_h=no
-	econf \
-		$(use_with openldap ldap) \
-		"$(use_with test tcl "${EPREFIX}/usr")" \
-		$(use_enable pkinit) \
-		$(use_enable threads thread-support) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--disable-rpath
-}
-
-src_compile() {
-	emake -j1
-
-	if use doc ; then
-		cd ../doc
-		for dir in api implement ; do
-			emake -C "${dir}" || die "doc emake failed"
-		done
-	fi
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc NOTICE README
-	dodoc doc/*.{ps,txt}
-	doinfo doc/*.info*
-	dohtml -r doc/*.html
-
-	# die if we cannot respect a USE flag
-	if use doc ; then
-	    dodoc doc/{api,implement}/*.ps
-	fi
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd mit-krb5kpropd
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-1.8.0" ; then
-		elog "MIT split the Kerberos applications from the base Kerberos"
-		elog "distribution.  Kerberized versions of telnet, rlogin, rsh, rcp,"
-		elog "ftp clients and telnet, ftp deamons now live in"
-		elog "\"app-crypt/mit-krb5-appl\" package."
-	fi
-}
--- a/app-emacs/nxml-mode/files/50nxml-mode-gentoo.el
+++ b/app-emacs/nxml-mode/files/50nxml-mode-gentoo.el
@ -1,6 +1,3 @@
-
-;;; nxml-mode site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (load "rng-auto" nil t)

--- a/app-emacs/nxml-mode/nxml-mode-20041004-r3.ebuild
+++ b/app-emacs/nxml-mode/nxml-mode-20041004-r3.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/nxml-mode-20041004-r3.ebuild,v 1.9 2009/11/24 21:25:46 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/nxml-mode-20041004-r3.ebuild,v 1.10 2012/09/25 14:01:47 ulm Exp $

 EAPI=2

@ -12,7 +12,7 @@ http://www.emacswiki.org/cgi-bin/wiki/NxmlMode"
 SRC_URI="http://thaiopensource.com/download/${P}.tar.gz
 	mirror://gentoo/${PN}-20040910-xmlschema.patch.gz"

-LICENSE="GPL-2 as-is W3C"
+LICENSE="GPL-2+ HPND W3C"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
--- a/app-misc/lolcat/Manifest
+++ b/app-misc/lolcat/Manifest
@ -0,0 +1 @@
+DIST lolcat-42.0.99.gem 204288 SHA256 cafd788a6b3e0177a20a9e44dfbb144ea0b6b62c9c9fb413c5223778cdd92558 SHA512 fe5a1b77634c430dd699372f026b9947b53aa6def822dc1292b7bf9f5575747abef03c6625eee76e1d26c2b01fdae06409b79bc5286ef85a6c28be0af4429e50 WHIRLPOOL 79e54ea2054dc70d1629020144efbb6e60fef1c43834e5412c32b9e040b27627de9e8bae6a4c771c98b72aaffcb0c43e3397ab2a6f34d7b2c718b468afad781f
--- a/app-misc/lolcat/lolcat-42.0.99.ebuild
+++ b/app-misc/lolcat/lolcat-42.0.99.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/app-misc/lolcat/lolcat-42.0.99.ebuild,v 1.1 2012/09/24 18:51:47 hasufell Exp $
+
+EAPI=4
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rainbows and unicorns!"
+HOMEPAGE="https://github.com/busyloop/lolcat"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_rdepend "~dev-ruby/trollop-1.16.2
+	dev-ruby/paint"
--- a/app-misc/lolcat/metadata.xml
+++ b/app-misc/lolcat/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+</pkgmetadata>
+
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -7,11 +7,10 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51
 DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 SHA256 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825 SHA512 bba2fe76d09e3ab99b170685525ceb4ce8ce8d95ffa0df97c05ce18cd7edbe73028861e19c501bf00db369d36f43fe274d4220ad046518d89737249f61c7cf3a WHIRLPOOL 2dd0924defb85dc6a266126fdaabc29f051ccf525d1e1e7a5f74db19f162ee2d17f98ae96fd832dbd1600c006e277b75a4d88d9b3128c7ec9e2365a6704d32e9
 DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941 SHA512 a8c39d205051a8f8abaecb7a6fdc0c2c37baf5eee2a082af8819555f442dab525649b86cae569048357eb1e6e651deff4b62183de417e15b403e1ac09c40ba7b WHIRLPOOL fd9b6bbd214113334d3d5e542bbc9b70d5a9505281454e7f4447c6c73af733e10b007a2d4225acb39db0fc17401c2ae36b6628c59d31f09bec485f4cfc009eb5
 DIST libreoffice-binfilter-3.5.6.2.tar.xz 5982612 SHA256 58c4607ec32a7a0618cd03c439ff6188f1467ccd8a4ff2227b2f681092d5b936 SHA512 c6337fdefbb906c974e64e948899f91553493986eac236548cb40f1ce882706b379add23eaceff4ad3637d738f8741d7e8cbfc6fb54d541fbd6e92d01b95ea04 WHIRLPOOL 158eb39e2db2d328a32263800a6cd8eda0fe7e1bbe00675698b367137209e28c5c572ca9050c84aa2e57640dee04ab01622b91edc6392b3360144218612657ba
-DIST libreoffice-binfilter-3.6.1.2.tar.xz 5979484 SHA256 fa64c070dca5eea80c909ea4598b5dba2b30c24d184b58201081e5b9db1bd405 SHA512 1670fb59f7c368592ad281023ed2937db8d41448c3395c27934b0a438f57cd15d85258d474a148119f546106408458727318a732528910d4d84728cbe43cf47e WHIRLPOOL 936cca7af8e4099039f2186da1ee81383a388eaa4ac261bef2c93d9969718feb1a79fced0fa6d442196d6b5b5e39cc0a1ad5a9fc1e651bd5299602cafb68eb6c
+DIST libreoffice-binfilter-3.6.2.2.tar.xz 6055788 SHA256 07a67c87491542843f44787c5cb7097da2d19b7e97fec827f78722024deb7c0e SHA512 a38ce6bc387d8d257964d0dee5702053a43a65092d51b7f6f68fdfa32f68596ad0016e4735ede99850c28d9364e31208435d392b90f6bc3823c64812c8286cc1 WHIRLPOOL 6f6810a2b138ca70742b9a48b39d408a895751aefb0bfd457a95f32c532f25eb4afa541abe17425fcc34e144cfe53f76fcd9d79faa656e0543680707e4ecee85
 DIST libreoffice-branding-gentoo-0.5.tar.xz 150616 SHA256 91beaf63fca297914cb4390b760ffef52b03450ecb52affab0f124a2dbd63a63 SHA512 a915973e1566414fd8fdae67ccaf426a9543cfa4f2549b39e7da0146c975d568d2e222835a259f4bbe6d36979b956cf65a7d28c7a5b3a7b8858e8f731acf33d9 WHIRLPOOL c2beb6b4220a99820eade85784638b883ea3b9293f6714bcce65dcb91fd617a1712a19327377d5fa1c33ac7b402749e8a29daa72f9ea9672d24607ce27cb82fc
 DIST libreoffice-branding-gentoo-0.6.tar.xz 49756 SHA256 d5c2d12031a807d18e981a6df7e945e1787b96c7ee65fa3d9bb9eac17cf8ade9 SHA512 1126d92b6b8722fc8b7865ed42c98876922ce26c71ebff61faf03e07b338d5278ff41ba29ff296d281cbdee6a9a0965ccf8e2101fc0f4846eaddcf511ac74eed WHIRLPOOL 40f18619246ca0b6f91ff248d65e4a36639c6faee719a842fb57c6bd8fc871686156e1c991776877d5df0811088ca8f3f4390b60f10565deefa2739c99242c91
 DIST libreoffice-core-3.5.6.2.tar.xz 102714756 SHA256 0c0624aca649ab9d86aa3e35584ebeb648fe6e06d82a16c727fad2c56cb6c509 SHA512 fc0f399346b8ae7b235123f12c6c2addf78b25f1c3f03b7fb168089183b7153575f92823425154d5f4e15d79e704213ac834c1165d2393372a7921de8fea603a WHIRLPOOL bc2f214cc79efbe80fe664ebc3f767341aa7b546f31d9965bac80a23440bc8acfd7ea0c4693462421f222483a670d19d2805e7b0556f30b61f1adad79d72938e
-DIST libreoffice-core-3.6.1.2.tar.xz 107175952 SHA256 037a89a6867f2483898e73507b293296e99f899ea4dab2c37ce3061ff707ec8b SHA512 fb1a30fb7989057c3ca124ae6795d21292f007206d925331dc97d8c8ef1752ba359c3aabeca61d2a2a37283d53f2b1dae22b3a2f51ccdc90827590b54d8a97bc WHIRLPOOL 7f23fd65cbeb729597f23054d94d2bcaa453782cca1dd202a7c7558ad723c00340135612e9afb378c2a46a59cbcf0d254d066a3bee610c8e43b3244a344f6ed3
+DIST libreoffice-core-3.6.2.2.tar.xz 109090048 SHA256 5ec07ffacec09c4dcee9246cb132f7a59a618b395835e781735fd61bf47e8d37 SHA512 84784ec5c1a7c0ba1a617ebdede8153240cb88c4a83aa45f532132c076e36434ce00bac162ca31578df7ae97f09fe59cb571cdcf941863ca95d776f5c3e45843 WHIRLPOOL 29bc7c54756c6bf9abb47d73452e2fd5633bf4360e0a075aee29b1749f127fe23f9647165d6d474e95628e3fdc1c6a4a165a55595d7cd925a8d7007ce3d3cf78
 DIST libreoffice-help-3.5.6.2.tar.xz 1856988 SHA256 05840501d0ad959de0ea907c067f8e6c4c91397cba49b54c8ea8a0f0d01fba22 SHA512 1fa1a202f6e975dc6baedec7cbbe6f98ee365bc87ac052eec1559db91984eee552a44b5ed09cf6d574fa002d95189ac7ea30556e829f994fd195d62447a1e35e WHIRLPOOL 516c7848fd077b4962cc703ebf314676424255aa921babefd43c4e710ed2fe33d2a8e6330e491623015d6ae26bfb0d84c9a8cec62eead4f8a42839223969dd86
-DIST libreoffice-help-3.6.1.2.tar.xz 1863760 SHA256 41672c3548f95ff8ad3b491b0ff7d814a6a77f82b94e3adfcebb5538f3a0a349 SHA512 157352376c5811b8b9fa1141e1134c289f79a7f412b10500b0150cffe6d492198e6502d2a952e0e63c22bda88ade83a53357d40edc3543bc145450c9b5e9f26d WHIRLPOOL db2193440d3bb5a0fa7e13dd9af39f196aefbd5c7ff9d4d55fd0f4e4beb61b5727c8451c5b001087d2fa7f92ce3fc61848e97d2d3020c2a2cb2be0cb3be414ea
-koqx/A9eHSYXIYA9DISTlAgnscQpBuNcvMhbUROWOueSOcaeUU0+UJvywESTjos/
+DIST libreoffice-help-3.6.2.2.tar.xz 1911136 SHA256 55ec6ef5eef4bbf2298c3b864f67c8424ebb5ccbe7bcd6ca59abba2867989e31 SHA512 1865c70416e51dd76b326d538f618743d6dc6482a768fc31fdb09e52cc332c1b8192f063ef955ca026d8ebc0cd71a6158924f35dac5f9d66e947ad3d71a39bce WHIRLPOOL a8bdd25827d0c896618da2e78340299c948d6628133f5d0ad428ba002c4a194e05b4d2391d33bc7ac672231c7c427139f216df726378691def483aca10bdf209
--- a/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch
+++ b/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch
@ -0,0 +1,64 @@
+From 4fb35cfbf4b10d5644fd636ddfe3e07b5a932d45 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Sun, 24 Jun 2012 14:01:54 +0200
+Subject: [PATCH] dont run check targets in build, to allow running them
+ separately later
+
+Change-Id: Idb46ebcb427522c74632a1813afcbb841fb61243
+---
+ Makefile.top            |   10 ++++++++--
+ solenv/bin/build.pl     |    2 +-
+ solenv/gbuild/Module.mk |    2 +-
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.top b/Makefile.top
+index 7362bbc..ae849fb 100644
+--- a/Makefile.top
+++ b/Makefile.top
+@@ -251,7 +252,7 @@ xpdf\
+ xsltml\
+ zlib\
+ 
+-export gb_TAILBUILDTARGET=all slowcheck
+export gb_TAILBUILDTARGET=all
+ 
+ define gbuild_module_rules
+ .PHONY: $(1) $(1).all $(1).clean $(1).deliver
+@@ -526,7 +527,7 @@ findunusedcode:
+               | grep -v WPX \
+               > unusedcode.easy
+ 
+-check: dev-install subsequentcheck
+check: unitcheck slowcheck dev-install subsequentcheck
+ 
+ subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
+ 	$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
+index 74d0f32..daa4ae0 100755
+--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
+@@ -1901,7 +1901,7 @@ sub run_job {
+             return 1 if (! $path =~ /prj$/ );
+             mkpath("$workdir/Logs");
+             my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
+-            my $gbuild_target = 'all slowcheck';
+            my $gbuild_target = 'all';
+             if ($registered_name =~ /tail_build\/prj$/ )
+             {
+                 $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
+diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
+index e5f87f0..9c2608c 100644
+--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
+@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT=
+ debugrun :| build
+ endif
+ 
+-all : build unitcheck
+all : build
+ 	$(info $(gb_Module_BUILDHINT))
+ 
+ build : 
+-- 
+1.7.9.5
+
--- a/app-office/libreoffice/libreoffice-3.6.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.2.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.1.2.ebuild,v 1.5 2012/09/24 08:26:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.2.2.ebuild,v 1.1 2012/09/25 14:03:14 scarabeus Exp $

 EAPI=4

@ -439,7 +439,7 @@ src_configure() {
 		--enable-graphite \
 		--enable-cairo-canvas \
 		--enable-largefile \
-		--disable-mergelibs \
+		--enable-mergelibs \
 		--enable-python=system \
 		--enable-randr \
 		--enable-randr-link \
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.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-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.114 2012/09/24 13:36:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.115 2012/09/25 09:53:19 scarabeus Exp $

 EAPI=4

@ -226,7 +226,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
-	"${FILESDIR}/${PN}-3.6-separate-checks.patch"
+	"${FILESDIR}/${PN}-3.7-separate-checks.patch"
 )

 REQUIRED_USE="
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@ -1,33 +1,3 @@
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_install-rpm_en-US.tar.gz 179845290 SHA256 f5fb12f64e7d35991418b094f090c44f33abbd174e17cfe47feec8fbd92b915d SHA512 f85d7ba3598821ad11a3fa5037c90ace7c27a7a5e7f34ec40f052cc452074c9d9dd37866aceba22d3ef96438bebf4e2f518dc5a6c25e8b0761c4080b8f824f49 WHIRLPOOL 5e57b56877cd3baec6492f6ab5c70c5bcb1790310860c56c5bdcab2fa035ef76cfe126e4687c9339f514b708b0513c9a81f4f7d55898bc6f7123d3c4247b08fa
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_ar.tar.gz 18620131 SHA256 43b63cbe47fe4abf11094c526a007802bf57a86d69f2f24e6c5b7615fe2abbe2 SHA512 1e65372f2cc9e6bb08f7e714f2a22094d81cc9321f0b1704ff851ccfc5767ce2b74f52ee9decf7c4560fcd18983e2a492779bc9f0218b7206b368e3bf36ada1b WHIRLPOOL e13998b52db3b50846e1eb9bf141124400480ea6d856af36565c6852d141bbc9ce7067d247275646ec45cc537b38d1a7112dc290c814317828aff5bed9d3a7bd
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_cs.tar.gz 12674070 SHA256 b0ff83f79efbaaffb62f057839d41cddf7a28fb49498b9f1df02df00f72698c7 SHA512 4423940d357b24b951bae230ba5e4bf9cf9cb1fe7e1429a8f460d87444ca9811b9ac400b243b019028044be82c85ded0af44a5b6e8b69dfd231ef94f72387ef6 WHIRLPOOL 7d9e0aa7a1a61864aa34e95d5e4a4511128752265c302a2a04cbc7b3c741a78cdbfc3b5495c37f6d34439029da363bd266977a12d942bc77cf8a201b1f4959a4
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_de.tar.gz 20440758 SHA256 d1cb239313d273460e57c8b22b29b3a91ad930c408f1b0157664285c773b5184 SHA512 ff0d35d954e5fe639531f637ce649f1e7d83fbef565b036fca0004a7d2cfc853f3a0396b02d2dd72014193e88fd138aadb896a9ffad995ace76acbfe976b06e2 WHIRLPOOL 7f24b719ef35c80a7b6f586260765aadd86a9a8790c65c40287154e5448b1f890b9dbc4ad32e092682ef18cba81dd6a68fbe442bc5511467bfd5babd25c50ac3
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_es.tar.gz 12917418 SHA256 0aaba2cec76cfe697cdecadf6c475549ffb6474c61fc65783054abe6aa65e6e4 SHA512 56c869d395ae63ca7dabfedcf9ee3a4b5475d0e1fedf73f49f8a48f19979b33d59d3d67ad0abf5ebf2fb2190b86feff72dc332a9845bacfae7a449d129cde16b WHIRLPOOL 0b59cfc5ff8bb680860ccf35c3b0a9fb6b8d43977025bd925210ca4f34f71a9054cd0e6a1b84c29e21202d58772f6a0aaf23c5b6c2fe387d9f264450c296e30b
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_fr.tar.gz 13120328 SHA256 b87b5aedef35869e4b688b75a460b8187016c278bf6c561d578041b922ac3ef4 SHA512 351361185dd603d24aafbe292bf8d2b37f485dbe268ed3c1b60132904edaedd3f4890d25b7ad425c40a2a1d03a7aa1c4f203c9f603c3bdca887d955d96056b2f WHIRLPOOL 602ccd97f65e12957b99d3ed7bec65fa16c1cc0d5b7419c4733ab0eb3833ac25e861742cd6b8d4dfe7f9795f134ce05d1aaaea4746c5692cbed4b641529b7b93
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_gl.tar.gz 19769118 SHA256 a4a0cc112d36af8de5454d29c8f34847d48c5e586564f564700c50f337f2ec79 SHA512 3ea901fa148f86cc4dd7c84bf5988609488a9e2602501e2eb02304c438b8966fa17c4b06f64deac4a4979096116709d781bdc14204fd57c09abb8029c6d1ad79 WHIRLPOOL 22a464feb5d52af1de2a33335ebd4121065d72809e6d644d465a43be7d08775b618042d925bca8031fe195b4926ee4ff69dc386aad029289bcbb809dd6e56d5b
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_hu.tar.gz 13131649 SHA256 7541bc6d12683611b7497214df1a1a330aa2ff651d7afae0c2e134131110bc28 SHA512 ea80be6c2f99993c20ccefe3b6b46a193bc9231a7972f140eb21ae7c2be64010ea1c1ae882264377034220dc6443825f2b7e1f41d96e475fb7ffc45354044d6f WHIRLPOOL 1c5580c0b88d791b68b23190d857c63a66f32de7eba51d416b245fefffa0a7f70febff4dc167e7a650931754f5a90be98cf267d460593ce5897c141539b07e30
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_it.tar.gz 12852235 SHA256 4687ac679dd2373b7acc5fe53a16486951e5b7e7a1fe96651e58f77e806d8648 SHA512 29d50d60d10d8f31ba24f3706244781089e880b0f036442d0416b0c74dfee4e994ba8d26ecc38fba6af0ce33d31f82dde0eae40efe31e8cf031c01cd947e0293 WHIRLPOOL 9955b84fc0e3bcc8370cd62752a4e29fee79b1e5e159fcef48853f2b1191fb5db06ed9090138bc7ed8ad2a0a8e4d7b2f8fe31b578d529ff1a00d1ec69e917c4f
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_ja.tar.gz 19068604 SHA256 e2f002fdb13bafe273c0565f0bda3f40f3cc02df3ad74eae714bf519b772fb29 SHA512 fa1abfe6bcfa56e85ed5f0e6a4904bd5f8907557e180394ce6c004b866e4ac101341c89365e29c00525b179d078a0312b95c779c4f3694eff8b53fd9c17a8447 WHIRLPOOL 817af7bcc630a2832bd83d482efb0fc0b425922c4730372da61a7ce674ba037e37f5148cecd345e2553519182b9428b73d82fd44592909ae3b20c17a549c9498
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_nl.tar.gz 12675715 SHA256 b854b75421ddfefb914fdc83ea7584a72cabf507285f7aedce347e8a293755cc SHA512 3d0195ca05e00bfc1f21c28963ce5de240d71b61452b09e811a0a903c4c01dba65d85d17862406b8c793d7fb2f825aee493b00a2ec7eb82c0b1d41fa8ce5a075 WHIRLPOOL e630592426167d46f8871abf4d907e3a242099028f75afcc9252f20c4713e4f5d71e4354ccff4e569a2fb9b6066a2394b13516a442a951e15b33456a23cca397
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_pt-BR.tar.gz 12722901 SHA256 34b0a244eb4420dfd89b91242075bc3e4266dd96f2621389e677ac983a56fc5b SHA512 a1b370e1773a84ca489858b8c410fc09e25768dd0c2612241e78427a5c3a9db8bcd6c9496b0000fe669644ff980a89c04ff73a2ae01f9b90d499940bb79e38f1 WHIRLPOOL a8167cd97f483ebd692da02d23f3293675fa78c76cd37058c07f9dfdf5e9aa1bfa8de11b93db1900a2aae690b4794f949c0afde1b4007a4d716bc9a23fa12d50
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_ru.tar.gz 13792587 SHA256 05f1a9f6f7d3e1a6f8a60108a3fba2aacceac92d71ad222a426a4fc3ec54f2c9 SHA512 52c17be2029b24263c51c8467e4986cf228ec11a297a6c1aa5e6b8fada705961fb1f5561b1a13b161d43f418ae031402a2aa5517505fe80cdc660d8728327f73 WHIRLPOOL 0f2e665b24a2ae66b4a096109a54abfb55e61104b020c9f351764f641e40549baeaec55c64cdaffd6b51e04c7b901cbbd696efae1fb2d6a3fc70a945443bc077
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_zh-CN.tar.gz 13926104 SHA256 0952e09a1a6056c86c744b91a97e436df94794cfc2176124d12e1b567e214cc0 SHA512 a9efcf373fe7f968b7fcd797dd65d3562f287f8b240adb77374121bd98bb5fea723d74e07eef57ba956a79c1d8267db3cc50739a1bdf3b1c781ca9fc5a72926b WHIRLPOOL 92a1dd84157b11e994a47283a0d6fcc390811d6c71c7454062b25f456787dd5f5a139d911119653aaf3e613f8324151d8fdaf94d531aa680686366ec2153bb6d
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_langpack-rpm_zh-TW.tar.gz 14134248 SHA256 d28779a059d679ef572d84212b0b7f6187c417a0ebaa4e0aafbec6f51b53fcf8 SHA512 b07107188c31b991aa6759209a58c99132da7be95862acff5cc5692c9fbfe1ac9ffa69c68557b625dc6c10f6b159c51a22d7c8fb53e6ce3b2e9829406e41f3b9 WHIRLPOOL 49d46cd3ba04fce331f1546710976276e637976a5d8e764b6c4c6be599731bf5d7f2c7415bbf5b4cb6d5205578947bffa759ba38324fb1b5961211f78b34a614
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_install-rpm_en-US.tar.gz 169320443 SHA256 0ea41f6242eef6dff1dffe5c0a63c51d4ec9b2c09c7cb8dcacf731f0bb2e1e79 SHA512 31b135342846d61d65f1b83c1c918859e0d78a84ae3fc8514c696215956520fed25fc0573c6d7bb6d0c64cf60b7e9101787772f0ca074381ab01a8c3fa2de0eb WHIRLPOOL b3ed4942de5fa87f7787c26e42fc75828faed4db29285d6920b0629444c59eb10840ea95c14419e39d153d4ede51198f84dbe4808784b77acd75c2d8cf3a514c
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_ar.tar.gz 18621771 SHA256 05e3444616c521d96de8ee769f825ba3ea7b0e781b0db7b2e22694eddacb22a3 SHA512 80d4b9259bbbf19dbd303191955dabca62f2021fc78d1bb8089014e8eed7132cc90f31df7d7e6dbf43bbca3a83788f6c7790e5cf4579c3f7a5917baf80f7f95a WHIRLPOOL d9100e20359084f9909a90c21725d43e18801ce83f5614cdd0eef06c3648b62a079e4297a3a7812ebb8bfe411ddd52f3c011e1f44564c1b7fc04b4c433867d5a
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_cs.tar.gz 12673906 SHA256 97ed7d40a48234a466cf539035f4ae6d8e63e1141dbf1d44926a927ecb88bbbc SHA512 4eccd42dd1446345879b67dde0d2cdf5659ae72227aaa82d381e2b8ac353876f2a673814c79c44aaec1e660c9b7656a38896ea882ba24d6a2b58659c5133de13 WHIRLPOOL 3927e602d4a3380c3dd7409d8f5ed0c22273aa5152f65bfbaba9a8baf1fd16f1e403cd3d38b73e25f03b579b3cda0da579a06c8fb576b21c8fa4c4e73e1e83d1
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_de.tar.gz 20442632 SHA256 7b6da0e85483fa5526dca8e414b88e9ef791e2368e0650c6f05f059fb52a10f0 SHA512 aa78e93b5281d15d9313b8d6a9445d30d63881e0327fa325db9c719c7c5eb6f8d5628e8ba3d5c8a6f33eccbacac8742670aaa33bdcdc4d89e8bb5eb80a1885a7 WHIRLPOOL cb8e22b30952bcd4b1b0696e85b9087c43f70b07ca10cedbfaa7ae8d0ca4cf75dcda25a53fb296b62005c8c9f75c600fde1dbefe4708da674d13214d4e056531
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_es.tar.gz 12920030 SHA256 214970a8d5a3f85e7461e1a9cefd5a219f2c54af8f48b5d3bb18e670d2b1e044 SHA512 a6ba88d2f1e9254148eaa1d1a19aae2dd6c6dee44fd2ab63d0ab7e35dff832c31cd28bb3b28d8800c890bf0013494d23b657f05471335cd79ed2fce8a535109d WHIRLPOOL 396508ebb52b3004a293a04ea153d25dd910e04f6bc527055655780a3fdd929b94d10467b7b11c80daeb46ef67d31750a10531ca71e0fee4cec65d262e45bead
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_fr.tar.gz 13121940 SHA256 8ad1ab672fe0e93ec6a4a345c8eb3163477110f2a2c18b66eab544913603bf58 SHA512 b7b9a0fd879d598b5b384d08fa7b40a4fb49b62a84788572c0684fb2d6cde80a9d7131f44146740556fcc5fc3553300e812c318e69646637108aee4f9ff2a086 WHIRLPOOL 3adb420b17ed1a28fa6116f7b9328db669a64f56c6b1a9460429510fb07810b2091f338c8b93978a447ab69ef6c0970e66901ecb8bd48f791303b0bfe04b1605
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_gl.tar.gz 19770333 SHA256 8c1db08ee8d2c2542dc16246e759ded1c81ca5d6a95a56852be19eddced0791e SHA512 dfb90bf35fd4f0dde94059247bc567f08f5cfb25f49fc49c5619f9118048fcd6f8dabcd0e87d11757af13f559a90b46591446f764605485efc30d360e117f321 WHIRLPOOL 07d823b0b97ca8d5b44b76cd72e5e093f59c910b8364332d1a588f489a8c090b9a8996b882aa75858c547a3927fb691b4b1f0892132bb9bc3168d1b5e1f8fe60
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_hu.tar.gz 13135419 SHA256 6e415bd3fc887cb158ad29cbb54fae0504dc4efe6fad2b3e3553a705dbe71417 SHA512 bcc934ae1dcf0c07919e6b2605840c2fd14ee9028871c5531f7e1a94bedc267ed5fb0571d95f977e414c924c8ee516d9e7e843f6ca6f7f6625ef0514a889a84a WHIRLPOOL ddf5218b790c69b186f7813875de842004d4ce2957336a58b14d147447f7f68cf0e25729ece142de8f77657099082826736886ef74a526b42bf66a7b04b797f2
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_it.tar.gz 12856287 SHA256 19d5830c96fdae2da4b0e28c842e6fecc95adeed3995b0c687ebd89eb5d2ef2a SHA512 0b1826f5764296686f46d6562a45e1ed13dcd6ca33e27cb9a570d7413be100b673c7256a072a9350d5115867c12d723701be5f14622d06f3c3b85936f5ba46ca WHIRLPOOL aa4b8698e48677c16c20b885afbf217f49ad12835097e415940bfaf02cfb291ef83cce1c4c2ba620e084d818cbb58fdeb10d0d7f8ddf39e498eea228a71f47cf
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_ja.tar.gz 19073422 SHA256 f061d092d7baa6ee1c40710f02c81c32789451c7100998a7acf2424708607f2d SHA512 5d879bb3500b2190926761e4c25672f7d408ff5a460a489c0365ee3bf200c39346def7c324baa245322157095e4f20a1c7201a9001a68ad593d27634db72790c WHIRLPOOL 2013db91d5409086e3fbf13e92fcac1f955ff6c094c4764a959979efbda75f6026faef5b5e2c38071848a8c19a503a3fcec5d86f27c8c931a4c2ef6678dea626
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_nl.tar.gz 12677442 SHA256 24baada75a095ee139ed7fae52e5192911f76d5b786ff2bd884037e4c8da37e1 SHA512 b7f6ff0481e7b40a0630344555306ea01c4ee9ead152d371f932bf6768d78808752060907ea3600185752990445c8ae6e544d4bc27c0ac18b7b545ab9e1bf9fb WHIRLPOOL 259e0217f78578824d7d2460eb40e7b49414ebc7ee23d4b84c636292d7b86732a8f21a7efbda29af90e651f79bbd4a44b4b03cbe34fae3854a21b6f5b08a8f54
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_pt-BR.tar.gz 12724757 SHA256 1d7d8ed9bbe07790bcdaadada967b863a4c5d698223da98a3af7bd63720f12d6 SHA512 eb6b010fe7b9d8953b16314a0fbed8b2ea02be1d43d4942aeffa9d009ccd66e5f1f7123b9828a891005c5009ffecc4ac5a4a717fa4066cb71b3f32852b2c5769 WHIRLPOOL fb972483257f91c5038600d9e9db3b008591babf065629806fc0565f2de13238f44ccb40f4de8cb2550a00a4204de612c4c4b337b6f872f954232b9ee51fbf1a
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_ru.tar.gz 13794665 SHA256 6fd0bc82316292d42429483e508f8952571b956a54b83928486ad1969b034a88 SHA512 6fa267b1755449f78327fc9bf49dae60398fecc53c8c221082dd1d258df6cfa10b0ff902e8465b91fcacdb148fb7a7269069dd5fafc5e8573cf5959ce8d949c4 WHIRLPOOL 7fd566ca7881245e5ecc60ad9a8bcc8144aca684ad1f648097dd6ba221751fa659301917864c06d0fd728a735be0fa53cbad5a58cceec906210a44c5fcbdb91e
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_zh-CN.tar.gz 13927135 SHA256 48d1dc1762177a5662866cd6bf0f33b407e8c41d35d06a0e4bafc4aa8b742f89 SHA512 397b28244c97ee9e83f3452ddf9803ec48c621d38fc3d6265e5e4c9b80ee30e00243cd206fcce55fb437fbd2977539b015e01dba642c8b275fdc3ea031a09148 WHIRLPOOL c76cabf4479da2dc8acaa9fa4b08157abc8bd482a51f05ab035e28ca1139dbf12a535820541ffe13c9dd44804c1579917a026f04f40d7977e99ea5e4c0a9ebe6
-DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_zh-TW.tar.gz 14136951 SHA256 c8403fb5d5d09d56261948b1f761e9b39b91177739f391a2a7128e99769dfb9f SHA512 abf74793021f37a3a6aaf61df34876ee6cdc1442df75de45c6cb819a2e290659d39ac083836c6cf2f281da8a2ab67dec350db14f7c44fef96490313c66fcbe41 WHIRLPOOL 6c56533d4ca090e2c81283a54963e6ad1c8cc0f42094d7deec06fdb48cc75023951153d810ee4388e7ff0d0b44a762b8d67714b0f68dd0559f4ea9554f88fbc7
 DIST Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_install-rpm_en-US.tar.gz 160067453 SHA256 4d519292afee0e9858e4b352d8398348e920d364e990ed9b6586ba9f4eeda54c SHA512 1a40c625f7ca54e45073953007f735740e44a4d100eba614308f74875d0e0c0aaa1d7c4e8d59917a49fc8748ab416bf4711f0eb2e4675533cc53bbe5b834a430 WHIRLPOOL 35d0f2cd3e12d25c8dcde44e8a4963452e286fecf2dbf16cc6f8730e0067dbb1eb870bf60f76c1864d93cafef8087969e3cd14fbda3a78956e3250ecdc2525cb
 DIST Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_langpack-rpm_ar.tar.gz 18619724 SHA256 4e6130faba27a167c395df8b158ed965ab090516546f49e26201581362ce025d SHA512 701238119a0740c541ce4397c14a51ab39e5e30d954f388c22fef760feb289dcec55f7d546713627ff88f231cd96a401892ec9c83b896fa318398f2fe80cbaa8 WHIRLPOOL d4d4b031e50bbdafb1e1aa2ed24e0e5d8e0e529b3825d7c4d7fa9ef6a231978f1a945b7dee9f9fdd62726226127c79958ef90e648dd3b372f784ebc9ae5baec1
 DIST Apache_OpenOffice_incubating_3.4.1_Linux_x86-64_langpack-rpm_cs.tar.gz 12672601 SHA256 890be11b79d36737c0d0b27bd92d6d435ba4de2c47f381e35d2301eb8328b99b SHA512 d112e9d87dc6a12eb7e2ec5f9356ca0f72c287ce99dcea0340d92c3cd478db6fa06eda8ebd75d2bff98ea5aa2a8214a59aef7478ad9beb9ed940afd2d278b704 WHIRLPOOL ffee0a2218ab41165c2a80d9e042aef6c86f9210fd2dfb7dc29da4ef98a2cef761a36a918d95191c1d4f7f890a7d80818255982abe8ea83588893c511fbd77a0
--- a/app-office/openoffice-bin/openoffice-bin-3.4.0-r2.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-3.4.0-r2.ebuild
@ -1,214 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.4.0-r2.ebuild,v 1.1 2012/08/16 07:46:35 scarabeus Exp $
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils pax-utils prefix rpm multilib
-
-IUSE="gnome java"
-
-BUILDID="9590"
-BUILDID2="9590"
-MST="OOO330_m20"
-MY_PV="${PV}rc10"
-MY_PV2="${MY_PV}_20110118"
-BVER="${PV/_rc*/}-${BUILDID}"
-BVER2="3.4-${BUILDID2}"
-BASIS="ooobasis3.4"
-BASIS2="basis3.4"
-NM="openoffice"
-NM1="${NM}.org"
-NM2="${NM1}3"
-NM3="${NM2}.4"
-FILEPATH="mirror://sourceforge/openofficeorg.mirror/localized"
-if [ "${ARCH}" = "amd64" ] ; then
-	XARCH="x86_64"
-else
-	XARCH="i586"
-fi
-UP="en-US/RPMS"
-
-DESCRIPTION="Apache OpenOffice productivity suite."
-HOMEPAGE="http://www.openoffice.org/"
-SRC_URI="amd64? ( mirror://sourceforge/openofficeorg.mirror/stable/${PV}/Apache_OpenOffice_incubating_${PV}_Linux_x86-64_install-rpm_en-US.tar.gz )
-	x86? ( mirror://sourceforge/openofficeorg.mirror/stable/${PV}/Apache_OpenOffice_incubating_${PV}_Linux_x86_install-rpm_en-US.tar.gz )"
-
-LANGS="ar zh_CN zh_TW cs nl fr gl de hu it ja pt_BR ru es"
-
-for X in ${LANGS} ; do
-	[[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
-		amd64? ( "${FILEPATH}"/${X/_/-}/${PV}/Apache_OpenOffice_incubating_${PV}_Linux_x86-64_langpack-rpm_${X/_/-}.tar.gz )
-		x86? ( "${FILEPATH}"/${X/_/-}/${PV}/Apache_OpenOffice_incubating_${PV}_Linux_x86_langpack-rpm_${X/_/-}.tar.gz ) )"
-	IUSE="${IUSE} linguas_${X}"
-done
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	!app-office/openoffice
-	!prefix? ( sys-libs/glibc )
-	app-arch/unzip
-	app-arch/zip
-	>=dev-lang/perl-5.0
-	>=media-libs/freetype-2.1.10-r2
-	x11-libs/libXaw
-	x11-libs/libXinerama"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils"
-
-PDEPEND="java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="strip"
-
-QA_PREBUILT="usr/$(get_libdir)/${NM}/${BASIS2}/program/*
-	usr/$(get_libdir)/${NM}/program/*
-	usr/$(get_libdir)/${NM}/ure/bin/*
-	usr/$(get_libdir)/${NM}/ure/lib/*"
-QA_TEXTRELS="usr/$(get_libdir)/${NM}/${BASIS2}/program/libvclplug_genli.so \
-	usr/$(get_libdir)/${NM}/${BASIS2}/program/python-core-2.6.1/lib/lib-dynload/_curses_panel.so \
-	usr/$(get_libdir)/${NM}/${BASIS2}/program/python-core-2.6.1/lib/lib-dynload/_curses.so \
-	usr/$(get_libdir)/${NM}/ure/lib/*"
-
-S=${WORKDIR}
-
-src_unpack() {
-
-	unpack ${A}
-
-	cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
-	eprefixify "${T}"/{50-${PN},wrapper.in}
-
-	for i in base binfilter calc core01 core02 core03 core04 core05 core06 core07 draw graphicfilter images impress math ogltrans ooofonts ooolinguistic pyuno testtool writer xsltfilter ; do
-		rpm_unpack "./${UP}/${BASIS}-${i}-${BVER}.${XARCH}.rpm"
-	done
-
-	rpm_unpack "./${UP}/${NM2}-${BVER}.${XARCH}.rpm"
-	rpm_unpack "./${UP}/${NM1}-ure-${BVER}.${XARCH}.rpm"
-
-	for j in base calc draw impress math writer; do
-		rpm_unpack "./${UP}/${NM2}-${j}-${BVER}.${XARCH}.rpm"
-	done
-
-	rpm_unpack "./${UP}/desktop-integration/${NM3}-freedesktop-menus-${BVER2}.noarch.rpm"
-
-	use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${BVER}.${XARCH}.rpm"
-	use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${BVER}.${XARCH}.rpm"
-
-	# English support installed by default
-	rpm_unpack "./${UP}/${BASIS}-en-US-${BVER}.${XARCH}.rpm"
-	rpm_unpack "./${UP}/${NM2}-en-US-${BVER}.${XARCH}.rpm"
-	for s in base binfilter calc draw help impress math res writer ; do
-		rpm_unpack "./${UP}/${BASIS}-en-US-${s}-${BVER}.${XARCH}.rpm"
-	done
-
-	# Localization
-	strip-linguas ${LANGS}
-	for l in ${LINGUAS}; do
-		m="${l/_/-}"
-		if [[ ${m} != "en" ]] ; then
-			LANGDIR="${m}/RPMS/"
-			rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${BVER}.${XARCH}.rpm"
-			rpm_unpack "./${LANGDIR}/${NM2}-${m}-${BVER}.${XARCH}.rpm"
-			for n in base binfilter calc draw help impress math res writer; do
-				rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${n}-${BVER}.${XARCH}.rpm"
-			done
-
-		fi
-	done
-
-}
-
-src_install () {
-
-	INSTDIR="/usr/$(get_libdir)/${NM}"
-	dodir ${INSTDIR}
-	mv "${WORKDIR}"/opt/${NM1}/* "${ED}${INSTDIR}" || die
-	mv "${WORKDIR}"/opt/${NM2}/* "${ED}${INSTDIR}" || die
-
-	#Menu entries, icons and mime-types
-	cd "${ED}${INSTDIR}/share/xdg/"
-	for desk in base calc draw impress javafilter math printeradmin qstart startcenter writer; do
-		if [ "${desk}" = "javafilter" ] ; then
-			use java || { rm javafilter.desktop; continue; }
-		fi
-		mv ${desk}.desktop ${NM1}-${desk}.desktop
-		sed -i -e s/${NM2}/ooffice/g ${NM1}-${desk}.desktop || die
-		domenu ${NM1}-${desk}.desktop
-	done
-	insinto /usr/share
-	doins -r "${WORKDIR}"/usr/share/icons
-	doins -r "${WORKDIR}"/usr/share/mime
-
-	# Make sure the permissions are right
-	use prefix || fowners -R root:0 /
-
-	# Install wrapper script
-	newbin "${T}/wrapper.in" ooffice
-	sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/ooffice" || die
-
-	# Component symlinks
-	for app in base calc draw impress math writer; do
-		dosym ${INSTDIR}/program/s${app} /usr/bin/oo${app}
-	done
-
-	dosym ${INSTDIR}/program/spadmin /usr/bin/ooffice-printeradmin
-	dosym ${INSTDIR}/program/soffice /usr/bin/soffice
-
-	rm -f "${ED}${INSTDIR}/basis-link" || die
-	dosym ${INSTDIR}/${BASIS2} ${INSTDIR}/basis-link
-
-	# Change user install dir
-	sed -i -e "s/.${NM1}\/3/.ooo3/g" "${ED}${INSTDIR}/program/bootstraprc" || die
-
-	# Non-java weirdness see bug #99366
-	use !java && rm -f "${ED}${INSTDIR}/ure/bin/javaldx"
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-
-	# remove soffice bin
-	rm -rf "${ED}${EPREFIX}/usr/bin/soffice"
-
-	# replace all symlinks by bash shell code in order to nicely cope with
-	# libreoffice
-	cd "${ED}${EPREFIX}/usr/bin/"
-	for i in oo*; do
-		[[ ${i} == ooffice ]] && continue
-
-		rm ${i}
-		cat >> ${i} << EOF
-#!/usr/bin/env bash
-pushd "${EPREFIX}/usr/$(get_libdir)/openoffice/program" > /dev/null
-./${i/oo/s}
-popd > /dev/null
-EOF
-		chmod +x ${i}
-	done
-}
-
-pkg_preinst() {
-
-	use gnome && gnome2_icon_savelist
-
-}
-
-pkg_postinst() {
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	use gnome && gnome2_icon_cache_update
-
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin
-
-}
-
-pkg_postrm() {
-
-	fdo-mime_desktop_database_update
-	use gnome && gnome2_icon_cache_update
-
-}
--- a/app-text/dos2unix/dos2unix-6.0.ebuild
+++ b/app-text/dos2unix/dos2unix-6.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.ebuild,v 1.8 2012/07/14 11:28:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.ebuild,v 1.9 2012/09/24 18:31:08 armin76 Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls"

 RDEPEND="
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@ -1 +1,2 @@
 DIST libwpd-0.9.4.tar.bz2 629054 SHA256 7895f0cf07ac98bd88f6d5cf26ba7f1d72fd8acaeb43b27ffa24846fccc80343 SHA512 6b3206d93426b40d2764d48f7028497664df867abc31a23d8b18e2af5fbc23f6030da8814fc67cdad20b204f9ac97705b283c2dbaabbf6a82899b05ac6709a95 WHIRLPOOL 36a7a087c7c09e17e23f8e6fedb02fcc744e5fbab3a0a5e6b3d97326e6d8c68347bc010f60302c6f59cbdcf5e09eff070f8e006299d465ceeff378f7cf5b2e12
+DIST libwpd-0.9.6.tar.bz2 675826 SHA256 87081d5a81fb08e3aae88dc959aec769c4c62df44b59d5f9c0561f039cc9db6b SHA512 31fd04e65e69de17c8b872a3e457d8729e842451c77b1e6b2e67f360ff53054e3e4107616f2a62023152bec28c53faddf9a578845e35540e82c9f398545a271e WHIRLPOOL 9281609974146641a6f6f0ec36cd3ded604b7abae650823694967d3a17067cf249f7852c29c0b7a426c77143e9a2201ab63d4f717c993c372224c463f8991ecf
--- a/app-text/libwpd/libwpd-0.9.6.ebuild
+++ b/app-text/libwpd/libwpd-0.9.6.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.9.6.ebuild,v 1.2 2012/09/25 07:58:13 scarabeus Exp $
+
+EAPI=4
+
+inherit alternatives eutils
+
+DESCRIPTION="WordPerfect Document import/export library"
+HOMEPAGE="http://libwpd.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test +tools"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${RDEPEND}
+	!<app-text/libwpd-0.8.14-r1"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_with tools stream) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--program-suffix=-${SLOT}
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_postinst() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9]"
+	fi
+}
+
+pkg_postrm() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9]"
+	fi
+}
--- a/app-text/qpdfview/qpdfview-0.3.3.ebuild
+++ b/app-text/qpdfview/qpdfview-0.3.3.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-text/qpdfview/qpdfview-0.3.3.ebuild,v 1.1 2012/09/06 04:20:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.3.3.ebuild,v 1.2 2012/09/25 01:12:44 chithanh Exp $

 EAPI=4
 PLOCALES="cs de el ru sk uk"
@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV/_}/+download/${P/_}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="cups dbus svg"

 RDEPEND="app-text/poppler[qt4]
--- a/dev-db/oracle-instantclient-basic/files/tnsnames.ora.sample
+++ b/dev-db/oracle-instantclient-basic/files/tnsnames.ora.sample
@ -0,0 +1,93 @@
+# This file contains the syntax information for 
+# the entries to be put in any tnsnames.ora file
+# The entries in this file are need based. 
+# There are no defaults for entries in this file
+# that Sqlnet/Net3 use that need to be overridden 
+#
+# Typically you could have two tnsnames.ora files
+# in the system, one that is set for the entire system
+# and is called the system tnsnames.ora file, and a
+# second file that is used by each user locally so that
+# he can override the definitions dictated by the system
+# tnsnames.ora file.
+
+# The entries in tnsnames.ora are an alternative to using
+# the names server with the onames adapter.
+# They are a collection of aliases for the addresses that 
+# the listener(s) is(are) listening for a database or 
+# several databases.
+
+# The following is the general syntax for any entry in 
+# a tnsnames.ora file. There could be several such entries 
+# tailored to the user's needs.
+
+<alias>= [ (DESCRIPTION_LIST =  # Optional depending on whether u have 
+				# one or more descriptions
+				# If there is just one description, unnecessary ]
+	  (DESCRIPTION=
+	    [ (SDU=2048) ]	# Optional, defaults to 2048
+				# Can take values between 512 and 32K
+	    [ (ADDRESS_LIST=    # Optional depending on whether u have
+				# one or more addresses
+				# If there is just one address, unnecessary ]
+	      (ADDRESS=
+		[ (COMMUNITY=<community_name>) ] 
+		(PROTOCOL=tcp)
+		(HOST=<hostname>)
+		(PORT=<portnumber (1521 is a standard port used)>)
+	      )
+	      [ (ADDRESS=
+		  (PROTOCOL=ipc)
+		  (KEY=<ipckey (PNPKEY is a standard key used)>)	
+		)
+	      ]
+	      [ (ADDRESS=
+		  [ (COMMUNITY=<community_name>) ]
+		  (PROTOCOL=decnet)
+		  (NODE=<nodename>)
+		  (OBJECT=<objectname>)
+		)
+	      ]
+              ... # More addresses
+	    [ ) ] # Optional depending on whether ADDRESS_LIST is used or not 
+	    [ (CONNECT_DATA=
+		(SID=<oracle_sid>)
+		[ (GLOBAL_NAME=<global_database_name>) ]
+	      )
+	    ]
+	    [ (SOURCE_ROUTE=yes) ]  
+	  )
+	  (DESCRIPTION=     
+	    [ (SDU=2048) ]	# Optional, defaults to 2048
+				# Can take values between 512 and 32K
+	    [ (ADDRESS_LIST= ]	# Optional depending on whether u have more
+				# than one address or not
+				# If there is just one address, unnecessary
+	      (ADDRESS
+		[ (COMMUNITY=<community_name>) ]
+		(PROTOCOL=tcp)
+		(HOST=<hostname>)
+		(PORT=<portnumber (1521 is a standard port used)>)
+	      )
+	      [ (ADDRESS=
+		  (PROTOCOL=ipc)
+		  (KEY=<ipckey (PNPKEY is a standard key used)>)
+	         )
+	      ]
+	      ... 		# More addresses
+	    [ ) ] 		# Optional depending on whether ADDRESS_LIST  
+				# is being used
+	    [ (CONNECT_DATA=
+		(SID=<oracle_sid>)
+		[ (GLOBAL_NAME=<global_database_name>) ]
+	      )
+	    ]
+	    [ (SOURCE_ROUTE=yes) ]
+	  )
+	  [ (CONNECT_DATA=
+	      (SID=<oracle_sid>)
+	      [ (GLOBAL_NAME=<global_database_name>) ]
+	    )
+	  ]
+	  ...   # More descriptions 
+	[ ) ]	# Optional depending on whether DESCRIPTION_LIST is used or not
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.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-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.5 2012/03/09 17:04:41 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.7 2012/09/24 21:13:22 haubi Exp $

 EAPI="4"

@ -52,6 +52,14 @@ set_my_abivars() {
 	[[ -n ${MY_PLAT} ]]
 }

+oic_distfile_status() {
+	if [[ -r ${DISTDIR}/${1} ]]; then
+		echo "already here"
+	else
+		echo "still absent"
+	fi
+}
+
 pkg_nofetch() {
 	eerror "Please go to"
 	eerror "  ${HOMEPAGE%/*}/index-097480.html"
@ -60,12 +68,12 @@ pkg_nofetch() {
 	do
 		set_my_abivars || continue
 		eerror "Instant Client for ${MY_PLAT}"
-		eerror "    Basic: ${MY_A}"
+		eerror "    Basic: ($(oic_distfile_status ${MY_A})) ${MY_A}"
 		if is_final_abi; then
-			eerror "    SDK:   ${MY_ASDK}"
+			eerror "    SDK:   ($(oic_distfile_status ${MY_ASDK})) ${MY_ASDK}"
 		fi
 	done
-	eerror "After downloading, put them in:"
+	eerror "After downloading these files (for *all* shown architectures), put them in:"
 	eerror "    ${DISTDIR}/"
 }

@ -155,7 +163,8 @@ src_install() {
 	eend $?

 	# create path for tnsnames.ora
-	dodir /etc/oracle
+	insinto /etc/oracle
+	doins "${FILESDIR}"/tnsnames.ora.sample

 	# Add OCI libs to library path
 	{
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@ -1,16 +1,21 @@
 DIST postgresql-8.3.18.tar.bz2 14563583 SHA256 5db4904a8959f09274e1e0ee7f21c354128d5dbb4e946b78391f6bc4723c3746 SHA512 ac371d0ca7ec69782393345b5b3b9e3edf0fd6c3d3b8fbed86db6661dc11b54b6de991597a517181bba685d9cda5203b1c7dab586ef85df415b6f9cf49e290fd WHIRLPOOL d6ed681aecaf9261507f243e568ca8c38f35260b871ff9d5d9cb7d8b80251a5d08fe76233a7318f66d96a0c6447d354d0fceeae3aae2396cbc1790ed8c1a215d
 DIST postgresql-8.3.19.tar.bz2 14570746 SHA256 986f0d4b7edc633be1d210f27dfd1e47d416b642659e568895218466e50b58d5 SHA512 ffa07dd68c9de9a6c1fd9547181dbc252a300407e850e163e4d234aeab1e794f2c721ad4f676712e02ac5733ee566efe4b0fd4652b39b8ae885a3e478a66ef24 WHIRLPOOL 16ea02fa6ef4fb2088f5a677a5f4cb3f44049ef2f4564af3340b1a967cced561adc476ed09dd516bd8cb6b9bf9b3ed9fbc85b0346e835b5bd474052da35a9ae6
 DIST postgresql-8.3.20.tar.bz2 14624435 SHA256 922b6165dc21739356e22ba4d53e08f3b26cd38d8fb9569d5f8fa6d239611163 SHA512 e709632db165f543e510334adfa191ecff6fbe5ae6726578cbb5e4858de62fda53e67b19171c302492361c580bf6894af84dc97ee81e1146a04aec2984d4f91f WHIRLPOOL beee4643d4c2212d9d49390bf1f3ff279f54f2d3c90743610ee59d7e8b93a1e61136654a1f5abe5d49a7826afdea8166ae047f7f2eb2f461c543bf3111f294d5
+DIST postgresql-8.3.21.tar.bz2 14626010 SHA256 a64b6de9f8067b803f2ed46a025bfd2a16a5ae270db60e440a698f2c07e234f8 SHA512 6da6fab655412fb2cc59ba6228596d6d3caff1a0c6bbd574b61c807bc18941b8d3db6824ffb7da1ad78d89c61d4407402bdb0904bf7b60c49959f40cb2bf3191 WHIRLPOOL 1bb3afefa2610537a35d148ccf2b65d6fe2915774aa61e92afeaadb3c6e923bf1771be7a5828c8ac67d2a0dac94f8bad3330cb38fa2f3b6993ebe493998f11a0
 DIST postgresql-8.4.11.tar.bz2 14502434 SHA256 5bbc9ff1d16282b592600d7c6b9cb1a93049d4aa9a961e3c2c8d5fb13b189c8f SHA512 3f2c6015781a7bc218a5b0fa9135163d5adf21ff41ab952d0f0ad0586762f0f95bf0d7c6738d122cdc1d8506924814d8b4c6659ff9c79daa926f4ee9a95e7a41 WHIRLPOOL 712e600fe175972cd8b1ad4ce0124de7e2e108e8952b3c5d003cf3044be6a732fb02186d689d618452df68e0bfdf38aff76c266d9f85c7f3a45de995e4658da6
 DIST postgresql-8.4.12.tar.bz2 14509007 SHA256 99b7b330ec183828988c7e8ec1b675393f24b10017a2e1d03b8ff48c4dfc0f77 SHA512 5e21ff30208296fc98033d6d4c0bb9491bed000bd8a00853c36be74feaf1ed7698561dccbf98596a920edf1f77801e8c15e79dbaec1d882c289c70905399c23e WHIRLPOOL c0f86598396f9d439d4e1d63790af2a92ffb3afa259f6e3369f5a92d8a93d42e50ca70713c467da6c7fde78a01041aaf24b5fd0a441060a06800a87c9a85694b
 DIST postgresql-8.4.13.tar.bz2 14666613 SHA256 20dd3442a3fa3a4fb1813b58f969ce4bbc54d73194fd4fe20d6f1313edc48cb9 SHA512 c6294846bf9adf39d5d57d2df26023ed4aa83464a773789eaaf5823a6dd6005eeb756f3835caaffde72729edd5b1f0ab300309417a4f9b570d6110b62096f1e4 WHIRLPOOL 1a9cbbdf1d651e49d85b7edee5da70fcadcef20a10fbc4340bd43679144662c68bede5c68b38933aaed8cc1a9a4db8c0b48e2a183140f901e07f09055e958e96
+DIST postgresql-8.4.14.tar.bz2 14679559 SHA256 1172e7735beea8a933eab0a4c01f9ad49fe872d8786af12a7fe596346b1d133a SHA512 bf9ddb393de08bbff92708b83697b907fbf34229a2ce66e1bf97c1deb9630c37c9a363f9305889e1f6ce4671d116a2c267302b7681281bb0482575ac81d6f28e WHIRLPOOL 8fe681ce8d263116fb2d3554adb2f45c1b21f7d6b840396fee532f7f200809dacc5127df7102b97be88193cd39148b40c81d781ec73ffc508e4908b0af2426bf
+DIST postgresql-9.0.10.tar.bz2 15015826 SHA256 4394184b0099e8c86a482f7d62930aa31b50fb23e7dfb8fe9e1d93eb828dc729 SHA512 93a6d63d89800f9fc2eeef694c55afcdb8b8a255a2952a69b1816a31b831d0f86ed8b8fc88ad68cbc27f322eb1aba24e2cc9d891a5487217753b3f196fa5b754 WHIRLPOOL e5161e09c636f6a48d72de4befb967575a94b429129e72e4eb6013dc074bfe4f8ad43e4a15c40ec7e00b64d790cdd8da0eeb8a0555db44ce59fb336b0153799e
 DIST postgresql-9.0.7.tar.bz2 14977437 SHA256 dabe26d71d8b595f9514da1363dc20c3f4b90b6908026dd06984cac448a6d833 SHA512 25fe1b20c0f172e3d2ff4dcbbbcd5a49be5a25e15ae74324cf9c0a3e6be0e760a81e65fbf9cae39aa2588794fb55953c59c750182a151473e959a375aba75322 WHIRLPOOL ff506c7495aba5087b6df867d3e25a1c0c58908845a59e0ae4ab1ebba5dee26d1c977fd0cfd530c8ffe6b3a3b27aba807329b77329904f4d2da5777d906753bc
 DIST postgresql-9.0.8.tar.bz2 14998065 SHA256 a2981ba8a64b396e2111fee5a9216275e49a2e79e839152a5e4367afd44c0bc2 SHA512 49a4bfb7a197b2a58da717b4edd7900c6ee8bbeeed42549fe155b89a44c500c3aa1a9b90986234ae797058a378bfafafc5600cc679767e17897d001189dcdad5 WHIRLPOOL 22ea138bb2ee846a5ce4951c6f1fe1890ed3759302485c79fb60f19222ee4a7cd535f47edf86d93a29dc093990e3f335c3d1e8d75b7ef51ce4c1e3cddd144a7e
 DIST postgresql-9.0.9.tar.bz2 15008401 SHA256 87417d181a0f534fa96ba1d315a62b721f5bc22b7bb70af3f674bc1a68a5da8a SHA512 1d0c1f38f7872402b3011a624c7fb11cae79d165432c2134e37d078bfcbf836e5d55f2e9c92770d0a4c7db1680b2287ca55d981b8cffc0dc8b1a291c4ec4877b WHIRLPOOL 4d8c3e987ea1c07e4550d8b79eaee8cce2fec4cf39aab70bb69f364796c3ff472f5e0e953bddf3f1dc3878b4db458c2ca14073df8925e57b614974496476c921
 DIST postgresql-9.1.3.tar.bz2 15582454 SHA256 7a79800a624031c1d9bc9cdce73cb40050100ac50a82050cbf7bbbd16ac4d5d5 SHA512 411b9ed2d5cb4c38388710bc6186c8ccc3bddb9a607a933539bfc8b77df81d45c6f0b8ad9117960b0c5756bab51958f47c1e95943a488713841bd400da27a2e9 WHIRLPOOL b4d13c687cfd45cc8f3d575d46154e75d5a8a86c3c2d5d634fb0d6077724d2f73069a651bc7633c0cb5c100be8076647800757097d727938807d170668c5f7c3
 DIST postgresql-9.1.4.tar.bz2 15631894 SHA256 a0795a8eb3ae2d1a2914b63bf143d20182835d90699915ff43567c041d3c9712 SHA512 c49937ada0b011d08b8cfd9b7ac5d593dc5c3e36e97c19b2c6e08bb4f14332854b2c64eb1b77a78d6da9612f3cee2a857644b7bd6aedb7a4cd507c5bc64c4a62 WHIRLPOOL 4f03364a260f3ae27d763b3eca4326663d59fa2a09f238210d15de848869cf3599c1dbea6b031b82a64d912c162a1842173c0d5779eab78cbef288f58d7b2aa8
 DIST postgresql-9.1.5.tar.bz2 15602594 SHA256 0b889c132426fc68d8c2eb1bf112bf99cc653e9c95b5f4bbebc55cd9a8d6ce44 SHA512 63998808c8a5ad7a4712d6639a7d77d01bfdfee1ea41a40e7db1c4c469e3ecdf3af78a0451907aaf856f2e76e5166de15fb9009143fca8b4d36c964291402930 WHIRLPOOL 1d89227d7801e7d45465130e90c6f1ede8cca459e3879a9f641c5d90a6ffbd8a77cd6f8b489d7a8273246ef9d51c7c5218f611b9816351a7f4562bf7ac0112d2
+DIST postgresql-9.1.6.tar.bz2 15621370 SHA256 6e396aca621a95b9f5f7292a79ebe6ce892e36c7f7021814e1bd94bcfc6c31e7 SHA512 80fbb62734ac20a500ef9f0a307543011a376c3162304cd8996cba3ea4aba32681dfa556ba06450bdc400971efb65cc9ce2635844950e4f6f31badaa93fe25a4 WHIRLPOOL 1cc8953beb9cc0cf8461147a7c4fa1b5312293625375568240e25ebcefe95334c1e4192df412a7ae8f5d018ded57478763b0921e62602c17c7b3ef81db688e65
 DIST postgresql-9.2.0.tar.bz2 16106558 SHA256 3731c607df492bbb57f37917b49f57719c0d6f823720426431fff10d82b1fe33 SHA512 40e0538dca5bb795a8e5c8efd28c57e7db80ee1724ccdb3bc190e0f179b1c09e2363204303c443768b213c1d8e7cccab0d59e5d94038e63d8014cfe1a8940e1d WHIRLPOOL b4eb1f18deb35282ec2bd1768b401037a9da40139050d314aebecf7e8968b3011cd32c979385ae24d6cdc99208dc2238329ca21c784739767289db3f973b93c2
+DIST postgresql-9.2.1.tar.bz2 16113737 SHA256 db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461 SHA512 37e5c193006c548d0b1e200e9dca18ca918a0fe7d5dcea1615ce6240b7f13d9ea30913ef3b309abac3a4c15f65202aa1e72b1a3cc0b22321854fd6187dbac8d0 WHIRLPOOL 97872b8354ed0efd0aa7bd2afa5c127e9aecfce5d44d8a10e02d62050321bf4a948e7d3a4ab7f830afa4f8c2257adc96408c09bd09c8dade8d9c32ea5181f8c1
 DIST postgresql-patches-8.3-r2.tbz2 5501 SHA256 adae4c048745de04fd44f0408e8ab85aa5cae283cb3ddc2962e0379905cca73f SHA512 6f7f3f3e7bb22da3fad237b2f14e2723004b818d6555031054dc3d03fb51d922eefdee90d053673a8e0ceefe06868d9a6427046a4da80d44a439aa3114c54819 WHIRLPOOL dd25124acfbcc717f0e908787c690f35f905adc4fdee5349d09924371f66bad281a89be60d90be98a2824608c105c7767e5f2b75d95587bd346cc2869366e140
 DIST postgresql-patches-8.4-r2.tbz2 4822 SHA256 9920097ff5243df28788a6f3bdf6cdad38e6c42885f38da84b0f2c8c242954d7 SHA512 e074509ea8246ac74deae98507d29c30e0def6b88cb0c578294ef58f165681f4c2927d8e6392e34f57751ddb21e3c50852da3d3f5ca40f95a8ce89d65412e1f9 WHIRLPOOL 225336ce3e4323e9a9c16892def1065556d4c324e14a48553e3bb9a4ad6048d16731088adf4bc4b29ce3d692bd0e900afa1440ab2ae0a2710034422941a9e14b
 DIST postgresql-patches-9.0-r3.tbz2 4503 SHA256 2d454575423f0e56f23d540fbc865309d0bee3f80e5e05a7e1d793a7e70763cf SHA512 1a4e2c2d7ffe91cc7847ac42b2e83d708b38a93addb17d8a7234a159aa06bd125b2e915d3e78f7732d4e4ea94b897899ed832f4099b9260418fb1f1ecf265d38 WHIRLPOOL f20a030fe3244879ccddfcbf816bc7caf22231bf68c816eb5552968217c5adb7ff9ddaf5cea45ff576b6e7d2fbb9ac1276ffad3b319a4facf93a4ee409edf435
--- a/dev-db/postgresql-base/postgresql-base-8.3.21.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.3.21.ebuild
@ -0,0 +1,154 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.3.21.ebuild,v 1.1 2012/09/24 17:35:57 patrick Exp $
+
+EAPI="4"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils multilib prefix versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.3-r2.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg-intdatetime readline ssl threads zlib"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND=">=app-admin/eselect-postgresql-1.0.10
+		 virtual/libintl
+		 !!dev-db/libpq
+		 !!dev-db/postgresql
+		 !!dev-db/postgresql-client
+		 !!dev-db/postgresql-libs
+		 kerberos? ( virtual/krb5 )
+		 ldap? ( net-nds/openldap )
+		 pam? ( virtual/pam )
+		 readline? ( >=sys-libs/readline-4.1 )
+		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		 zlib? ( >=sys-libs/zlib-1.1.3 )"
+
+DEPEND="${RDEPEND}
+		!!<sys-apps/sandbox-2.0
+		>=sys-devel/bison-1.875
+		sys-devel/flex
+		nls? ( sys-devel/gettext )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/relax_ssl_perms.patch" "${WORKDIR}/SuperH.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h || \
+		die "RUNDIR sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	export LDFLAGS_SL="${LDFLAGS}"
+	local PO="${EPREFIX%/}"
+	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--without-docdir \
+		--without-perl \
+		--without-python \
+		--without-tcl \
+		$(use_with kerberos krb5) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		"$(use_enable nls nls "$(wanted_languages)")" \
+		$(use_with pam) \
+		$(use_enable pg-intdatetime integer-datetimes ) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_enable threads thread-safety) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	cd "${S}/contrib"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/include/postgresql-${SLOT}/postmaster
+	doins "${S}"/src/include/postmaster/*.h
+	dodir /usr/share/postgresql-${SLOT}/man/man1
+
+	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,ipcclean,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	einfo
+	einfo "If this is your first install of PostgreSQL, you 'll want to:"
+	einfo "    source /etc/profile"
+	einfo "In your open terminal sessions."
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
--- a/dev-db/postgresql-base/postgresql-base-8.4.14.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.4.14.ebuild
@ -0,0 +1,154 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-8.4.14.ebuild,v 1.1 2012/09/24 17:35:57 patrick Exp $
+
+EAPI="4"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils multilib prefix versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r2.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND=">=app-admin/eselect-postgresql-1.0.7
+		 virtual/libintl
+		 !!dev-db/libpq
+		 !!dev-db/postgresql
+		 !!dev-db/postgresql-client
+		 !!dev-db/postgresql-libs
+		 kerberos? ( virtual/krb5 )
+		 ldap? ( net-nds/openldap )
+		 pam? ( virtual/pam )
+		 readline? ( >=sys-libs/readline-4.1 )
+		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		 zlib? ( >=sys-libs/zlib-1.1.3 )"
+
+DEPEND="${RDEPEND}
+		!!<sys-apps/sandbox-2.0
+		>=sys-devel/bison-1.875
+		sys-devel/flex
+		nls? ( sys-devel/gettext )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch" "${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/SuperH.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h || \
+		die "RUNDIR sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	export LDFLAGS_SL="${LDFLAGS}"
+	local PO="${EPREFIX%/}"
+	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--without-tcl \
+		--without-perl \
+		--without-python \
+		$(use_with kerberos krb5) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		"$(use_enable nls nls "$(wanted_languages)")" \
+		$(use_with pam) \
+		$(use_enable !pg_legacytimestamp integer-datetimes ) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_enable threads thread-safety) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	cd "${S}/contrib"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/include/postgresql-${SLOT}/postmaster
+	doins "${S}"/src/include/postmaster/*.h
+
+	rm -r "${ED}/usr/share/doc/postgresql-${SLOT}/html"
+	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	einfo
+	einfo "If this is your first install of PostgreSQL, you 'll want to:"
+	einfo "    source /etc/profile"
+	einfo "In your open terminal sessions."
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
--- a/dev-db/postgresql-base/postgresql-base-9.0.10.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-9.0.10.ebuild
@ -0,0 +1,160 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.10.ebuild,v 1.1 2012/09/24 17:35:57 patrick Exp $
+
+EAPI="4"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils flag-o-matic multilib prefix versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2"
+LICENSE="POSTGRESQL"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND=">=app-admin/eselect-postgresql-1.0.7
+		 virtual/libintl
+		 !!dev-db/libpq
+		 !!dev-db/postgresql
+		 !!dev-db/postgresql-client
+		 !!dev-db/postgresql-libs
+		 kerberos? ( virtual/krb5 )
+		 ldap? ( net-nds/openldap )
+		 pam? ( virtual/pam )
+		 readline? ( sys-libs/readline )
+		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		 zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+		sys-devel/bison
+		sys-devel/flex
+		!!<sys-apps/sandbox-2.0
+		nls? ( sys-devel/gettext )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" "${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h || \
+		die "RUNDIR sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+		;;
+	esac
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+	local PO="${EPREFIX%/}"
+	econf --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--without-tcl \
+		--without-perl \
+		--without-python \
+		$(use_with kerberos krb5) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		"$(use_enable nls nls "$(wanted_languages)")" \
+		$(use_with pam) \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(use_enable threads thread-safety) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	cd "${S}/contrib"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/include/postgresql-${SLOT}/postmaster
+	doins "${S}"/src/include/postmaster/*.h
+
+	dodir /usr/share/postgresql-${SLOT}/man/
+	cp -r "${S}"/doc/src/sgml/man{1,7} "${ED}"/usr/share/postgresql-${SLOT}/man/ || die
+	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_controldata,pg_ctl,pg_resetxlog,postgres,postmaster}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	einfo
+	einfo "If this is your first install of PostgreSQL, you 'll want to:"
+	einfo "    source /etc/profile"
+	einfo "In your open terminal sessions."
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
--- a/dev-db/postgresql-base/postgresql-base-9.1.6.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-9.1.6.ebuild
@ -0,0 +1,164 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.1.6.ebuild,v 1.1 2012/09/24 17:35:57 patrick Exp $
+
+EAPI="4"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils flag-o-matic multilib prefix versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/postgresql-${PV}"
+
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r1.tbz2"
+LICENSE="POSTGRESQL"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="!!dev-db/libpq
+		 !!dev-db/postgresql
+		 !!dev-db/postgresql-client
+		 !!dev-db/postgresql-libs
+		 >=app-admin/eselect-postgresql-1.0.10
+		 virtual/libintl
+		 kerberos? ( virtual/krb5 )
+		 ldap? ( net-nds/openldap )
+		 pam? ( virtual/pam )
+		 readline? ( sys-libs/readline )
+		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		 zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}
+		!!<sys-apps/sandbox-2.0
+		sys-devel/bison
+		sys-devel/flex
+		nls? ( sys-devel/gettext )
+"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h || \
+		die "RUNDIR sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--without-tcl \
+		--without-perl \
+		--without-python \
+		$(use_with readline) \
+		$(use_with kerberos krb5) \
+		$(use_with kerberos gssapi) \
+		"$(use_enable nls nls "$(wanted_languages)")" \
+		$(use_with pam) \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_with ssl openssl) \
+		$(use_enable threads thread-safety) \
+		$(use_with zlib) \
+		$(use_with ldap)
+}
+
+src_compile() {
+	emake -j1
+
+	cd "${S}/contrib"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/include/postgresql-${SLOT}/postmaster
+	doins "${S}"/src/include/postmaster/*.h
+
+	dodir /usr/share/postgresql-${SLOT}/man/
+	cp -r "${S}"/doc/src/sgml/man{1,7} "${ED}"/usr/share/postgresql-${SLOT}/man/ || die
+	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	einfo
+	einfo "If this is your first install of PostgreSQL, you 'll want to:"
+	einfo "    source /etc/profile"
+	einfo "In your open terminal sessions."
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
--- a/dev-db/postgresql-base/postgresql-base-9.2.1.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-9.2.1.ebuild
@ -0,0 +1,170 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.2.1.ebuild,v 1.1 2012/09/24 17:35:57 patrick Exp $
+
+EAPI="4"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils flag-o-matic multilib prefix versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+# Comment the following five lines when not a beta or rc.
+#MY_PV="${PV//_}"
+#MY_FILE_PV="${SLOT}$(get_version_component_range 4)"
+#S="${WORKDIR}/postgresql-${MY_FILE_PV}"
+SRC_URI="mirror://postgresql/source/v${MY_FILE_PV}/postgresql-${MY_FILE_PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}beta3.tbz2"
+
+# Comment the following three lines when a beta or rc.
+S="${WORKDIR}/postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}beta3.tbz2"
+
+LICENSE="POSTGRESQL"
+DESCRIPTION="PostgreSQL libraries and clients"
+HOMEPAGE="http://www.postgresql.org/"
+
+# No tests to be done for clients and libraries
+RESTRICT="test"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="!!dev-db/libpq
+		 !!dev-db/postgresql
+		 !!dev-db/postgresql-client
+		 !!dev-db/postgresql-libs
+		 sys-apps/less
+		 >=app-admin/eselect-postgresql-1.0.10
+		 virtual/libintl
+		 kerberos? ( virtual/krb5 )
+		 ldap? ( net-nds/openldap )
+		 pam? ( virtual/pam )
+		 readline? ( sys-libs/readline )
+		 ssl? ( >=dev-libs/openssl-0.9.6-r1 )
+		 zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}
+		!!<sys-apps/sandbox-2.0
+		sys-devel/bison
+		sys-devel/flex
+		nls? ( sys-devel/gettext )
+"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/base.patch" \
+		"${WORKDIR}/bool.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	# to avoid collision - it only should be installed by server
+	rm "${S}/src/backend/nls.mk"
+
+	# because psql/help.c includes the file
+	ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h || \
+		die "RUNDIR sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX%/}"
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--without-tcl \
+		--without-perl \
+		--without-python \
+		$(use_with readline) \
+		$(use_with kerberos krb5) \
+		$(use_with kerberos gssapi) \
+		"$(use_enable nls nls "$(wanted_languages)")" \
+		$(use_with pam) \
+		$(use_enable !pg_legacytimestamp integer-datetimes) \
+		$(use_with ssl openssl) \
+		$(use_enable threads thread-safety) \
+		$(use_with zlib) \
+		$(use_with ldap)
+}
+
+src_compile() {
+	emake
+
+	cd "${S}/contrib"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/include/postgresql-${SLOT}/postmaster
+	doins "${S}"/src/include/postmaster/*.h
+
+	dodir /usr/share/postgresql-${SLOT}/man/
+	cp -r "${S}"/doc/src/sgml/man{1,7} "${ED}"/usr/share/postgresql-${SLOT}/man/ || die
+	rm "${ED}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,7}
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	cd "${S}/contrib"
+	emake DESTDIR="${D}" install
+	cd "${S}"
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+	keepdir /etc/postgresql-${SLOT}
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
--- a/dev-db/postgresql-docs/Manifest
+++ b/dev-db/postgresql-docs/Manifest
@ -1,13 +1,18 @@
 DIST postgresql-8.3.18.tar.bz2 14563583 SHA256 5db4904a8959f09274e1e0ee7f21c354128d5dbb4e946b78391f6bc4723c3746 SHA512 ac371d0ca7ec69782393345b5b3b9e3edf0fd6c3d3b8fbed86db6661dc11b54b6de991597a517181bba685d9cda5203b1c7dab586ef85df415b6f9cf49e290fd WHIRLPOOL d6ed681aecaf9261507f243e568ca8c38f35260b871ff9d5d9cb7d8b80251a5d08fe76233a7318f66d96a0c6447d354d0fceeae3aae2396cbc1790ed8c1a215d
 DIST postgresql-8.3.19.tar.bz2 14570746 SHA256 986f0d4b7edc633be1d210f27dfd1e47d416b642659e568895218466e50b58d5 SHA512 ffa07dd68c9de9a6c1fd9547181dbc252a300407e850e163e4d234aeab1e794f2c721ad4f676712e02ac5733ee566efe4b0fd4652b39b8ae885a3e478a66ef24 WHIRLPOOL 16ea02fa6ef4fb2088f5a677a5f4cb3f44049ef2f4564af3340b1a967cced561adc476ed09dd516bd8cb6b9bf9b3ed9fbc85b0346e835b5bd474052da35a9ae6
 DIST postgresql-8.3.20.tar.bz2 14624435 SHA256 922b6165dc21739356e22ba4d53e08f3b26cd38d8fb9569d5f8fa6d239611163 SHA512 e709632db165f543e510334adfa191ecff6fbe5ae6726578cbb5e4858de62fda53e67b19171c302492361c580bf6894af84dc97ee81e1146a04aec2984d4f91f WHIRLPOOL beee4643d4c2212d9d49390bf1f3ff279f54f2d3c90743610ee59d7e8b93a1e61136654a1f5abe5d49a7826afdea8166ae047f7f2eb2f461c543bf3111f294d5
+DIST postgresql-8.3.21.tar.bz2 14626010 SHA256 a64b6de9f8067b803f2ed46a025bfd2a16a5ae270db60e440a698f2c07e234f8 SHA512 6da6fab655412fb2cc59ba6228596d6d3caff1a0c6bbd574b61c807bc18941b8d3db6824ffb7da1ad78d89c61d4407402bdb0904bf7b60c49959f40cb2bf3191 WHIRLPOOL 1bb3afefa2610537a35d148ccf2b65d6fe2915774aa61e92afeaadb3c6e923bf1771be7a5828c8ac67d2a0dac94f8bad3330cb38fa2f3b6993ebe493998f11a0
 DIST postgresql-8.4.11.tar.bz2 14502434 SHA256 5bbc9ff1d16282b592600d7c6b9cb1a93049d4aa9a961e3c2c8d5fb13b189c8f SHA512 3f2c6015781a7bc218a5b0fa9135163d5adf21ff41ab952d0f0ad0586762f0f95bf0d7c6738d122cdc1d8506924814d8b4c6659ff9c79daa926f4ee9a95e7a41 WHIRLPOOL 712e600fe175972cd8b1ad4ce0124de7e2e108e8952b3c5d003cf3044be6a732fb02186d689d618452df68e0bfdf38aff76c266d9f85c7f3a45de995e4658da6
 DIST postgresql-8.4.12.tar.bz2 14509007 SHA256 99b7b330ec183828988c7e8ec1b675393f24b10017a2e1d03b8ff48c4dfc0f77 SHA512 5e21ff30208296fc98033d6d4c0bb9491bed000bd8a00853c36be74feaf1ed7698561dccbf98596a920edf1f77801e8c15e79dbaec1d882c289c70905399c23e WHIRLPOOL c0f86598396f9d439d4e1d63790af2a92ffb3afa259f6e3369f5a92d8a93d42e50ca70713c467da6c7fde78a01041aaf24b5fd0a441060a06800a87c9a85694b
 DIST postgresql-8.4.13.tar.bz2 14666613 SHA256 20dd3442a3fa3a4fb1813b58f969ce4bbc54d73194fd4fe20d6f1313edc48cb9 SHA512 c6294846bf9adf39d5d57d2df26023ed4aa83464a773789eaaf5823a6dd6005eeb756f3835caaffde72729edd5b1f0ab300309417a4f9b570d6110b62096f1e4 WHIRLPOOL 1a9cbbdf1d651e49d85b7edee5da70fcadcef20a10fbc4340bd43679144662c68bede5c68b38933aaed8cc1a9a4db8c0b48e2a183140f901e07f09055e958e96
+DIST postgresql-8.4.14.tar.bz2 14679559 SHA256 1172e7735beea8a933eab0a4c01f9ad49fe872d8786af12a7fe596346b1d133a SHA512 bf9ddb393de08bbff92708b83697b907fbf34229a2ce66e1bf97c1deb9630c37c9a363f9305889e1f6ce4671d116a2c267302b7681281bb0482575ac81d6f28e WHIRLPOOL 8fe681ce8d263116fb2d3554adb2f45c1b21f7d6b840396fee532f7f200809dacc5127df7102b97be88193cd39148b40c81d781ec73ffc508e4908b0af2426bf
+DIST postgresql-9.0.10.tar.bz2 15015826 SHA256 4394184b0099e8c86a482f7d62930aa31b50fb23e7dfb8fe9e1d93eb828dc729 SHA512 93a6d63d89800f9fc2eeef694c55afcdb8b8a255a2952a69b1816a31b831d0f86ed8b8fc88ad68cbc27f322eb1aba24e2cc9d891a5487217753b3f196fa5b754 WHIRLPOOL e5161e09c636f6a48d72de4befb967575a94b429129e72e4eb6013dc074bfe4f8ad43e4a15c40ec7e00b64d790cdd8da0eeb8a0555db44ce59fb336b0153799e
 DIST postgresql-9.0.7.tar.bz2 14977437 SHA256 dabe26d71d8b595f9514da1363dc20c3f4b90b6908026dd06984cac448a6d833 SHA512 25fe1b20c0f172e3d2ff4dcbbbcd5a49be5a25e15ae74324cf9c0a3e6be0e760a81e65fbf9cae39aa2588794fb55953c59c750182a151473e959a375aba75322 WHIRLPOOL ff506c7495aba5087b6df867d3e25a1c0c58908845a59e0ae4ab1ebba5dee26d1c977fd0cfd530c8ffe6b3a3b27aba807329b77329904f4d2da5777d906753bc
 DIST postgresql-9.0.8.tar.bz2 14998065 SHA256 a2981ba8a64b396e2111fee5a9216275e49a2e79e839152a5e4367afd44c0bc2 SHA512 49a4bfb7a197b2a58da717b4edd7900c6ee8bbeeed42549fe155b89a44c500c3aa1a9b90986234ae797058a378bfafafc5600cc679767e17897d001189dcdad5 WHIRLPOOL 22ea138bb2ee846a5ce4951c6f1fe1890ed3759302485c79fb60f19222ee4a7cd535f47edf86d93a29dc093990e3f335c3d1e8d75b7ef51ce4c1e3cddd144a7e
 DIST postgresql-9.0.9.tar.bz2 15008401 SHA256 87417d181a0f534fa96ba1d315a62b721f5bc22b7bb70af3f674bc1a68a5da8a SHA512 1d0c1f38f7872402b3011a624c7fb11cae79d165432c2134e37d078bfcbf836e5d55f2e9c92770d0a4c7db1680b2287ca55d981b8cffc0dc8b1a291c4ec4877b WHIRLPOOL 4d8c3e987ea1c07e4550d8b79eaee8cce2fec4cf39aab70bb69f364796c3ff472f5e0e953bddf3f1dc3878b4db458c2ca14073df8925e57b614974496476c921
 DIST postgresql-9.1.3.tar.bz2 15582454 SHA256 7a79800a624031c1d9bc9cdce73cb40050100ac50a82050cbf7bbbd16ac4d5d5 SHA512 411b9ed2d5cb4c38388710bc6186c8ccc3bddb9a607a933539bfc8b77df81d45c6f0b8ad9117960b0c5756bab51958f47c1e95943a488713841bd400da27a2e9 WHIRLPOOL b4d13c687cfd45cc8f3d575d46154e75d5a8a86c3c2d5d634fb0d6077724d2f73069a651bc7633c0cb5c100be8076647800757097d727938807d170668c5f7c3
 DIST postgresql-9.1.4.tar.bz2 15631894 SHA256 a0795a8eb3ae2d1a2914b63bf143d20182835d90699915ff43567c041d3c9712 SHA512 c49937ada0b011d08b8cfd9b7ac5d593dc5c3e36e97c19b2c6e08bb4f14332854b2c64eb1b77a78d6da9612f3cee2a857644b7bd6aedb7a4cd507c5bc64c4a62 WHIRLPOOL 4f03364a260f3ae27d763b3eca4326663d59fa2a09f238210d15de848869cf3599c1dbea6b031b82a64d912c162a1842173c0d5779eab78cbef288f58d7b2aa8
 DIST postgresql-9.1.5.tar.bz2 15602594 SHA256 0b889c132426fc68d8c2eb1bf112bf99cc653e9c95b5f4bbebc55cd9a8d6ce44 SHA512 63998808c8a5ad7a4712d6639a7d77d01bfdfee1ea41a40e7db1c4c469e3ecdf3af78a0451907aaf856f2e76e5166de15fb9009143fca8b4d36c964291402930 WHIRLPOOL 1d89227d7801e7d45465130e90c6f1ede8cca459e3879a9f641c5d90a6ffbd8a77cd6f8b489d7a8273246ef9d51c7c5218f611b9816351a7f4562bf7ac0112d2
+DIST postgresql-9.1.6.tar.bz2 15621370 SHA256 6e396aca621a95b9f5f7292a79ebe6ce892e36c7f7021814e1bd94bcfc6c31e7 SHA512 80fbb62734ac20a500ef9f0a307543011a376c3162304cd8996cba3ea4aba32681dfa556ba06450bdc400971efb65cc9ce2635844950e4f6f31badaa93fe25a4 WHIRLPOOL 1cc8953beb9cc0cf8461147a7c4fa1b5312293625375568240e25ebcefe95334c1e4192df412a7ae8f5d018ded57478763b0921e62602c17c7b3ef81db688e65
 DIST postgresql-9.2.0.tar.bz2 16106558 SHA256 3731c607df492bbb57f37917b49f57719c0d6f823720426431fff10d82b1fe33 SHA512 40e0538dca5bb795a8e5c8efd28c57e7db80ee1724ccdb3bc190e0f179b1c09e2363204303c443768b213c1d8e7cccab0d59e5d94038e63d8014cfe1a8940e1d WHIRLPOOL b4eb1f18deb35282ec2bd1768b401037a9da40139050d314aebecf7e8968b3011cd32c979385ae24d6cdc99208dc2238329ca21c784739767289db3f973b93c2
+DIST postgresql-9.2.1.tar.bz2 16113737 SHA256 db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461 SHA512 37e5c193006c548d0b1e200e9dca18ca918a0fe7d5dcea1615ce6240b7f13d9ea30913ef3b309abac3a4c15f65202aa1e72b1a3cc0b22321854fd6187dbac8d0 WHIRLPOOL 97872b8354ed0efd0aa7bd2afa5c127e9aecfce5d44d8a10e02d62050321bf4a948e7d3a4ab7f830afa4f8c2257adc96408c09bd09c8dade8d9c32ea5181f8c1
--- a/dev-db/postgresql-docs/postgresql-docs-8.3.21.ebuild
+++ b/dev-db/postgresql-docs/postgresql-docs-8.3.21.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-8.3.21.ebuild,v 1.1 2012/09/24 17:39:02 patrick Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# Nothing to test here per 232157
+RESTRICT="test"
+
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+
+S=${WORKDIR}/postgresql-${PV}
+SLOT="$(get_version_component_range 1-2)"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	cd "${S}/doc"
+
+	dodir /usr/share/doc/${PF}/html
+	tar -zxf "postgres.tar.gz" -C "${ED}/usr/share/doc/${PF}/html"
+	fowners root:0 -R /usr/share/doc/${PF}/html
+
+	docinto FAQ_html
+	dodoc src/FAQ/*
+
+	docinto sgml
+	dodoc src/sgml/*.{sgml,dsl}
+	docinto sgml/ref
+	dodoc src/sgml/ref/*.sgml
+
+	docinto TODO.detail
+	dodoc TODO.detail/*
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
--- a/dev-db/postgresql-docs/postgresql-docs-8.4.14.ebuild
+++ b/dev-db/postgresql-docs/postgresql-docs-8.4.14.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-8.4.14.ebuild,v 1.1 2012/09/24 17:39:02 patrick Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# Nothing to test here per 232157
+RESTRICT="test"
+
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+
+S=${WORKDIR}/postgresql-${PV}
+SLOT="$(get_version_component_range 1-2)"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	cd "${S}/doc"
+
+	dodir /usr/share/doc/${PF}/html
+	tar -zxf "postgres.tar.gz" -C "${ED}/usr/share/doc/${PF}/html"
+	fowners root:0 -R /usr/share/doc/${PF}/html
+
+	docinto sgml
+	dodoc src/sgml/*.{sgml,dsl}
+	docinto sgml/ref
+	dodoc src/sgml/ref/*.sgml
+
+	docinto
+	dodoc TODO
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
--- a/dev-db/postgresql-docs/postgresql-docs-9.0.10.ebuild
+++ b/dev-db/postgresql-docs/postgresql-docs-9.0.10.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.0.10.ebuild,v 1.1 2012/09/24 17:39:02 patrick Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+RESTRICT="test"
+
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+
+S=${WORKDIR}/postgresql-${PV}
+SLOT="$(get_version_component_range 1-2)"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	dodir /usr/share/doc/${PF}/html
+
+	cd "${S}/doc"
+
+	docinto sgml
+	dodoc src/sgml/*.{sgml,dsl}
+	docinto sgml/ref
+	dodoc src/sgml/ref/*.sgml
+
+	docinto html
+	dodoc src/sgml/html/*.html
+	dodoc src/sgml/html/stylesheet.css
+
+	docinto
+	dodoc TODO
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
--- a/dev-db/postgresql-docs/postgresql-docs-9.1.6.ebuild
+++ b/dev-db/postgresql-docs/postgresql-docs-9.1.6.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.1.6.ebuild,v 1.1 2012/09/24 17:39:02 patrick Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/postgresql-${PV}"
+
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+LICENSE="POSTGRESQL"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	dodir /usr/share/doc/${PF}/html
+
+	cd "${S}/doc"
+
+	docinto sgml
+	dodoc src/sgml/*.{sgml,dsl}
+
+	docinto sgml/ref
+	dodoc src/sgml/ref/*.sgml
+
+	docinto html
+	dodoc src/sgml/html/*.html
+	dodoc src/sgml/html/stylesheet.css
+
+	docinto
+	dodoc TODO
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
--- a/dev-db/postgresql-docs/postgresql-docs-9.2.1.ebuild
+++ b/dev-db/postgresql-docs/postgresql-docs-9.2.1.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-docs/postgresql-docs-9.2.1.ebuild,v 1.1 2012/09/24 17:39:02 patrick Exp $
+
+EAPI="4"
+
+inherit versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+# Comment the following four lines when not a beta or rc.
+#MY_PV="${PV//_}"
+#MY_FILE_PV="${SLOT}$(get_version_component_range 4)"
+#S="${WORKDIR}/postgresql-${MY_FILE_PV}"
+#SRC_URI="mirror://postgresql/source/v${MY_FILE_PV}/postgresql-${MY_FILE_PV}.tar.bz2"
+
+# Comment the following two lines when a beta or rc.
+S="${WORKDIR}/postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL"
+DESCRIPTION="PostgreSQL documentation"
+HOMEPAGE="http://www.postgresql.org/"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	tar xjf "${DISTDIR}/${A}" -C "${WORKDIR}" "${A%.tar.bz2}/doc"
+}
+
+src_install() {
+	dodir /usr/share/doc/${PF}/html
+
+	cd "${S}/doc"
+
+	docinto sgml
+	dodoc src/sgml/*.{sgml,dsl}
+
+	docinto sgml/ref
+	dodoc src/sgml/ref/*.sgml
+
+	docinto html
+	dodoc src/sgml/html/*.html
+	dodoc src/sgml/html/stylesheet.css
+
+	docinto
+	dodoc TODO
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/docs"
+}
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@ -1,16 +1,21 @@
 DIST postgresql-8.3.18.tar.bz2 14563583 SHA256 5db4904a8959f09274e1e0ee7f21c354128d5dbb4e946b78391f6bc4723c3746 SHA512 ac371d0ca7ec69782393345b5b3b9e3edf0fd6c3d3b8fbed86db6661dc11b54b6de991597a517181bba685d9cda5203b1c7dab586ef85df415b6f9cf49e290fd WHIRLPOOL d6ed681aecaf9261507f243e568ca8c38f35260b871ff9d5d9cb7d8b80251a5d08fe76233a7318f66d96a0c6447d354d0fceeae3aae2396cbc1790ed8c1a215d
 DIST postgresql-8.3.19.tar.bz2 14570746 SHA256 986f0d4b7edc633be1d210f27dfd1e47d416b642659e568895218466e50b58d5 SHA512 ffa07dd68c9de9a6c1fd9547181dbc252a300407e850e163e4d234aeab1e794f2c721ad4f676712e02ac5733ee566efe4b0fd4652b39b8ae885a3e478a66ef24 WHIRLPOOL 16ea02fa6ef4fb2088f5a677a5f4cb3f44049ef2f4564af3340b1a967cced561adc476ed09dd516bd8cb6b9bf9b3ed9fbc85b0346e835b5bd474052da35a9ae6
 DIST postgresql-8.3.20.tar.bz2 14624435 SHA256 922b6165dc21739356e22ba4d53e08f3b26cd38d8fb9569d5f8fa6d239611163 SHA512 e709632db165f543e510334adfa191ecff6fbe5ae6726578cbb5e4858de62fda53e67b19171c302492361c580bf6894af84dc97ee81e1146a04aec2984d4f91f WHIRLPOOL beee4643d4c2212d9d49390bf1f3ff279f54f2d3c90743610ee59d7e8b93a1e61136654a1f5abe5d49a7826afdea8166ae047f7f2eb2f461c543bf3111f294d5
+DIST postgresql-8.3.21.tar.bz2 14626010 SHA256 a64b6de9f8067b803f2ed46a025bfd2a16a5ae270db60e440a698f2c07e234f8 SHA512 6da6fab655412fb2cc59ba6228596d6d3caff1a0c6bbd574b61c807bc18941b8d3db6824ffb7da1ad78d89c61d4407402bdb0904bf7b60c49959f40cb2bf3191 WHIRLPOOL 1bb3afefa2610537a35d148ccf2b65d6fe2915774aa61e92afeaadb3c6e923bf1771be7a5828c8ac67d2a0dac94f8bad3330cb38fa2f3b6993ebe493998f11a0
 DIST postgresql-8.4.11.tar.bz2 14502434 SHA256 5bbc9ff1d16282b592600d7c6b9cb1a93049d4aa9a961e3c2c8d5fb13b189c8f SHA512 3f2c6015781a7bc218a5b0fa9135163d5adf21ff41ab952d0f0ad0586762f0f95bf0d7c6738d122cdc1d8506924814d8b4c6659ff9c79daa926f4ee9a95e7a41 WHIRLPOOL 712e600fe175972cd8b1ad4ce0124de7e2e108e8952b3c5d003cf3044be6a732fb02186d689d618452df68e0bfdf38aff76c266d9f85c7f3a45de995e4658da6
 DIST postgresql-8.4.12.tar.bz2 14509007 SHA256 99b7b330ec183828988c7e8ec1b675393f24b10017a2e1d03b8ff48c4dfc0f77 SHA512 5e21ff30208296fc98033d6d4c0bb9491bed000bd8a00853c36be74feaf1ed7698561dccbf98596a920edf1f77801e8c15e79dbaec1d882c289c70905399c23e WHIRLPOOL c0f86598396f9d439d4e1d63790af2a92ffb3afa259f6e3369f5a92d8a93d42e50ca70713c467da6c7fde78a01041aaf24b5fd0a441060a06800a87c9a85694b
 DIST postgresql-8.4.13.tar.bz2 14666613 SHA256 20dd3442a3fa3a4fb1813b58f969ce4bbc54d73194fd4fe20d6f1313edc48cb9 SHA512 c6294846bf9adf39d5d57d2df26023ed4aa83464a773789eaaf5823a6dd6005eeb756f3835caaffde72729edd5b1f0ab300309417a4f9b570d6110b62096f1e4 WHIRLPOOL 1a9cbbdf1d651e49d85b7edee5da70fcadcef20a10fbc4340bd43679144662c68bede5c68b38933aaed8cc1a9a4db8c0b48e2a183140f901e07f09055e958e96
+DIST postgresql-8.4.14.tar.bz2 14679559 SHA256 1172e7735beea8a933eab0a4c01f9ad49fe872d8786af12a7fe596346b1d133a SHA512 bf9ddb393de08bbff92708b83697b907fbf34229a2ce66e1bf97c1deb9630c37c9a363f9305889e1f6ce4671d116a2c267302b7681281bb0482575ac81d6f28e WHIRLPOOL 8fe681ce8d263116fb2d3554adb2f45c1b21f7d6b840396fee532f7f200809dacc5127df7102b97be88193cd39148b40c81d781ec73ffc508e4908b0af2426bf
+DIST postgresql-9.0.10.tar.bz2 15015826 SHA256 4394184b0099e8c86a482f7d62930aa31b50fb23e7dfb8fe9e1d93eb828dc729 SHA512 93a6d63d89800f9fc2eeef694c55afcdb8b8a255a2952a69b1816a31b831d0f86ed8b8fc88ad68cbc27f322eb1aba24e2cc9d891a5487217753b3f196fa5b754 WHIRLPOOL e5161e09c636f6a48d72de4befb967575a94b429129e72e4eb6013dc074bfe4f8ad43e4a15c40ec7e00b64d790cdd8da0eeb8a0555db44ce59fb336b0153799e
 DIST postgresql-9.0.7.tar.bz2 14977437 SHA256 dabe26d71d8b595f9514da1363dc20c3f4b90b6908026dd06984cac448a6d833 SHA512 25fe1b20c0f172e3d2ff4dcbbbcd5a49be5a25e15ae74324cf9c0a3e6be0e760a81e65fbf9cae39aa2588794fb55953c59c750182a151473e959a375aba75322 WHIRLPOOL ff506c7495aba5087b6df867d3e25a1c0c58908845a59e0ae4ab1ebba5dee26d1c977fd0cfd530c8ffe6b3a3b27aba807329b77329904f4d2da5777d906753bc
 DIST postgresql-9.0.8.tar.bz2 14998065 SHA256 a2981ba8a64b396e2111fee5a9216275e49a2e79e839152a5e4367afd44c0bc2 SHA512 49a4bfb7a197b2a58da717b4edd7900c6ee8bbeeed42549fe155b89a44c500c3aa1a9b90986234ae797058a378bfafafc5600cc679767e17897d001189dcdad5 WHIRLPOOL 22ea138bb2ee846a5ce4951c6f1fe1890ed3759302485c79fb60f19222ee4a7cd535f47edf86d93a29dc093990e3f335c3d1e8d75b7ef51ce4c1e3cddd144a7e
 DIST postgresql-9.0.9.tar.bz2 15008401 SHA256 87417d181a0f534fa96ba1d315a62b721f5bc22b7bb70af3f674bc1a68a5da8a SHA512 1d0c1f38f7872402b3011a624c7fb11cae79d165432c2134e37d078bfcbf836e5d55f2e9c92770d0a4c7db1680b2287ca55d981b8cffc0dc8b1a291c4ec4877b WHIRLPOOL 4d8c3e987ea1c07e4550d8b79eaee8cce2fec4cf39aab70bb69f364796c3ff472f5e0e953bddf3f1dc3878b4db458c2ca14073df8925e57b614974496476c921
 DIST postgresql-9.1.3.tar.bz2 15582454 SHA256 7a79800a624031c1d9bc9cdce73cb40050100ac50a82050cbf7bbbd16ac4d5d5 SHA512 411b9ed2d5cb4c38388710bc6186c8ccc3bddb9a607a933539bfc8b77df81d45c6f0b8ad9117960b0c5756bab51958f47c1e95943a488713841bd400da27a2e9 WHIRLPOOL b4d13c687cfd45cc8f3d575d46154e75d5a8a86c3c2d5d634fb0d6077724d2f73069a651bc7633c0cb5c100be8076647800757097d727938807d170668c5f7c3
 DIST postgresql-9.1.4.tar.bz2 15631894 SHA256 a0795a8eb3ae2d1a2914b63bf143d20182835d90699915ff43567c041d3c9712 SHA512 c49937ada0b011d08b8cfd9b7ac5d593dc5c3e36e97c19b2c6e08bb4f14332854b2c64eb1b77a78d6da9612f3cee2a857644b7bd6aedb7a4cd507c5bc64c4a62 WHIRLPOOL 4f03364a260f3ae27d763b3eca4326663d59fa2a09f238210d15de848869cf3599c1dbea6b031b82a64d912c162a1842173c0d5779eab78cbef288f58d7b2aa8
 DIST postgresql-9.1.5.tar.bz2 15602594 SHA256 0b889c132426fc68d8c2eb1bf112bf99cc653e9c95b5f4bbebc55cd9a8d6ce44 SHA512 63998808c8a5ad7a4712d6639a7d77d01bfdfee1ea41a40e7db1c4c469e3ecdf3af78a0451907aaf856f2e76e5166de15fb9009143fca8b4d36c964291402930 WHIRLPOOL 1d89227d7801e7d45465130e90c6f1ede8cca459e3879a9f641c5d90a6ffbd8a77cd6f8b489d7a8273246ef9d51c7c5218f611b9816351a7f4562bf7ac0112d2
+DIST postgresql-9.1.6.tar.bz2 15621370 SHA256 6e396aca621a95b9f5f7292a79ebe6ce892e36c7f7021814e1bd94bcfc6c31e7 SHA512 80fbb62734ac20a500ef9f0a307543011a376c3162304cd8996cba3ea4aba32681dfa556ba06450bdc400971efb65cc9ce2635844950e4f6f31badaa93fe25a4 WHIRLPOOL 1cc8953beb9cc0cf8461147a7c4fa1b5312293625375568240e25ebcefe95334c1e4192df412a7ae8f5d018ded57478763b0921e62602c17c7b3ef81db688e65
 DIST postgresql-9.2.0.tar.bz2 16106558 SHA256 3731c607df492bbb57f37917b49f57719c0d6f823720426431fff10d82b1fe33 SHA512 40e0538dca5bb795a8e5c8efd28c57e7db80ee1724ccdb3bc190e0f179b1c09e2363204303c443768b213c1d8e7cccab0d59e5d94038e63d8014cfe1a8940e1d WHIRLPOOL b4eb1f18deb35282ec2bd1768b401037a9da40139050d314aebecf7e8968b3011cd32c979385ae24d6cdc99208dc2238329ca21c784739767289db3f973b93c2
+DIST postgresql-9.2.1.tar.bz2 16113737 SHA256 db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461 SHA512 37e5c193006c548d0b1e200e9dca18ca918a0fe7d5dcea1615ce6240b7f13d9ea30913ef3b309abac3a4c15f65202aa1e72b1a3cc0b22321854fd6187dbac8d0 WHIRLPOOL 97872b8354ed0efd0aa7bd2afa5c127e9aecfce5d44d8a10e02d62050321bf4a948e7d3a4ab7f830afa4f8c2257adc96408c09bd09c8dade8d9c32ea5181f8c1
 DIST postgresql-initscript-2.1.1.tbz2 2604 SHA256 e7e9f18a48272a6210ef3b433bb910e3ffeffe92f798aaf1ea503ce1fc1f5dfb SHA512 002d2121ffd15a327e573a53d2abd460321718dcca1e58bfce87100ee44bd19ed376b84b14f93696ac7998ee7699e04a4797a6a4db0520ee6bfa9ff53ab41975 WHIRLPOOL 891bd0602cf1470179a5683e4a3fea657dec7e924c7919f8f1964b395b0b08cf13d4462e37dcce05ad5f547d3ec18ff83e50f9f29ca87ca7fb8eaca65e5ddf9f
 DIST postgresql-initscript-2.1.tbz2 2603 SHA256 42ee83d0bfd1e1733bbc191b065bc70b2b5966f743f692e5133f6c676c8b1c24 SHA512 4ec220f414c73c5d8a65ef95df7111a9703f1f82abbc0a3b6f70938440cf72069e3497fc7e8606502329aea8737bb60aa15d578d47cda68669289acbc7b3e7a9 WHIRLPOOL a5f27742da7bc7404dd4f1a8936b0a9291c199412c0c1048d5f217a41b12b247057a99f41bfd1b3041821be2d159d6976eaa01148860664cfaf722903c9f4d2f
 DIST postgresql-initscript-2.3.tbz2 2611 SHA256 72a2805048c3027996c41b9d3342ccf56406393bab7086af745d87b5b5edd4a7 SHA512 0803a833507c91e5c76a5804a787c159b3a00f7f9761a9e5c3bc7c721b14f5c6e9587027c102c430feb6e72a0bb011a0bf4903a136b7e648488a45adf2a99275 WHIRLPOOL e56b1e6e2f4cc27641411f26896508df6566f19f197f811f426995d86ae6ac97737b4f60cf5d6f763c8306a3043d31c59d3da89291fdbf837a4c9bf38b4ba5d2
--- a/dev-db/postgresql-server/postgresql-server-8.3.21.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.3.21.ebuild
@ -0,0 +1,339 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.3.21.ebuild,v 1.1 2012/09/24 17:37:46 patrick Exp $
+
+EAPI="4"
+
+WANT_AUTOMAKE="none"
+inherit autotools eutils multilib pam prefix user versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL server"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.3-r2.tbz2
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
+LICENSE="POSTGRESQL GPL-2"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kernel_linux nls pam perl python selinux tcl uuid xml"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,nls=]
+		 perl? ( >=dev-lang/perl-5.8 )
+		 selinux? ( sec-policy/selinux-postgresql )
+		 tcl? ( >=dev-lang/tcl-8 )
+		 uuid? ( dev-libs/ossp-uuid )
+		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
+
+DEPEND="${RDEPEND}
+		sys-devel/flex
+		xml? ( virtual/pkgconfig )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/pg_ctl-exit-status.patch" \
+		"${WORKDIR}/server.patch" \
+		"${WORKDIR}/SuperH.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
+			-i src/test/regress/{input,output}/tablespace.source
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
+		die "RUNDIR sed failed"
+	sed -e "s|@SLOT@|${SLOT}|g" \
+		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
+		die "SLOT sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
+		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2); do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd -j1 \
+				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
+				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
+				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
+	done
+}
+
+src_install() {
+	if use perl ; then
+		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			"${S}/src/pl/plperl/GNUmakefile_orig" \
+			> "${S}/src/pl/plperl/GNUmakefile"
+	fi
+
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd -j1 DESTDIR="${D}" \
+				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
+				PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
+				NO_PGXS=0 USE_PGXS=1 docdir=${EROOT%/}/usr/share/doc/${PF}
+	done
+
+	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" \
+		"${ED}/usr/share/doc/${PF}/html"
+	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
+	docompress /usr/share/postgresql-${SLOT}/man/man1
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
+	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
+
+	use pam && pamd_mimic system-auth postgresql auth account session
+
+	if use prefix ; then
+		keepdir ${RUNDIR}/run/postgresql
+		fperms 0770 ${RUNDIR}/run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
+	elog
+	elog "If you have users and/or services that you would like to utilize the"
+	elog "socket, you must add them to the 'postgres' system group:"
+	elog "    usermod -a -G postgres <user>"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source ${EROOT%/}/etc/env.d/02locale
+		[[ -n ${LANG} ]] && export LANG
+		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
+		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
+		[[ -n ${LC_TIME} ]] && export LC_TIME
+		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
+		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
+		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
+		[[ -n ${LC_ALL} ]] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z ${PG_INITDB_OPTS} ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [[ $correct != "true" ]] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized."
+		fi
+	done
+
+	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "Tests not supported on this OS (yet)."
+	else
+		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
+			ebegin "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections"
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "  - Change the mentioned system parameter"
+					eerror "  - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			eend
+		else
+			ewarn "SKIP_SYSTEM_TESTS is set, so skipping."
+		fi
+	fi
+
+	if [[ ${EUID} == 0 ]] ; then
+		einfo "Creating the data directory ..."
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1. You can enable it in the clusters"
+	einfo "postgresql.conf."
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [[ ${UID} != 0 ]] ; then
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/:${PATH}" \
+			emake check \
+			PGXS=$(${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
+			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT}
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}
--- a/dev-db/postgresql-server/postgresql-server-8.4.14.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.4.14.ebuild
@ -0,0 +1,348 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-8.4.14.ebuild,v 1.1 2012/09/24 17:37:46 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+
+WANT_AUTOMAKE="none"
+inherit autotools eutils multilib pam prefix python user versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="PostgreSQL server"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-8.4-r2.tbz2
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
+LICENSE="POSTGRESQL GPL-2"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
+
+for lingua in ${LINGUAS} ; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
+		 perl? ( >=dev-lang/perl-5.8 )
+		 selinux? ( sec-policy/selinux-postgresql )
+		 tcl? ( >=dev-lang/tcl-8 )
+		 uuid? ( dev-libs/ossp-uuid )
+		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
+
+DEPEND="${RDEPEND}
+		sys-devel/flex
+		xml? ( virtual/pkgconfig )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/darwin.patch" \
+		"${WORKDIR}/ldflags.patch" \
+		"${WORKDIR}/pg_ctl-exit-status.patch" \
+		"${WORKDIR}/server.patch" \
+		"${WORKDIR}/SuperH.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
+			-i src/test/regress/{input,output}/tablespace.source
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
+		die "RUNDIR sed failed"
+	sed -e "s|@SLOT@|${SLOT}|g" \
+		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
+		die "SLOT sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
+		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
+		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		"$(has_version ~dev-db/postgresql-base-${PV}[nls] && use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd -j1 || die "emake in $bd failed"
+	done
+}
+
+src_install() {
+	if use perl ; then
+		mv -f "${S}/src/pl/plperl/GNUmakefile" \
+			"${S}/src/pl/plperl/GNUmakefile_orig"
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			"${S}/src/pl/plperl/GNUmakefile_orig" \
+			> "${S}/src/pl/plperl/GNUmakefile"
+	fi
+
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd -j1 DESTDIR="${D}" \
+			|| die "emake install in $bd failed"
+	done
+
+	rm -r "${ED}/usr/share/postgresql-${SLOT}/man/man7/" \
+		"${ED}/usr/share/doc/postgresql-${SLOT}/html"
+	rm "${ED}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}"/postgresql.confd postgresql-${SLOT} \
+		|| die "Inserting conf.d file failed"
+
+	newinitd "${WORKDIR}"/postgresql.init postgresql-${SLOT} \
+		|| die "Inserting init.d file failed"
+
+	use pam && pamd_mimic system-auth postgresql auth account session
+
+	if use prefix ; then
+		keepdir ${RUNDIR}/run/postgresql
+		fperms 0770 ${RUNDIR}/run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "The time stamp format is 64 bit integers now. If you upgrade from older"
+	elog "databases, this may force you to either do a dump and reload of enable"
+	elog "pg_legacytimestamp until you find time to do so. If the database can't start"
+	elog "please try enabling pg_legacytimestamp and rebuild."
+	elog
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
+	elog
+	elog "If you have users and/or services that you would like to utilize the"
+	elog "socket, you must add them to the 'postgres' system group:"
+	elog "    usermod -a -G postgres <user>"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[[ -n ${LANG} ]] && export LANG
+		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
+		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
+		[[ -n ${LC_TIME} ]] && export LC_TIME
+		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
+		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
+		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
+		[[ -n ${LC_ALL} ]] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z ${PG_INITDB_OPTS} ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [[ $correct != "true" ]] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "  Tests not supported on this OS (yet)"
+	else
+		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
+			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "  - Change the mentioned system parameter"
+					eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "    value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			einfo "Passed."
+		else
+			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
+		fi
+	fi
+
+	if [[ ${EUID} == 0 ]] ; then
+		einfo "Creating the data directory ..."
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by"
+	einfo "default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [[ ${UID} != 0 ]] ; then
+		emake check || die "Make check failed. See above for details."
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}
--- a/dev-db/postgresql-server/postgresql-server-9.0.10.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.0.10.ebuild
@ -0,0 +1,342 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.10.ebuild,v 1.1 2012/09/24 17:37:46 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+
+WANT_AUTOMAKE="none"
+inherit autotools eutils multilib pam prefix python user versionator
+
+SLOT="$(get_version_component_range 1-2)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+DESCRIPTION="PostgreSQL server"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.0-r3.tbz2
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
+LICENSE="POSTGRESQL GPL-2"
+
+S="${WORKDIR}/postgresql-${PV}"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
+		 perl? ( >=dev-lang/perl-5.8 )
+		 selinux? ( sec-policy/selinux-postgresql )
+		 tcl? ( >=dev-lang/tcl-8 )
+		 uuid? ( dev-libs/ossp-uuid )
+		 xml? ( dev-libs/libxml2 dev-libs/libxslt )"
+
+DEPEND="${RDEPEND}
+		sys-devel/flex
+		xml? ( virtual/pkgconfig )"
+
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/pg_ctl-exit-status.patch" \
+		"${WORKDIR}/server.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
+			-i src/test/regress/{input,output}/tablespace.source
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
+		die "RUNDIR sed failed"
+	sed -e "s|@SLOT@|${SLOT}|g" \
+		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
+		die "SLOT sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		--with-includes="${EPREFIX%/}/usr/include/postgresql-${SLOT}/" \
+		--with-libraries="${EPREFIX%/}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
+		--with-system-tzdata="${EPREFIX%/}/usr/share/zoneinfo" \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2); do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd -j1 || die "emake in $bd failed"
+	done
+}
+
+src_install() {
+	if use perl ; then
+		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
+	fi
+
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed"
+	done
+
+	dodir /usr/share/postgresql-${SLOT}/man/man1/
+	cp "${S}"/doc/src/sgml/man1/{initdb,pg_controldata,pg_ctl,pg_resetxlog,post{gres,master}}.1 \
+		"${ED}"/usr/share/postgresql-${SLOT}/man/man1/ || die
+
+	dodoc README HISTORY doc/{README.*,TODO,bug.template}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" \
+		> "${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} \
+		|| die "Inserting conf.d file failed"
+
+	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} \
+		|| die "Inserting init.d file failed"
+
+	use pam && pamd_mimic system-auth postgresql auth account session
+
+	if use prefix ; then
+		keepdir ${RUNDIR}/run/postgresql
+		fperms 0770 ${RUNDIR}/run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
+	elog
+	elog "If you have users and/or services that you would like to utilize the"
+	elog "socket, you must add them to the 'postgres' system group:"
+	elog "    usermod -a -G postgres <user>"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f ${EROOT%/}/etc/conf.d/postgresql-${SLOT} ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z ${PGDATA} ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z ${DATA_DIR} ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [[ -f ${EROOT%/}/etc/env.d/02locale ]] ; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[[ -n ${LANG} ]] && export LANG
+		[[ -n ${LC_CTYPE} ]] && export LC_CTYPE
+		[[ -n ${LC_NUMERIC} ]] && export LC_NUMERIC
+		[[ -n ${LC_TIME} ]] && export LC_TIME
+		[[ -n ${LC_COLLATE} ]] && export LC_COLLATE
+		[[ -n ${LC_MONETARY} ]] && export LC_MONETARY
+		[[ -n ${LC_MESSAGES} ]] && export LC_MESSAGES
+		[[ -n ${LC_ALL} ]] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [[ $correct != "true" ]] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [[ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ]] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[[ -z ${PG_MAX_CONNECTIONS} ]] && PG_MAX_CONNECTIONS=128
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "  Tests not supported on this OS (yet)"
+	else
+		if [[ -z ${SKIP_SYSTEM_TESTS} ]] ; then
+			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [[ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ]] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "    - Change the mentioned system parameter"
+					eerror "    - Lower the number of max connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			einfo "Passed."
+		else
+			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
+		fi
+	fi
+
+	if [[ ${EUID} == 0 ]] ; then
+		einfo "Creating the data directory ..."
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres \
+			-c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D '${DATA_DIR}' -L '${EROOT%/}/usr/share/postgresql-${SLOT}/' ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb \
+			-U postgres -D "${DATA_DIR}" \
+			-L "${EROOT%/}/usr/share/postgresql-${SLOT}/" ${PG_INITDB_OPTS}
+	fi
+
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "    mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [[ ${UID} != 0 ]] ; then
+		emake check || die "Make check failed. See above for details."
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}
--- a/dev-db/postgresql-server/postgresql-server-9.1.6.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.1.6.ebuild
@ -0,0 +1,348 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.1.6.ebuild,v 1.1 2012/09/24 17:37:46 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+
+WANT_AUTOMAKE="none"
+inherit autotools eutils flag-o-matic multilib pam prefix python user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+S="${WORKDIR}/postgresql-${PV}"
+
+DESCRIPTION="PostgreSQL server"
+HOMEPAGE="http://www.postgresql.org/"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-9.1-r1.tbz2
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.1.tbz2"
+LICENSE="POSTGRESQL GPL-2"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
+	perl? ( >=dev-lang/perl-5.8 )
+	selinux? ( sec-policy/selinux-postgresql )
+	tcl? ( >=dev-lang/tcl-8 )
+	uuid? ( dev-libs/ossp-uuid )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	xml? ( virtual/pkgconfig )"
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/pg_ctl-exit-status.patch" \
+		"${WORKDIR}/server.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
+			-i src/test/regress/{input,output}/tablespace.source
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
+		die "RUNDIR sed failed"
+	sed -e "s|@SLOT@|${SLOT}|g" \
+		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
+		die "SLOT sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	local PO="${EPREFIX%/}"
+
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
+		--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2); do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd || die "emake in $bd failed"
+	done
+}
+
+src_install() {
+	if use perl ; then
+		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
+	fi
+
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
+	done
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || \
+		die "Inserting conf failed"
+	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || \
+		die "Inserting conf failed"
+
+	use pam && pamd_mimic system-auth postgresql auth account session
+
+	if use prefix ; then
+		keepdir ${RUNDIR}/run/postgresql
+		fperms 0770 ${RUNDIR}/run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
+	elog
+	elog "If you have users and/or services that you would like to utilize the"
+	elog "socket, you must add them to the 'postgres' system group:"
+	elog "    usermod -a -G postgres <user>"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
+
+		ebegin "Resuming removal 10 seconds. Control-C to cancel"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "  Tests not supported on this OS (yet)"
+	else
+		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
+			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "    - Change the mentioned system parameter"
+					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			einfo "Passed."
+		else
+			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
+		fi
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [ ${UID} -ne 0 ] ; then
+		emake -j1 check  || die "Make check failed. See above for details."
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}
--- a/dev-db/postgresql-server/postgresql-server-9.2.1.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.2.1.ebuild
@ -0,0 +1,357 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.1.ebuild,v 1.1 2012/09/24 17:37:46 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2"
+
+WANT_AUTOMAKE="none"
+inherit autotools eutils flag-o-matic multilib pam prefix python user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+# Comment the following six lines when not a beta or rc.
+#MY_PV="${PV//_}"
+#MY_FILE_PV="${SLOT}$(get_version_component_range 4)"
+#S="${WORKDIR}/postgresql-${MY_FILE_PV}"
+#SRC_URI="mirror://postgresql/source/v${MY_FILE_PV}/postgresql-${MY_FILE_PV}.tar.bz2
+#		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}beta3.tbz2
+#		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.3.tbz2"
+
+# Comment the following four lines when a beta or rc.
+S="${WORKDIR}/postgresql-${PV}"
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2
+		 http://dev.gentoo.org/~titanofold/postgresql-patches-${SLOT}beta3.tbz2
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.3.tbz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL server"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
+IUSE="doc kernel_linux nls pam perl -pg_legacytimestamp python selinux tcl uuid xml"
+
+for lingua in ${LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+	local enable_langs
+
+	for lingua in ${LINGUAS} ; do
+		use linguas_${lingua} && enable_langs+="${lingua} "
+	done
+
+	echo -n ${enable_langs}
+}
+
+RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pam?,pg_legacytimestamp=,nls=]
+	perl? ( >=dev-lang/perl-5.8 )
+	selinux? ( sec-policy/selinux-postgresql )
+	tcl? ( >=dev-lang/tcl-8 )
+	uuid? ( dev-libs/ossp-uuid )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	xml? ( virtual/pkgconfig )"
+PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
+
+# Support /var/run or /run for the socket directory
+[[ ! -d /run ]] && RUNDIR=/var
+
+pkg_setup() {
+	enewgroup postgres 70
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
+
+	use python && python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/autoconf.patch" \
+		"${WORKDIR}/bool.patch" \
+		"${WORKDIR}/server.patch"
+
+	eprefixify src/include/pg_config_manual.h
+
+	if use test ; then
+		epatch "${WORKDIR}/regress.patch"
+		sed -e "s|@SOCKETDIR@|${T}|g" -i src/test/regress/pg_regress{,_main}.c
+#		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" \
+#			-i src/test/regress/{input,output}/tablespace.source
+	else
+		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
+	fi
+
+	sed -e "s|@RUNDIR@|${RUNDIR}|g" \
+		-i src/include/pg_config_manual.h "${WORKDIR}/postgresql.init" || \
+		die "RUNDIR sed failed"
+	sed -e "s|@SLOT@|${SLOT}|g" \
+		-i "${WORKDIR}/postgresql.init" "${WORKDIR}/postgresql.confd" || \
+		die "SLOT sed failed"
+
+	eautoconf
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	local PO="${EPREFIX%/}"
+
+	# eval is needed to get along with pg_config quotation of space-rich entities.
+	eval econf "$(${PO}/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with tcl) \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with uuid ossp-uuid) \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		--with-includes="${PO}/usr/include/postgresql-${SLOT}/" \
+		--with-libraries="${PO}/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \
+		"$(use_enable nls nls "$(wanted_languages)")"
+}
+
+src_compile() {
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2); do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake -C $bd || die "emake in $bd failed"
+	done
+}
+
+src_install() {
+	if use perl ; then
+		mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig"
+		sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \
+			"${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile"
+	fi
+
+	local bd
+	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+		PATH="${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
+			emake install -C $bd DESTDIR="${D}" || die "emake install in $bd failed"
+	done
+
+	dodoc README HISTORY doc/{TODO,bug.template}
+
+	dodir /etc/eselect/postgresql/slots/${SLOT}
+	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
+		"${ED}/etc/eselect/postgresql/slots/${SLOT}/server"
+
+	newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT} || \
+		die "Inserting conf failed"
+	newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT} || \
+		die "Inserting conf failed"
+
+	use pam && pamd_mimic system-auth postgresql auth account session
+
+	if use prefix ; then
+		keepdir ${RUNDIR}/run/postgresql
+		fperms 0770 ${RUNDIR}/run/postgresql
+	fi
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "Gentoo specific documentation:"
+	elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
+	elog
+	elog "Official documentation:"
+	elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+	elog
+	elog "The default location of the Unix-domain socket is:"
+	elog "    ${EROOT%/}${RUNDIR}/run/postgresql/"
+	elog
+	elog "If you have users and/or services that you would like to utilize the"
+	elog "socket, you must add them to the 'postgres' system group:"
+	elog "    usermod -a -G postgres <user>"
+	elog
+	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+	elog "so that it contains your preferred locale in:"
+	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog
+	elog "Then, execute the following command to setup the initial database"
+	elog "environment:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
+
+		ebegin "Resuming removal 10 seconds. Control-C to cancel"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT%/}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+	while [ "$correct" != "true" ] ; do
+		einfo "Are you ready to continue? (y/n)"
+		read answer
+		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+			correct="true"
+		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+			die "Aborting initialization."
+		else
+			echo "Answer not recognized"
+		fi
+	done
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		einfo "Skipped."
+		einfo "  Tests not supported on this OS (yet)"
+	else
+		if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
+			einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
+
+			local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+			local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+			local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+			local SHMMAX=$(sysctl -n kernel.shmmax)
+
+			local SEMMSL_MIN=17
+			local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+			local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+			local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+			for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+				if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
+					eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+					eerror "You have now several options:"
+					eerror "    - Change the mentioned system parameter"
+					eerror "    - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
+					eerror "      value lower than ${PG_MAX_CONNECTIONS}"
+					eerror "    - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
+					eerror "More information can be found here:"
+					eerror "    http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+					die "System test failed."
+				fi
+			done
+			einfo "Passed."
+		else
+			ewarn "SKIP_SYSTEM_TESTS set, so skipping."
+		fi
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "${DATA_DIR}"
+		chown -Rf postgres:postgres "${DATA_DIR}"
+		chmod 0700 "${DATA_DIR}"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	einfo "The PostgreSQL server, by default, will log events to:"
+	einfo "    ${DATA_DIR%/}/postmaster.log"
+	einfo
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	else
+		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+	if [ ${UID} -ne 0 ] ; then
+		emake check  || die "Make check failed. See above for details."
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		ewarn "Tests cannot be run as root. Skipping."
+		ewarn "HINT: FEATURES=\"userpriv\""
+	fi
+}
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@ -1,2 +1,2 @@
-DIST tora-2.1.1.tar.gz 5356473 SHA256 5063f2adda7c14ecdbc190b1459b3ea236fb37054640635f54bc2d46a5041663 SHA512 57c431e802a3e6abd29dc8db0fd7eeeb7a98fe4c923ebb72469e5e1887f05dd8ffab069a9d8df57455b6be7abba7806cdc447b0333a42b898d7072038eb7865b WHIRLPOOL 4cd86a1499057ab919cd87dd8a80d5969cd9eb70832938d28a35419ecca0061e7b61ef3bda32ac88b04738a8c3ad28de083d9ecf85017afd5a97e9a0da480a11
-DIST tora-2.1.3.tar.gz 12284451 SHA256 ecabb2f181d1fefe8c1c401f14e1fea80b49fc6bc7963ef9f202821a626e619b SHA512 817de0eed05dcc89baf5dbf51d88577cf21b809435d76eef76bfc5ad9e5b5c8228c5cf0ac41d126144e3b41feb73fba04e62af7564fde2a11e9c81c62be59329 WHIRLPOOL aa81539e5218acd284c0bd44787220f3926734bd8c91fa7b3ddb86de6a6a50c7a8036f4bf6b5a89f246c52ff9d45533da108db9a7b1a5f5a162f20c87d5953d4
+DIST tora-2.1.1.tar.gz 5356473 RMD160 1f81d512480fdfba2d66e2cd8665da8ab70d2de3 SHA1 61a2471fd9bac2578e6fa556f98d90976ea3ef9d SHA256 5063f2adda7c14ecdbc190b1459b3ea236fb37054640635f54bc2d46a5041663
+DIST tora-2.1.3.tar.gz 12284451 RMD160 084d90c94184939e24ac94109ff7940a33bed1d7 SHA1 d33ea3bafb09c5382ef4e0cb0e8ca4ed848a9155 SHA256 ecabb2f181d1fefe8c1c401f14e1fea80b49fc6bc7963ef9f202821a626e619b
--- a/dev-db/tora/files/tora-2.1.3-gcc-4.7.patch
+++ b/dev-db/tora/files/tora-2.1.3-gcc-4.7.patch
@ -0,0 +1,26 @@
+http://tora.svn.sourceforge.net/viewvc/tora?view=revision&revision=4264
+
+--- trunk/tora/src/toextract.cpp	2012/04/17 16:08:26	4263
+++ trunk/tora/src/toextract.cpp	2012/04/20 01:49:18	4264
+@@ -58,6 +58,9 @@
+ #include <winsock2.h>
+ #endif
+ 
+#ifndef Q_OS_WIN32
+#include <unistd.h>
+#endif
+ 
+ std::map<QString, toExtract::extractor *> *toExtract::Extractors;
+ 
+--- trunk/tora/src/toreport.cpp	2012/04/17 16:08:26	4263
+++ trunk/tora/src/toreport.cpp	2012/04/20 01:49:18	4264
+@@ -52,6 +52,9 @@
+ #ifdef Q_OS_WIN32
+ #include <winsock2.h>
+ #endif
+#ifndef Q_OS_WIN32
+#include <unistd.h>
+#endif
+ 
+ 
+ static bool SameContext(const QString &str, const QString &str2)
--- a/dev-db/tora/tora-2.1.3-r1.ebuild
+++ b/dev-db/tora/tora-2.1.3-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/dev-db/tora/tora-2.1.3-r1.ebuild,v 1.1 2011/12/10 02:04:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.3-r1.ebuild,v 1.2 2012/09/24 19:49:08 haubi Exp $

 EAPI=2

@ -44,6 +44,7 @@ pkg_setup() {
 }

 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch #430044
 	sed -i \
 		-e "/COPYING/ d" \
 		CMakeLists.txt || die "Removal of COPYING file failed"
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@ -1,2 +1,3 @@
 DIST ClanLib-0.8.1.tgz 7629019 SHA256 094331dda35b0d263431d1551991eb208d8e969824434925548a9fcd1d34e495 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b WHIRLPOOL be486125f406a307676c4957f977b6ccc6bc2ce527a72fb4febcb3d1c7e2acdc4fc6706b66b75412184c3a0744c53e962011b0c3ac22958da5e987f0fccc9d87
 DIST ClanLib-2.3.4.tgz 25527668 SHA256 d3d2d2f32935bb382fb15f5008100e36182261c13561917e3aba11e271d5f1c3 SHA512 03c1fffc3f5bd3cb19c23f902507fdc0897a02c35fc9d02afa0a7e7547b7a2e3e6bb8634ee52eefb054c0e1aa3b50a77f877226a568ace35326cb9c45abcda12 WHIRLPOOL 06453b7d69352d2cd5672e788d5654dfc6458488f2039ddc0d601318c994dcd4312ff80bd1ef0645ee371b42a99c825382886a2b7d47275371b3587c6c64edce
+DIST ClanLib-2.3.6.tgz 25605576 SHA256 b8dc9b41028bf16c0a6082aa15cdee5d8b1ecd5256797576970f09a63e3fafde SHA512 572b51984f960a93dd03ad9f48a9f81a7c21c471616fe376c4b54e6cb0855b1043e35486c3eacdc8beadb30e48290a5a2da0cb287ec9aaf5f409f299861ab72c WHIRLPOOL 4389c13bbc71a61adb0330f0edea2be474071b721a90a920872f0d1c6d00ad4e1fcd2b8510144ffacb4f5ff5235ee702d64f9f56b338b449b3f908686ee70c26
--- a/dev-games/clanlib/clanlib-2.3.6.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.6.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-2.3.6.ebuild,v 1.1 2012/09/25 11:44:48 tupone Exp $
+
+EAPI=4
+inherit flag-o-matic eutils autotools-utils
+
+MY_P=ClanLib-${PV}
+
+DESCRIPTION="multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/"
+SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz"
+
+LICENSE="ZLIB"
+SLOT="2.3"
+KEYWORDS="~amd64 ~x86" #not big endian safe #82779
+IUSE="doc ipv6 mikmod opengl sound sqlite sse2 static-libs vorbis X"
+REQUIRED_USE="opengl? ( X )"
+
+RDEPEND="sys-libs/zlib
+	X? (
+		media-libs/libpng
+		virtual/jpeg
+		media-libs/freetype
+		media-libs/fontconfig
+		opengl? ( virtual/opengl )
+		app-arch/bzip2
+		x11-libs/libX11
+	)
+	sqlite? ( dev-db/sqlite )
+	sound? ( media-libs/alsa-lib )
+	mikmod? (
+		media-libs/libmikmod
+		media-libs/alsa-lib
+	)
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/alsa-lib
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen dev-lang/perl )"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=(
+	CODING_STYLE
+	CREDITS
+	PATCHES
+	README
+)
+
+src_configure() {
+	myeconfargs=(
+		$(use_enable doc docs)
+		$(use_enable sse2)
+		$(use_enable opengl clanGL)
+		$(use_enable opengl clanGL1)
+		$(use_enable opengl clanGUI)
+		$(use_enable X clanDisplay)
+		$(use_enable vorbis clanVorbis)
+		$(use_enable mikmod clanMikMod)
+		$(use_enable sqlite clanSqlite)
+		$(use_enable ipv6 getaddr)
+	)
+	use sound \
+		|| use vorbis \
+		|| use mikmod \
+		|| myeconfargs+=( --disable-clanSound )
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	use doc && autotools-utils_src_compile html
+}
+
+# html files are keeped in a directory that is dependent on the SLOT
+# so to keep eventual bookmarks to the doc from version to version
+src_install() {
+	autotools-utils_src_install
+	if use doc ; then
+		emake DESTDIR="${D}" install-html
+		dodoc -r Examples Resources
+	fi
+}
--- a/dev-games/clanlib/files/clanlib-2.3.6-autotools.patch
+++ b/dev-games/clanlib/files/clanlib-2.3.6-autotools.patch
@ -0,0 +1,45 @@
+--- Documentation/Reference/Makefile.am.old	2012-09-25 10:39:25.973544935 +0200
+++ Documentation/Reference/Makefile.am	2012-09-25 10:39:42.560554053 +0200
+@@ -10,7 +10,7 @@
+ 	mkdir doxyoutput;
+ 	mkdir reftest
+ 	doxygen ./clanlib.doxygen
+-	make -C ../Utilities/ReferenceDocs
+	$(MAKE) -C ../Utilities/ReferenceDocs
+ 	../Utilities/ReferenceDocs/ReferenceDocs
+ 
+ install-html:
+--- configure.ac.old	2012-09-25 11:07:38.412537590 +0200
+++ configure.ac	2012-09-25 11:09:41.133939131 +0200
+@@ -337,11 +337,9 @@
+ 
+ 	dnl  Optional linux/joystick.h
+ 	AC_CHECK_HEADERS(linux/joystick.h, linux_joystick=yes)
+-	AM_CONDITIONAL(LINUX_JOYSTICK, test x$linux_joystick = xyes)
+ 
+ 	dnl Optional linux/input.h
+ 	AC_CHECK_HEADERS(linux/input.h, linux_input=yes)
+-	AM_CONDITIONAL(LINUX_INPUT, test x$linux_input = xyes)
+ 
+ 	if test "$WIN32" = "no" && test "$enable_clanDisplay" != "no"; then
+ 	CLANLIB_CHECK_LIB(fontconfig,  [`cat $srcdir/Setup/Tests/fontconfig.cpp`],  clanDisplay, [ *** Cannot find fontconfig (See http://fontconfig.org/ ) (Try libfontconfig1-dev or better) ], [-lfontconfig])
+@@ -358,6 +356,8 @@
+ 			clanDisplay, [ *** Cannot find version 8 of DirectInput], [-ldxguid -lole32 -ldinput8])
+ 	fi
+ fi
+AM_CONDITIONAL(LINUX_JOYSTICK, test x$linux_joystick = xyes)
+AM_CONDITIONAL(LINUX_INPUT, test x$linux_input = xyes)
+ 
+ have_xrender=no
+ 
+@@ -515,9 +515,9 @@
+ 	fi
+ 
+ 	if test "$enable_clanSound" = "auto"; then enable_clanSound=yes; fi
+-	AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
+ 
+ fi
+AM_CONDITIONAL(ALSA, test x$have_alsa = xyes)
+ 
+ if test "$enable_clanSound" != "no"; then
+ 	enable_clanSound=yes
--- a/dev-haskell/cmdlib/cmdlib-0.3.5.ebuild
+++ b/dev-haskell/cmdlib/cmdlib-0.3.5.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-haskell/cmdlib/cmdlib-0.3.5.ebuild,v 1.5 2012/09/12 15:41:58 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cmdlib/cmdlib-0.3.5.ebuild,v 1.6 2012/09/25 13:58:26 nativemad Exp $

 # ebuild generated by hackport 0.2.13

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""

 RDEPEND="dev-haskell/mtl[profile?]
--- a/dev-haskell/deepseq/deepseq-1.3.0.0.ebuild
+++ b/dev-haskell/deepseq/deepseq-1.3.0.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.3.0.0.ebuild,v 1.5 2012/09/13 00:55:02 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.3.0.0.ebuild,v 1.6 2012/09/25 14:05:43 nativemad Exp $

 # ebuild generated by hackport 0.2.13

@ -17,7 +17,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""

 RDEPEND=">=dev-lang/ghc-6.10.1"
--- a/dev-haskell/hostname/hostname-1.0.ebuild
+++ b/dev-haskell/hostname/hostname-1.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hostname/hostname-1.0.ebuild,v 1.5 2012/09/12 15:48:13 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hostname/hostname-1.0.ebuild,v 1.6 2012/09/25 14:10:22 nativemad Exp $

 # ebuild generated by hackport 0.2.14

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""

 RDEPEND=">=dev-lang/ghc-6.8.2"
--- a/dev-haskell/http/http-4000.2.3.ebuild
+++ b/dev-haskell/http/http-4000.2.3.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-haskell/http/http-4000.2.3.ebuild,v 1.4 2012/09/13 01:12:41 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/http-4000.2.3.ebuild,v 1.5 2012/09/25 13:59:43 nativemad Exp $

 EAPI="4"

@ -17,7 +17,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE="test"

 RDEPEND=">=dev-haskell/mtl-2.0[profile?]
--- a/dev-haskell/httpd-shed/httpd-shed-0.4.ebuild
+++ b/dev-haskell/httpd-shed/httpd-shed-0.4.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-haskell/httpd-shed/httpd-shed-0.4.ebuild,v 1.3 2012/09/12 15:50:59 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/httpd-shed/httpd-shed-0.4.ebuild,v 1.4 2012/09/25 14:04:34 nativemad Exp $

 # ebuild generated by hackport 0.2.17.9999

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE=""

 RDEPEND="dev-haskell/network[profile?]
--- a/dev-haskell/mtl/mtl-2.1.1.ebuild
+++ b/dev-haskell/mtl/mtl-2.1.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/mtl/mtl-2.1.1.ebuild,v 1.3 2012/09/12 14:42:20 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/mtl/mtl-2.1.1.ebuild,v 1.4 2012/09/25 14:09:10 nativemad Exp $

 EAPI="4"

@ -13,7 +13,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""

 RDEPEND="=dev-haskell/transformers-0.3*[profile?]
--- a/dev-haskell/primitive/primitive-0.4.1.ebuild
+++ b/dev-haskell/primitive/primitive-0.4.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/dev-haskell/primitive/primitive-0.4.1.ebuild,v 1.4 2012/09/12 16:04:16 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/primitive/primitive-0.4.1.ebuild,v 1.5 2012/09/25 14:06:51 nativemad Exp $

 # ebuild generated by hackport 0.2.13

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""

 RDEPEND=">=dev-lang/ghc-6.10.1"
--- a/dev-haskell/quickcheck/quickcheck-2.4.2-r1.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-2.4.2-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-haskell/quickcheck/quickcheck-2.4.2-r1.ebuild,v 1.3 2012/09/12 15:10:42 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-2.4.2-r1.ebuild,v 1.4 2012/09/25 14:03:24 nativemad Exp $

 EAPI="3"

@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"

 LICENSE="BSD"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+template_haskell"

 RDEPEND=">=dev-lang/ghc-6.10.1
--- a/dev-haskell/random/random-1.0.1.1.ebuild
+++ b/dev-haskell/random/random-1.0.1.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/random/random-1.0.1.1.ebuild,v 1.4 2012/09/12 15:53:07 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/random/random-1.0.1.1.ebuild,v 1.5 2012/09/25 13:56:02 nativemad Exp $

 # ebuild generated by hackport 0.2.13

@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="dev-haskell/time[profile?]
--- a/dev-haskell/shellish/shellish-0.1.4.ebuild
+++ b/dev-haskell/shellish/shellish-0.1.4.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-haskell/shellish/shellish-0.1.4.ebuild,v 1.4 2012/09/12 14:36:49 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/shellish/shellish-0.1.4.ebuild,v 1.5 2012/09/25 14:02:11 nativemad Exp $

 # ebuild generated by hackport 0.2.17.9999

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""

 RDEPEND="dev-haskell/mtl[profile?]
--- a/dev-haskell/split/split-0.1.4.3.ebuild
+++ b/dev-haskell/split/split-0.1.4.3.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-haskell/split/split-0.1.4.3.ebuild,v 1.3 2012/09/12 15:24:07 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/split/split-0.1.4.3.ebuild,v 1.4 2012/09/25 14:15:14 nativemad Exp $

 EAPI=4

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE=""

 RDEPEND=">=dev-lang/ghc-6.8.2"
--- a/dev-haskell/strict/strict-0.3.2.ebuild
+++ b/dev-haskell/strict/strict-0.3.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/strict/strict-0.3.2.ebuild,v 1.4 2012/09/12 15:55:37 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/strict/strict-0.3.2.ebuild,v 1.5 2012/09/25 14:08:01 nativemad Exp $

 # ebuild generated by hackport 0.2.17.9999

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""

 RDEPEND=">=dev-lang/ghc-6.8.2"
--- a/dev-haskell/tar/tar-0.3.2.0.ebuild
+++ b/dev-haskell/tar/tar-0.3.2.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/tar/tar-0.3.2.0.ebuild,v 1.4 2012/09/12 14:45:08 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/tar/tar-0.3.2.0.ebuild,v 1.5 2012/09/25 14:14:06 nativemad Exp $

 # ebuild generated by hackport 0.2.14

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-macos"
 IUSE=""

 RDEPEND=">=dev-lang/ghc-6.10.1"
--- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.2.12.2.ebuild
+++ b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.2.12.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.2.12.2.ebuild,v 1.2 2012/09/12 15:36:42 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.2.12.2.ebuild,v 1.3 2012/09/25 14:17:53 nativemad Exp $

 # ebuild generated by hackport 0.2.17

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""

 RDEPEND="=dev-haskell/quickcheck-2.4*[profile?]
--- a/dev-haskell/test-framework/test-framework-0.6.ebuild
+++ b/dev-haskell/test-framework/test-framework-0.6.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-haskell/test-framework/test-framework-0.6.ebuild,v 1.3 2012/09/12 15:31:31 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework/test-framework-0.6.ebuild,v 1.4 2012/09/25 14:12:55 nativemad Exp $

 # ebuild generated by hackport 0.2.17

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""

 RDEPEND=">=dev-haskell/ansi-terminal-0.4.0[profile?]
--- a/dev-haskell/text/text-0.11.2.2.ebuild
+++ b/dev-haskell/text/text-0.11.2.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/text-0.11.2.2.ebuild,v 1.3 2012/09/12 15:01:15 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/text-0.11.2.2.ebuild,v 1.4 2012/09/25 14:16:31 nativemad Exp $

 # ebuild generated by hackport 0.2.13

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"

 RDEPEND=">=dev-haskell/deepseq-1.1.0.0[profile?]
--- a/dev-haskell/unix-compat/unix-compat-0.3.0.1.ebuild
+++ b/dev-haskell/unix-compat/unix-compat-0.3.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/dev-haskell/unix-compat/unix-compat-0.3.0.1.ebuild,v 1.4 2012/09/12 15:57:28 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/unix-compat/unix-compat-0.3.0.1.ebuild,v 1.5 2012/09/25 14:00:53 nativemad Exp $

 # ebuild generated by hackport 0.2.13

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""

 RDEPEND=">=dev-lang/ghc-6.12.1"
--- a/dev-haskell/vector/vector-0.9.1.ebuild
+++ b/dev-haskell/vector/vector-0.9.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/dev-haskell/vector/vector-0.9.1.ebuild,v 1.4 2012/09/12 15:56:09 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.9.1.ebuild,v 1.5 2012/09/25 13:57:15 nativemad Exp $

 # ebuild generated by hackport 0.2.13

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""

 RDEPEND="=dev-haskell/primitive-0.4*[profile?]
--- a/dev-haskell/xml/xml-1.3.12.ebuild
+++ b/dev-haskell/xml/xml-1.3.12.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-haskell/xml/xml-1.3.12.ebuild,v 1.4 2012/09/12 14:47:30 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xml/xml-1.3.12.ebuild,v 1.5 2012/09/25 14:11:33 nativemad Exp $

 # ebuild generated by hackport 0.2.13

@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""

 RDEPEND="dev-haskell/text[profile?]
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@ -1,2 +1,2 @@
 DIST icedtea-web-1.2.1.tar.gz 879692 SHA256 134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6 SHA512 0f7cb56dc252c8f1196a6af841e74e482b9d5b5a1b1ff1b1be315ece1f180ca09a5017e76993d81824d864ebcebf4fe8369d09322fb2fee1c88cb7f5031717b8 WHIRLPOOL 17fb7b3b66b2b42baca1f278a786682b3eb1191a054bc909605f85c641ffe1d998a677ad6055dfac9f996792404aa19987d4c77a4dcc774183e5a17ee7aad352
-DIST icedtea-web-1.2.tar.gz 885793 SHA256 3f8d22b655df207409dd3451ba02907f61a12ac051e4df4d44bb5ed47c4f778d SHA512 42b6878457965ed3b077acb72940587efbf6b751e2a197fceed20c9cd0be8e878412a4a838c0dfbb5b02eeaae1833073c3bbf4baef7944c576f3c71c06b7419a WHIRLPOOL bd7bc02be559648290e852470daa9ad962fe7b5e168d1cfe2520b4cafdd9b0cbced96e1dfe75e04e20174a963086bce25ae199c8cd9f11b4add25a36c62e53d0
+DIST icedtea-web-1.3.tar.gz 987785 SHA256 d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f SHA512 21cb4602a998e65994498e56f368f42c06703e07f2b33cbe9d2a084befe073f7c9301a9b076ccaac5de18bb384907b8efc1013315ca2cd90493caf18059f4932 WHIRLPOOL 97a448088d8838fd2272cafa159fd43f45b7404f2afabd5cd12d7bcd97418a012ff028d6015293878c913ee1d907585ce2c22a5a7e8c8ba3619bb6cb30c63370
--- a/dev-java/icedtea-web/icedtea-web-1.2.1-r7.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.2.1-r7.ebuild
@ -1,116 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.2.1-r7.ebuild,v 1.1 2012/08/02 18:03:48 sera Exp $
-# Build written by Andrew John Hughes (ahughes@redhat.com)
-
-EAPI="4"
-
-inherit autotools eutils java-pkg-2 java-vm-2
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="7"
-KEYWORDS="~amd64 ~ia64 ~x86"
-
-IUSE="build doc javascript +nsplugin test"
-
-RDEPEND="dev-java/icedtea:${SLOT}"
-# Need system junit 4.8+. Bug #389795
-DEPEND="${RDEPEND}
-	javascript? ( dev-java/rhino:1.6 )
-	nsplugin? ( net-misc/npapi-sdk )
-	test? (	>=dev-java/junit-4.8:4 )"
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea7"
-	JAVA_PKG_WANT_SOURCE="1.6"
-	JAVA_PKG_WANT_TARGET="1.6"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_prepare() {
-	# bug #356645
-	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
-	eautoreconf
-}
-
-src_configure() {
-	local vmhome=$(java-config -O)
-
-	if use build; then
-		icedteadir="${ICEDTEA_BIN_DIR}"
-		[[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
-		installdir="/opt/icedtea-web-bin-${SLOT}"
-	else
-		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
-		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
-	fi
-
-	unset_vars
-
-	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
-		VMHANDLE="icedtea-${SLOT}"
-	else
-		die "Unexpected install location of IcedTea${SLOT}"
-	fi
-
-	einfo "Installing IcedTea-Web in ${installdir}"
-	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
-	if [ ! -e ${vmhome} ] ; then
-		eerror "Could not find JDK install directory ${vmhome}."
-		die
-	fi
-
-	# we need to override all *dir variables that econf sets
-	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
-	# the suffix the man page will end up compressed with, anyway
-	econf \
-		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
-		--with-jdk-home=${icedteadir} \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
-		$(use_with javascript rhino)
-}
-
-src_compile() {
-	# we need this to override the src_compile from java-pkg-2
-	default
-}
-
-src_install() {
-	# parallel make problem bug #372235
-	emake -j1 DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	if use nsplugin; then
-		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
-	fi
-
-	for binary in javaws itweb-settings; do
-		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
-		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
-	done
-}
-
-pkg_postinst() {
-	java-vm_check-nsplugin
-	java_mozilla_clean_
-
-	if use nsplugin; then
-		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
-	fi
-}
-
-pkg_prerm() {
-	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
-	:;
-}
--- a/dev-java/icedtea-web/icedtea-web-1.2.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.2.ebuild
@ -1,116 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.2.ebuild,v 1.5 2012/07/21 11:47:47 sera Exp $
-# Build written by Andrew John Hughes (ahughes@redhat.com)
-
-EAPI="4"
-
-inherit autotools eutils java-pkg-2 java-vm-2
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="build doc javascript +nsplugin test"
-
-RDEPEND="dev-java/icedtea:${SLOT}"
-# Need system junit 4.8+. Bug #389795
-DEPEND="${RDEPEND}
-	javascript? ( dev-java/rhino:1.6 )
-	nsplugin? ( net-misc/npapi-sdk )
-	test? (	>=dev-java/junit-4.8:4 )"
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="icedtea-6 icedtea6"
-	JAVA_PKG_WANT_SOURCE="1.6"
-	JAVA_PKG_WANT_TARGET="1.6"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_prepare() {
-	# bug #356645
-	epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
-	eautoreconf
-}
-
-src_configure() {
-	local vmhome=$(java-config -O)
-
-	if use build; then
-		icedteadir="${ICEDTEA_BIN_DIR}"
-		[[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
-		installdir="/opt/icedtea-web-bin-${SLOT}"
-	else
-		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
-		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
-	fi
-
-	unset_vars
-
-	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
-		VMHANDLE="icedtea-${SLOT}"
-	else
-		die "Unexpected install location of IcedTea${SLOT}"
-	fi
-
-	einfo "Installing IcedTea-Web in ${installdir}"
-	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
-	if [ ! -e ${vmhome} ] ; then
-		eerror "Could not find JDK install directory ${vmhome}."
-		die
-	fi
-
-	# we need to override all *dir variables that econf sets
-	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
-	# the suffix the man page will end up compressed with, anyway
-	econf \
-		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
-		--with-jdk-home=${icedteadir} \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
-		$(use_with javascript rhino)
-}
-
-src_compile() {
-	# we need this to override the src_compile from java-pkg-2
-	default
-}
-
-src_install() {
-	# parallel make problem bug #372235
-	emake -j1 DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	if use nsplugin; then
-		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
-	fi
-
-	for binary in javaws itweb-settings; do
-		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
-		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
-	done
-}
-
-pkg_postinst() {
-	java-vm_check-nsplugin
-	java_mozilla_clean_
-
-	if use nsplugin; then
-		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
-	fi
-}
-
-pkg_prerm() {
-	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
-	:;
-}
--- a/dev-java/icedtea-web/icedtea-web-1.3-r7.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.3-r7.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-java/icedtea-web/icedtea-web-1.2-r7.ebuild,v 1.5 2012/07/21 11:47:47 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.3-r7.ebuild,v 1.1 2012/09/25 13:56:20 sera Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)

 EAPI="4"
@ -15,26 +15,35 @@ LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
 SLOT="7"
 KEYWORDS="~amd64 ~ia64 ~x86"

-IUSE="build doc javascript +nsplugin test"
-
-RDEPEND="dev-java/icedtea:${SLOT}"
+IUSE="build doc gtk2 gtk3 javascript +nsplugin test"
+
+COMMON_DEP="
+	dev-java/icedtea:${SLOT}
+	nsplugin? (
+		>=dev-libs/glib-2.16
+		gtk2? (
+			!gtk3? ( >=x11-libs/gtk+-2.6:2 )
+			gtk3? ( x11-libs/gtk+:3 )
+		)
+		!gtk2? ( x11-libs/gtk+:3 )
+	)"
+RDEPEND="${COMMON_DEP}"
 # Need system junit 4.8+. Bug #389795
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEP}
+	virtual/pkgconfig
 	javascript? ( dev-java/rhino:1.6 )
 	nsplugin? ( net-misc/npapi-sdk )
 	test? (	>=dev-java/junit-4.8:4 )"

 pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="icedtea-7 icedtea7"
+	JAVA_PKG_WANT_BUILD_VM="icedtea-${SLOT} icedtea${SLOT}"
 	JAVA_PKG_WANT_SOURCE="1.6"
 	JAVA_PKG_WANT_TARGET="1.6"

 	java-vm-2_pkg_setup
 	java-pkg-2_pkg_setup
-}

-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+	VMHANDLE="icedtea-${SLOT}"
 }

 src_prepare() {
@ -53,32 +62,35 @@ src_configure() {
 	else
 		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
 		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
+		[[ "${vmhome}" == "${icedteadir}" ]] \
+			|| die "Unexpected install location of IcedTea ${SLOT} '${vmhome}'"
 	fi

-	unset_vars
-
-	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
-		VMHANDLE="icedtea-${SLOT}"
-	else
-		die "Unexpected install location of IcedTea${SLOT}"
-	fi
-
-	einfo "Installing IcedTea-Web in ${installdir}"
-	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
-	if [ ! -e ${vmhome} ] ; then
-		eerror "Could not find JDK install directory ${vmhome}."
-		die
-	fi
-
-	# we need to override all *dir variables that econf sets
-	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
-	# the suffix the man page will end up compressed with, anyway
-	econf \
-		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
-		--with-jdk-home=${icedteadir} \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
+	einfo "Installing IcedTea-Web in '${installdir}'"
+	einfo "Installing IcedTea-Web for IcedTea${SLOT} in '${icedteadir}'"
+
+	local gtk_ver=3
+	use gtk2 && gtk_ver=2
+	use gtk3 && gtk_ver=3
+
+	local myconf=(
+		# we need to override all *dir variables that econf sets.
+		# man page (javaws) is installed directly to icedteadir because it's
+		# easier than symlinking, as we don't know the suffix the man page will
+		# end up compressed with, anyway
+		--prefix="${installdir}"
+		--mandir="${icedteadir}"/man
+		--infodir="${installdir}"/share/info
+		--datadir="${installdir}"/share
+		--with-jdk-home="${icedteadir}"
+		--with-gtk=${gtk_ver}
+		$(use_enable doc docs)
+		$(use_enable nsplugin plugin)
 		$(use_with javascript rhino)
+	)
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+	econf "${myconf[@]}"
 }

 src_compile() {
@ -87,9 +99,7 @@ src_compile() {
 }

 src_install() {
-	# parallel make problem bug #372235
-	emake -j1 DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
+	default

 	if use nsplugin; then
 		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
@ -111,6 +121,7 @@ pkg_postinst() {
 }

 pkg_prerm() {
-	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
+	# override the java-vm-2 eclass check for removing a system VM, as it
+	# doesn't make sense here.
 	:;
 }
--- a/dev-java/icedtea-web/icedtea-web-1.2.1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.2.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/dev-java/icedtea-web/icedtea-web-1.2.1.ebuild,v 1.1 2012/08/02 18:03:48 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.3.ebuild,v 1.1 2012/09/25 13:56:20 sera Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)

 EAPI="4"
@ -15,26 +15,35 @@ LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
 SLOT="6"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"

-IUSE="build doc javascript +nsplugin test"
-
-RDEPEND="dev-java/icedtea:${SLOT}"
+IUSE="build doc gtk2 gtk3 javascript +nsplugin test"
+
+COMMON_DEP="
+	dev-java/icedtea:${SLOT}
+	nsplugin? (
+		>=dev-libs/glib-2.16
+		gtk2? (
+			!gtk3? ( >=x11-libs/gtk+-2.6:2 )
+			gtk3? ( x11-libs/gtk+:3 )
+		)
+		!gtk2? ( x11-libs/gtk+:3 )
+	)"
+RDEPEND="${COMMON_DEP}"
 # Need system junit 4.8+. Bug #389795
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEP}
+	virtual/pkgconfig
 	javascript? ( dev-java/rhino:1.6 )
 	nsplugin? ( net-misc/npapi-sdk )
 	test? (	>=dev-java/junit-4.8:4 )"

 pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="icedtea-6 icedtea6"
+	JAVA_PKG_WANT_BUILD_VM="icedtea-${SLOT} icedtea${SLOT}"
 	JAVA_PKG_WANT_SOURCE="1.6"
 	JAVA_PKG_WANT_TARGET="1.6"

 	java-vm-2_pkg_setup
 	java-pkg-2_pkg_setup
-}

-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+	VMHANDLE="icedtea-${SLOT}"
 }

 src_prepare() {
@ -53,32 +62,35 @@ src_configure() {
 	else
 		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
 		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
+		[[ "${vmhome}" == "${icedteadir}" ]] \
+			|| die "Unexpected install location of IcedTea ${SLOT} '${vmhome}'"
 	fi

-	unset_vars
-
-	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
-		VMHANDLE="icedtea-${SLOT}"
-	else
-		die "Unexpected install location of IcedTea${SLOT}"
-	fi
-
-	einfo "Installing IcedTea-Web in ${installdir}"
-	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
-	if [ ! -e ${vmhome} ] ; then
-		eerror "Could not find JDK install directory ${vmhome}."
-		die
-	fi
-
-	# we need to override all *dir variables that econf sets
-	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
-	# the suffix the man page will end up compressed with, anyway
-	econf \
-		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
-		--with-jdk-home=${icedteadir} \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
+	einfo "Installing IcedTea-Web in '${installdir}'"
+	einfo "Installing IcedTea-Web for IcedTea${SLOT} in '${icedteadir}'"
+
+	local gtk_ver=3
+	use gtk2 && gtk_ver=2
+	use gtk3 && gtk_ver=3
+
+	local myconf=(
+		# we need to override all *dir variables that econf sets.
+		# man page (javaws) is installed directly to icedteadir because it's
+		# easier than symlinking, as we don't know the suffix the man page will
+		# end up compressed with, anyway
+		--prefix="${installdir}"
+		--mandir="${icedteadir}"/man
+		--infodir="${installdir}"/share/info
+		--datadir="${installdir}"/share
+		--with-jdk-home="${icedteadir}"
+		--with-gtk=${gtk_ver}
+		$(use_enable doc docs)
+		$(use_enable nsplugin plugin)
 		$(use_with javascript rhino)
+	)
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+	econf "${myconf[@]}"
 }

 src_compile() {
@ -87,9 +99,7 @@ src_compile() {
 }

 src_install() {
-	# parallel make problem bug #372235
-	emake -j1 DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
+	default

 	if use nsplugin; then
 		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
@ -111,6 +121,7 @@ pkg_postinst() {
 }

 pkg_prerm() {
-	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
+	# override the java-vm-2 eclass check for removing a system VM, as it
+	# doesn't make sense here.
 	:;
 }
--- a/dev-java/icedtea-web/metadata.xml
+++ b/dev-java/icedtea-web/metadata.xml
@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-  <email>gnu_andrew@member.fsf.org</email>
-  <name>Andrew John Hughes</name>
-  <description>Proxy Maintainer</description>
-</maintainer>
-<maintainer>
-  <email>caster@gentoo.org</email>
-  <name>Vlastimil Babka</name>
-  <description>Committer (CC me)</description>
-</maintainer>
-<longdescription>FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.</longdescription>
-<use>
-  <flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag>
-  <flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
-</use>
+  <herd>java</herd>
+  <maintainer>
+    <email>gnu_andrew@member.fsf.org</email>
+    <name>Andrew John Hughes</name>
+    <description>Proxy Maintainer</description>
+  </maintainer>
+  <maintainer>
+    <email>caster@gentoo.org</email>
+    <name>Vlastimil Babka</name>
+    <description>Committer (CC me)</description>
+  </maintainer>
+  <longdescription>
+    FOSS Java Web Start and optional browser plugin implementation based on NetX, to be used with icedtea.
+  </longdescription>
+  <use>
+    <flag name="javascript">Enable support for using proxy auto config (PAC) files.</flag>
+    <flag name="nsplugin">Enable the browser plugin (NPPlugin).</flag>
+    <flag name="gtk2">Use x11-libs/gtk+:2 instead of x11-libs/gtk+:3</flag>
+    <flag name="gtk3">Use x11-libs/gtk+:3 (default)</flag>
+  </use>
 </pkgmetadata>
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@ -2,4 +2,5 @@ DIST jffi-0.6.0.2.tar.bz2 1855529 SHA256 a2e5cd14484027807a2ab757d8010fb9903d33a
 DIST jffi-1.0.0.tar.gz 1627422 SHA256 9950edbaf897cc1fa10fb944336a86ceba92674f54a1eaf59b2ab4881825d25e SHA512 cb37052d0a2dc719d1f2ab2620c1a1908cf51c5d1e04d13caaecb3659916a59e8e46fa90c2b6ddb9a63f7b78f224233b9316908456aaf9ebbc1432e7592006c7 WHIRLPOOL fba9c40a55cef900ccb5207f5d93345869693fd7ba027388797499cf65bc584260c37fd0962c0037a83c2d05eb7958c193482a8967501bedbaa2f1465644494f
 DIST jffi-1.0.11.tar.gz 1899655 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a SHA512 0f98c1aa55dfd9fd9338399e173f118ef12d01a65429a49ed5264a23fa6700e7ebdf13ffb6b6318fcd8ea9dce66a47524c5cefa50f3f11a251ca44a4f38fd6aa WHIRLPOOL aa8c3f88b75a26221b3c41ed552fdd83c551ae05fc7455f072b8a3d7f3190cad26a638d1800a67b09d8074b5dfdd04f2be73287a7f22c0cfcc5dbc8df0d2ae12
 DIST jffi-1.2.2.tar.gz 1759433 SHA256 c4afe6e3c67f600f9f838c8526a711c5c7859d3d05f7ccb6e7926ef5e484edbd SHA512 d62e2de80703fad6fdf4ca758d7813389cdb1d7e0e8316f790d440a421df95f7a6a301c7b2f49f81ed76b17abde3031f755f6c69fa5cd3a6339b378ccf8c4a55 WHIRLPOOL 69fbf8c88f5ad60ef1a6f7ace917c3245c1eaed6e4cc0c0950f933635e31d8480b53286c5b7f8c8bf3aed9b87ce61e75ecc8a3b0af1288bee448206db3e2cdaf
+DIST jffi-1.2.5.tar.gz 1798081 SHA256 2101c48855558902f2e21baacd0b2c8b7098feb3ca1487a195c2bc3d9116ebd4 SHA512 2613a1874899e1a734ad54d68f7d969fe3bc12bd1ae1aaf5a63a17d63ac6ac6b9812740b7c7a771e66ba0e4ff02105c6a2427771d4571be40ae869f3d6f077e3 WHIRLPOOL 174303fc9f10cf295e009ef2320f9b13295f5e96187ab2ae4599de891b27e1279645ea47409eb8aec9a8b247a5568cddd6f8566950b64be37e399cb0eda0219f
 DIST jffi-git-0.7_pre20100131.tgz 1484965 SHA256 b2256550a38cd120cd61bebd61a76dd373994b62a1c31191c74aec3a0970e30a SHA512 772ca01f187245f524ab7f2b1ac712ed4d44d87237b222e6bc0357721ecb7a1cc2ec93e1556136db3b5dffa85d2bd4eb935e5610dddd8d03d84629afcce84c1e WHIRLPOOL 746557adee3a96ef82d8a459bc9d6bc5c9508b88bee539dfe07a9defdd40c8a55da8945493fbfe44a2125a92039f3754dd9da5fcf55d145176a67e7f44a93b9d
--- a/dev-java/jffi/files/jffi-1.2.5_no-werror.patch
+++ b/dev-java/jffi/files/jffi-1.2.5_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/jffi-1.2.5.ebuild
+++ b/dev-java/jffi/jffi-1.2.5.ebuild
@ -0,0 +1,96 @@
+# 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.2.5.ebuild,v 1.1 2012/09/25 10:41:34 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 versionator vcs-snapshot
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="https://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEP="
+	virtual/libffi"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	virtual/pkgconfig
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)"
+
+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 > src/main/java/com/kenai/jffi/Version.java <<-EOF
+		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 > boot.properties <<-EOF
+		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-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@ -1,3 +1,5 @@
 DIST jnr-ffi-0.5.10.tar.gz 559174 SHA256 6d13ae0ca2a63bcee0fcdb81263d676925658b0b466769e893279b453b636c9a SHA512 dc1eff430ab87dcecb798466088cc81fd92d5c44dfe473673635c3dfd7ad7e3e416d2086377b5b93b134902e7e6c3a736ef235f17a358a5a7f541dbaea41b2e5 WHIRLPOOL cef64a4e2db33262c4864b03c95303394c937682ceb9f9fad821932099c1f6e4eb6de36ae655c564aebf69bd4a99a1753839e49396b1adf1c9399bd8a16ef53f
 DIST jnr-ffi-0.6.0.tar.gz 97712 SHA256 91f7a1c21020892332849b9edc5ab7ad98dd7fabe03756fe0a48189ab796a24a SHA512 ea5997de1201c4d326ecd4753ed2ac11ba288d029508891a38e8a8ee8929b3622865057f9276373585414f88b48389ef607fd00474998ca4ce372a2cfc1e9170 WHIRLPOOL b205ecbce04e65981dc890fc0494dac01f5d47090535a336efc980f8877b64ceaf930fd157dd0a5de97987da61a0bbdb4b9cdfce9547d000f4f7c299d7167d60
 DIST jnr-ffi-0.7.4.tar.gz 130458 SHA256 8c17175a5aaaf5fa2ceea255606a745f864b0f81411a75b6a94141dbe50c0a3c SHA512 cd2dc44d7ee928a3a95e743f7a6ed3699238c47f8b45d95bee38fb20d6c68742300ac369f27f82815006d78fe6092268617def1c7c89fda7cc9038073d803539 WHIRLPOOL 350d1f6b3d30a5db5eca42c86d226d17cb0aa6323d14aee48fd708b3992090be1cb06d662126a6af65f5c94353e0daf1833a47635f3c2a31c630708c5b7e9518
+DIST jnr-ffi-0.7.6.tar.gz 130741 SHA256 05704880d11e90c5ae8b60dcddab63076e2c250ca282ae60d1d035d92e88c4d6 SHA512 dbd4148b9ad3ecab3a0e43ecc0761c828729f08b8df44c42a330c7e4b697062231a4e3fc4233233e7a73cc0c4b235a095dbe6907063c82cc32bfccb6cb83bdf5 WHIRLPOOL 30dd065a26f9019f4019cf71afd74de8f515ca219c231d4cd343a70d7e6e1e889c9ecc700fb274baa47fcefae9b940e1389afabca4f798a26c928c5bdd1d0636
+DIST jnr-ffi-0.7.7.tar.gz 130740 SHA256 d0f93346af0edd922e330975524f01f3dc5a2beb329fc5a62e32fd5153992807 SHA512 41a315fa6e03837e675a06d1f537a080430005c3a6ba63d03b3471998171a82b8205ba3d784a4d6b6ed4f94aeeac51121057580d51b14362216fac820eff2fa5 WHIRLPOOL 0ac7f995b396e95fdd80c470d2df328af7f97209feb09367ada66f49640a4fc413e111eb8e6748e9bd7341bc974e8b8dad2235be2de9b78621699b675d845225
--- a/dev-java/jnr-ffi/jnr-ffi-0.7.6.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-0.7.6.ebuild
@ -0,0 +1,61 @@
+# 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.7.6.ebuild,v 1.1 2012/09/25 10:43:21 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 vcs-snapshot
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="https://github.com/jnr/jnr-ffi"
+SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0.7"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jffi:1.2
+	dev-java/jnr-x86asm:1.0
+	dev-java/asm:4"
+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
+	)"
+
+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-4,jffi-1.2,jnr-x86asm-1.0"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+	# Fails, upstream pom has ignore test failures enabled.
+	rm -v src/test/java/jnr/ffi/StringArrayTest.java || die
+
+	# 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/jnr-ffi-0.7.7.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-0.7.7.ebuild
@ -0,0 +1,61 @@
+# 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.7.7.ebuild,v 1.1 2012/09/25 11:04:16 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 vcs-snapshot
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="https://github.com/jnr/jnr-ffi"
+SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="0.7"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jffi:1.2
+	dev-java/jnr-x86asm:1.0
+	dev-java/asm:4"
+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
+	)"
+
+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-4,jffi-1.2,jnr-x86asm-1.0"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+	# Fails, upstream pom has ignore test failures enabled.
+	rm -v src/test/java/jnr/ffi/StringArrayTest.java || die
+
+	# 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-netdb/Manifest
+++ b/dev-java/jnr-netdb/Manifest
@ -1,2 +1,3 @@
 DIST jnr-netdb-1.0.1.tar.gz 670834 SHA256 654360f56c4a0131df293b6dcaa96618dfa9ded549180284dbaa20e6305d8906 SHA512 d62718de9e9b0a0bb1463f6bf9dc22ca00d5d107f22fea77af0b5cf77ffb6d681d0ea345cad0301e0f9053f797fd0a502325c71b3bf8aea989232f73e3f18cbc WHIRLPOOL f4e0493a0df380fd372e407d2e5014c40dda88e832ab6324fc579d6a2469cad9a3aed98f268c43aaa35b966324de7b746287fb075a16ddd58068b5fa00f04523
 DIST jnr-netdb-1.0.6.tar.gz 648348 SHA256 097d621cc5ac8550e1b1bcafc034bfadd9a7a307f7133b7b7fe5ffdf38782c4f SHA512 61ddb9c7eaae955eb732ba3cec5222c231b17ca76f8b729cafcea8fc7c0fadfc80bb4c061dc4afb918e983719fc4451447f7fe290282fd9b90ab0f66d71f60e4 WHIRLPOOL 09c6e6bb668beb96083cc8588901e678ef903545675efda7ebba0e82dd36827cb68822954b21e2a30ecb06219644a36a19fa63237b00d36e43151230336a4e88
+DIST jnr-netdb-1.1.1.tar.gz 648340 SHA256 077cc3612d4033c795f315d3fe1672ed47960d5b68a6e8bce0b107e3103992d0 SHA512 8fe5e7538aef142713f1b0956040b5e5069f263de5aad4ac71737aacf96f95a779f3ed11c7cc725d2ae55a4a6016c1fc8ef9c7a6b3548e6975d0fd0801060ec3 WHIRLPOOL 0d587154cd0c1232969c003dc4f00a752bec84eefbde87f2036a62f8c9a421b334cefa7fb981ec8003b279ad0657e313451bf4fa1775be1a2513f85c14be2e24
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.1.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.1.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-java/jnr-netdb/jnr-netdb-1.1.1.ebuild,v 1.1 2012/09/25 10:45:52 sera Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 vcs-snapshot
+
+DESCRIPTION="Network services database access for java."
+HOMEPAGE="https://github.com/jnr/jnr-netdb"
+SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jnr-ffi:0.7"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	find -name '*.jar' -exec rm -v {} + || die
+
+	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-ffi-0.7"
+
+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
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@ -2,3 +2,4 @@ DIST jnr-posix-1.1.4.tar.gz 195235 SHA256 efac5b9239a2d89036d26e647b55a3dac52eb0
 DIST jnr-posix-1.1.8.tar.gz 206617 SHA256 c66c469cd97ed5a1f1cee10f71ea4a50c18c96f47019d93508aaef3d2a6fa9b1 SHA512 566289eefcf4c277145621aefcd5c412b38e2feb5d1c0297ee9b3945223278aca4ee4914c55c638230ec968ead3c952773aeb49072b3883c0bb04fe7c0d7cae5 WHIRLPOOL d74ba3c21c419cf9c0f02abbe76728a61f622a8c8e03da84c661ad9690cce1f8238003d15e0349ed12220c581fdbfc05c9b3cc436286bb400a40b30500ce5783
 DIST jnr-posix-2.0.0.tar.gz 54286 SHA256 e7121253092afd81adf2a28225ee92b5adb8bcb36e3d9aa159b5861fb8b27400 SHA512 be2e803a1d3c01bf512671fccda3562f2f5213a4c5c3189202c7ab8ea3c783856cae35738b2e4c4ba44631ca2d3bbab804ae8428f59dd419b13d14e1c37b3c3c WHIRLPOOL abcf1ba825c4cd1fd129f3af85d6aaa4116242636f1dd1b971795d4d3d52be1f9f2962e2c216edcc0b86d021b12ee3a383825af7b126ebd3f3f2c9dee0e379af
 DIST jnr-posix-2.1.tar.gz 59192 SHA256 f7d89fa5066f9bac80ec8a6b8c8f9e99f66fa2fe898a54ff4459ce8e1190a10c SHA512 48ec22255b5f60eba6b9c2d976f28a9e0d5520ab8c8cf776938fec08b29fe2824e2f1ea15f5a5597f995a37cba3645419de5f81d81ede8a9e4a75cceb5369792 WHIRLPOOL 2288bbe545b1be079c51cc85e9ac2417d44d9778e5cfbd466094e640dc58b15e0e3dad75da66480aaab79efd7e5f3efae47efb95a5e1eddfed4b79fca286fcd9
+DIST jnr-posix-2.3.0.tar.gz 59201 SHA256 c7209964c32e1ef2410d6a4334e681a5b0c8e43367aaeeb06073f31bc34a70f1 SHA512 87dc887f51cb1a000d373415b7e19d305433fd78b59103503b96e4f8f57a299200b65593704f7debc132dc6ebae97c7d24369ef412f739b86949eaa839d029cb WHIRLPOOL 411fa26a049c6e97716a03f2402fcfb899334535c819c7599b1fb6d34128f7b7c2bbbded601fd8f7901e577ca99d3d6511b997abf058b1d821c0fbd66fd1bd74
--- a/dev-java/jnr-posix/jnr-posix-2.3.0.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-2.3.0.ebuild
@ -0,0 +1,57 @@
+# 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.3.0.ebuild,v 1.1 2012/09/25 10:47:17 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 vcs-snapshot
+
+DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java"
+HOMEPAGE="https://github.com/jnr/jnr-posix"
+SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
+SLOT="2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/jnr-constants:0
+	dev-java/jnr-ffi:0.7"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit
+		dev-java/junit:4
+	)"
+
+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.7"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+src_test() {
+	# Fails, upstream pom has ignore test failures enabled.
+	rm -v src/test/java/jnr/posix/FileStatTest.java || die
+
+	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-lang/gnat-gcc/Manifest
+++ b/dev-lang/gnat-gcc/Manifest
@ -1,30 +1,32 @@
-DIST gcc-ada-3.4.6.tar.bz2 3784327 RMD160 6984d622622b2d2fcd2fc61588d421b0375984f7 SHA1 02a6d26e48fe654077aba94fa27e93df2db16d06 SHA256 d5bfb166b2ad287ba85ebba533cca4453b521479cffc1bd3c6d273f6b3d794e2
-DIST gcc-ada-4.1.2.tar.bz2 4589609 RMD160 9fee74690503a8df2653cbb3eecf0a29375ba535 SHA1 4b3c39bd9ff80f4ce4cf7dac8d38403f91b75cef SHA256 703125c4d033c666b52db2aeee0a05e3461467fe8ff6e5e588b5cdb8c6928bb0
-DIST gcc-ada-4.2.3.tar.bz2 4740243 RMD160 dd3dc58d87a24fef7f33a0a04e13de30d7cc6758 SHA1 fcf69fbc1d802ef1349a14ccdf7e9a53028d90e0 SHA256 08956727415fb1721c5c89ef33ebe94ab718459e88f7cd4589fc1c2b7e98cb4c
-DIST gcc-ada-4.3.2.tar.bz2 5291314 RMD160 65f045756bb215186fcbb646a13743e146ebc8bc SHA1 f5c4b2d7a35e55ee801ec1915a824d403f2367fd SHA256 98d112e1e0bdea5f520b08ea352931fd353085628d12cb9553d5794cb43e8c26
-DIST gcc-ada-4.3.3.tar.bz2 5236690 RMD160 53699ae21041d185a2b91678ad098aa6be9de5b7 SHA1 5111d261d8d7254305831e8577eb5eb7d9cf33fb SHA256 d49eb8d58b23a39149f10f55a7cc60f77e73d1bed88659e5cc5226ddd0a8ffda
-DIST gcc-ada-4.3.5.tar.bz2 5231691 RMD160 f4d667913e1157c0010fb496206e7f9be9d25209 SHA1 887d7a8af8ab2d990d1991a229bcbf662c790a04 SHA256 e3e4a0836820e8b1b7b4b00b529568a2d51ed9ec3933fbd44c7b1c04ad3076de
-DIST gcc-ada-4.3.6.tar.bz2 5309618 RMD160 5394146041721369bf9d912bd2430095e5ec5e16 SHA1 d121d7c7fff9bef6f43d0797238fefc91a7b82f8 SHA256 a2721a41965f361938bc9d86e3cc7ba12dc6b7efa24cbe5d9f9c84882b9caf31
-DIST gcc-ada-4.4.3.tar.bz2 5470203 RMD160 f908c510ae7768c4037990009160b1040da255c4 SHA1 f4ec5d0238a6c2fd5049ef0ee22df509c349f7b7 SHA256 67cec15254922d71790e80f150f24e13cdaac60804d46cb17bed9df7f874d290
-DIST gcc-ada-4.4.5.tar.bz2 5470412 RMD160 dd9720b8c2f70e76b48e9e875880d6887360f8f6 SHA1 f65acd7003d6dc5305571941a706502a134cc8c2 SHA256 0fdfd6318faba7bd39dde6fdc78c8334636be1e9fdcf4bd84f39372882abd177
-DIST gcc-core-3.4.6.tar.bz2 13366790 RMD160 510f512c1de3e0b67c68aeaf9933a547f500b6d9 SHA1 5f41c5e31fdc04e83fa16b07729866d53ffaadce SHA256 3aab171d86e5a6c14cb9de35467a0472a7d5ef1d5b79a1df72ca533f8e82a133
-DIST gcc-core-4.1.2.tar.bz2 17485561 RMD160 612cbd5b795f7095fb3f565e6a8eaaee82c472c5 SHA1 d6875295f6df1bec4a6f4ab8f0da54bfb8d97306 SHA256 7be9c5df8000ae35d0928f0a254bfb5e8478cad5e5e57fd07820530c03b3711d
-DIST gcc-core-4.2.3.tar.bz2 19319213 RMD160 1ced09156d8444bba7eb2550a969f72b788d4bc5 SHA1 0896a32b36f2fcd3dd39c8424b548fab87b33873 SHA256 99ec052e13e8c2bc7d1db86d1c98fb651d45fd3e8ea90b0981c47f6e8826c813
-DIST gcc-core-4.3.2.tar.bz2 23830073 RMD160 96f5c9eeed2bd489ea6422908635c0aa93013e52 SHA1 8137e6f12fea6730873ab6230e6f6a768443de83 SHA256 0687e7279d78eb963ac34a3b06a0a6a1d1e9a26807ef4939cf4a2ad5f062e75a
-DIST gcc-core-4.3.3.tar.bz2 24355225 RMD160 2aa8c759f153d033449ce2b735a13c374d17564f SHA1 b907061e5788d7060bfb94396152ba9fc0786f91 SHA256 4690f4ef0218ed9795509ca05cbccaa6023fde943c83e1625db8627be3d6d323
-DIST gcc-core-4.3.5.tar.bz2 24828441 RMD160 b365da063ead1d851432e6d8b076580da544e092 SHA1 87b1fef7009b7cf42f9a9df9c8d4609bc8dda9c5 SHA256 ca57b06732a9a4123d6685fe58f3550afadf063107016e3f15c2b32447612711
-DIST gcc-core-4.3.6.tar.bz2 24448503 RMD160 d4bed0820d5eae5072e30fa66167fda4fc2f0bbc SHA1 d9dc274ad558194e7d9bacc49c333a4870d7e613 SHA256 86af1703be5cc7f40270a66ac15ebcf6088706a789ae1bf18488dc070777f979
-DIST gcc-core-4.4.3.tar.bz2 26336901 RMD160 28b61b91dfca8632c327205226434736c2662223 SHA1 039f19e642d0967af7772b26d42fd0c25bf62edc SHA256 92f311e6be22a2096c765bc8be72bd7fef56bba73f053b3de025b9c92d308356
-DIST gcc-core-4.4.5.tar.bz2 26356188 RMD160 0a8819dd97fa616944e546df8fed24a8f0ca9b29 SHA1 8e2202cde3be496f0452219c60311f8fe36f87f6 SHA256 dbf012d5616b51d072383a32f71d4217239e7f0096acb07bbf266529a347ab4b
-DIST gnatboot-3.4-amd64-r2.tar.bz2 12063245 RMD160 6be578cb8938e872b39d2420c2151d4b8b574f20 SHA1 ce67f3147a5d009ffe5d92cc5ef116f32e772bb0 SHA256 c0c2fe91f6c38483193415690a4f90ac205e3aa9cf42ab3ab3e5d2a3ec269d8d
-DIST gnatboot-3.4-i386.tar.bz2 10629373 RMD160 27a3189be4a1f699b438f777679890b93a51eb1e SHA1 78d5aa6c9800ab978db1fbf93255ed70fe188dbc SHA256 7b4300e72b7f00d2fd9d0dad6940c3e6b4e19eeaf4696e92d7c92e2a38e8b049
-DIST gnatboot-3.4-ppc.tar.bz2 10996302 RMD160 de56dbb14346f41023ae06445d830c6bd9bbf50a SHA1 87c068ddb7bb14b87e04765e2c3c2997064e8770 SHA256 1f164834e377604a943b230196d9f2a40e8e6753bac4c980d5ca2c00c7674363
-DIST gnatboot-4.1-amd64.tar.bz2 15314736 RMD160 d3042072827d66dff67e57559613f7d4136c8443 SHA1 c6a3b213209019579da7660147211c2bc9e6a348 SHA256 a4016920b84f5934ec7120c7bb17c1028b193d5e146a46a9d1ceae4a456924d2
-DIST gnatboot-4.1-i386.tar.bz2 15367514 RMD160 3a5dcd646a9abe75a62410a9daaf749171bf5aad SHA1 a7229124084a9e842686eb3c255e42bf432d7b3b SHA256 597b4a16f38fb173b1eecc259c1566ccf81291e13b88e2160102a512cefcc518
-DIST gnatboot-4.1-ppc.tar.bz2 13651598 RMD160 1890d8ae2e744d8a26ac5f9d1cf7c923637fff8b SHA1 017efeb76d9283bd90c431b06ddcb7dc91055e07 SHA256 2c9ed035b964a7dfcc427cb5c16dc30d3b99276fb424d25b0ebfde23a68013eb
-DIST gnatboot-4.3-amd64.tar.bz2 20294401 RMD160 6c5ea6c183ffb6323e9eaf89ccd2b5f85640b2ae SHA1 43e450a9c38d90460a493d26b716ee4af642a19b SHA256 3506500b4cda06eaaf9bb70ec26fbe9be2a05b1f8edf0b2f7aeceb451a558333
-DIST gnatboot-4.3-i686.tar.bz2 16065767 RMD160 cc55768d1c924f63a5e40debe987d1a08a86ac51 SHA1 ef65dda2ab20ebf2fbb678d9dcbb05de8b51b79b SHA256 7afbea3216c24dde950d7d511e5fc897db5e5c8099ff4a524048519abc54f0b9
-DIST gnatboot-4.3-sparc.tar.bz2 13065130 RMD160 fd80c9fc8a3930e884daa0b86147871a1ee58b87 SHA1 fdf3b93414b050e552ee999ab50329580e1a0bf8 SHA256 e234336123fd65c0f73cd25af99dbb439ea08f0286fe7f5b1e05dd414b9878e7
-DIST gnatboot-4.4-amd64.tar.bz2 26117669 RMD160 caaeb84005b8160eb1d3a084bd41710e677b7dfc SHA1 f2f2eddb5a7fd1f49c54cbb4fc9f49bcd67f0267 SHA256 fd6c6ea6e4d57eb178d239a8b1e4d99d6638cb9d7d322c0789b37e8ed6a49b67
-DIST gnatboot-4.4-i686.tar.bz2 17194327 RMD160 71da7eb6334c47a757f64f50ffde79281f5a80ec SHA1 c4113d2edd96aca56ff1c6f8848381e450c8d6f9 SHA256 1081cdf2514fd1c03b40f0923d0046ffd2886b3bc6eabd217eaa40da1765ba5b
-DIST gnatboot-4.4-sparc.tar.bz2 13962662 RMD160 2cc4a2fdd45ae2bdfdd9ca66538ae9fe07c4413a SHA1 b6b71f95f6f6cdb8b26bb005b8753f4443a0bb7d SHA256 467fa1da5ee4c769a10b2c870e132e1bf7827688e88860fdd27259e9b258109b
+DIST gcc-ada-3.4.6.tar.bz2 3784327 SHA256 d5bfb166b2ad287ba85ebba533cca4453b521479cffc1bd3c6d273f6b3d794e2
+DIST gcc-ada-4.1.2.tar.bz2 4589609 SHA256 703125c4d033c666b52db2aeee0a05e3461467fe8ff6e5e588b5cdb8c6928bb0
+DIST gcc-ada-4.2.3.tar.bz2 4740243 SHA256 08956727415fb1721c5c89ef33ebe94ab718459e88f7cd4589fc1c2b7e98cb4c
+DIST gcc-ada-4.3.2.tar.bz2 5291314 SHA256 98d112e1e0bdea5f520b08ea352931fd353085628d12cb9553d5794cb43e8c26
+DIST gcc-ada-4.3.3.tar.bz2 5236690 SHA256 d49eb8d58b23a39149f10f55a7cc60f77e73d1bed88659e5cc5226ddd0a8ffda
+DIST gcc-ada-4.3.5.tar.bz2 5231691 SHA256 e3e4a0836820e8b1b7b4b00b529568a2d51ed9ec3933fbd44c7b1c04ad3076de
+DIST gcc-ada-4.3.6.tar.bz2 5309618 SHA256 a2721a41965f361938bc9d86e3cc7ba12dc6b7efa24cbe5d9f9c84882b9caf31 SHA512 c9f253050bc355a5dca27fcef41f93772f41cfe2dfd41eecf390019318eded36c897f40812dbe32f14e3f7a4e0625f0fc87461bb03dba2f1385f396aa53e8f64 WHIRLPOOL 143ba164866e35c69dcbe9dfdb44b4473731ef11d0b36e281f29b357b2ccc6d3f826a938539c788afe31b648493fea394b8a28577913105e47740c582cad181f
+DIST gcc-ada-4.4.3.tar.bz2 5470203 SHA256 67cec15254922d71790e80f150f24e13cdaac60804d46cb17bed9df7f874d290
+DIST gcc-ada-4.4.5.tar.bz2 5470412 SHA256 0fdfd6318faba7bd39dde6fdc78c8334636be1e9fdcf4bd84f39372882abd177 SHA512 fcb344b53f3cfeddfd5b504b0bc419ef28bd770c45c6731fa97ca70acb64a3e3d9b5c76fbe3e89142c90563bc480724aea0f70a0f157dafc6a3998894523abd8 WHIRLPOOL 9008cc7225ce6ea1658c18fe0d0fbbb801a31f597c57a55c99a0a4d63a83da53440fa3473644f680449a7186f4c46cfe833b5b758884d533ebf379bd00bff9ee
+DIST gcc-ada-4.4.7.tar.bz2 5492474 SHA256 fb9f30b85d48838390554b948d137487f0db09ad5f8ba73ca4d7ca35765c6ed8 SHA512 4447dfb2353018108ffc88a0fdeccca224a5fc9e4cbb75d8ee136c38c2937a368a677ff6e4df1a1431338fc1adc26fcd1f0f9cf963e5e98e4e28bc22e7e72cb5 WHIRLPOOL 5f6d7356d74725c0658e79ba1022df187cc08588835dae49867dc29c62b9b61d11e265b1a4636fe3e152b45a0bc65bb45ae69cac4ed1cd0447cc7603398adf44
+DIST gcc-core-3.4.6.tar.bz2 13366790 SHA256 3aab171d86e5a6c14cb9de35467a0472a7d5ef1d5b79a1df72ca533f8e82a133
+DIST gcc-core-4.1.2.tar.bz2 17485561 SHA256 7be9c5df8000ae35d0928f0a254bfb5e8478cad5e5e57fd07820530c03b3711d
+DIST gcc-core-4.2.3.tar.bz2 19319213 SHA256 99ec052e13e8c2bc7d1db86d1c98fb651d45fd3e8ea90b0981c47f6e8826c813
+DIST gcc-core-4.3.2.tar.bz2 23830073 SHA256 0687e7279d78eb963ac34a3b06a0a6a1d1e9a26807ef4939cf4a2ad5f062e75a
+DIST gcc-core-4.3.3.tar.bz2 24355225 SHA256 4690f4ef0218ed9795509ca05cbccaa6023fde943c83e1625db8627be3d6d323
+DIST gcc-core-4.3.5.tar.bz2 24828441 SHA256 ca57b06732a9a4123d6685fe58f3550afadf063107016e3f15c2b32447612711
+DIST gcc-core-4.3.6.tar.bz2 24448503 SHA256 86af1703be5cc7f40270a66ac15ebcf6088706a789ae1bf18488dc070777f979 SHA512 6bc477282a72dca697db4b4bafb221a77f95945eb867cd109c9593f6ec7471152d9cabdb62ce84761d624d196a5da0ad5f3218e959ba1b86506ba54b095b62aa WHIRLPOOL a9a21920f3d860f9d1aace6c53dd9e5b6c29102bfb432ea7c2d1819a37fe77c29a92d652f4a4cd74adb850f79fa5e58e79a1c1c77d9c61df38f1af68c6015c5d
+DIST gcc-core-4.4.3.tar.bz2 26336901 SHA256 92f311e6be22a2096c765bc8be72bd7fef56bba73f053b3de025b9c92d308356
+DIST gcc-core-4.4.5.tar.bz2 26356188 SHA256 dbf012d5616b51d072383a32f71d4217239e7f0096acb07bbf266529a347ab4b SHA512 4578855724443f5504750387a3eccc3491d2148456dfc4f0d21d84ce89f333abee59182bf485a5e9f59f87c5c425c989c6bd3fcfbf8dc97c12a2564f4117cd4f WHIRLPOOL ac6954df0a8469086e8be663bb3646d41860dc7bdf274e2261ca309bd39d11eb561dc70f34acb6163b7a3b856c743b28570d459eeebf7799887ee07e11cbaba3
+DIST gcc-core-4.4.7.tar.bz2 25784094 SHA256 c4663b7023909a4a075d3c2b2e17f6e082a9625aebfd0ce7f1d7817e44bf5542 SHA512 318522e170a9e54d051311416dc221d8d727a85d6e24a97fdbd9125d9dea1530930efd04b846c06ddbe3c5acaeef8810e0d4e79b8e9af535f0b08f1f20e5b10b WHIRLPOOL c2964330c174236e734d78ad80462a050b27d23f6b96a66bd5a4c1fce0d5cd4d35c9fba759ffe94b542805fb405071cd05e0945a4806fd8551c285eae7247ffd
+DIST gnatboot-3.4-amd64-r2.tar.bz2 12063245 SHA256 c0c2fe91f6c38483193415690a4f90ac205e3aa9cf42ab3ab3e5d2a3ec269d8d
+DIST gnatboot-3.4-i386.tar.bz2 10629373 SHA256 7b4300e72b7f00d2fd9d0dad6940c3e6b4e19eeaf4696e92d7c92e2a38e8b049
+DIST gnatboot-3.4-ppc.tar.bz2 10996302 SHA256 1f164834e377604a943b230196d9f2a40e8e6753bac4c980d5ca2c00c7674363
+DIST gnatboot-4.1-amd64.tar.bz2 15314736 SHA256 a4016920b84f5934ec7120c7bb17c1028b193d5e146a46a9d1ceae4a456924d2 SHA512 ddeaa365ef3d127cc0bce0d7d242804dfc3a2d5612d89f08fc0ffaf63501a326168935facf359a963dda1484b76bdad01e42629c03d123f3693324038d8e5f75 WHIRLPOOL e845041091b2dddf3b4adf6628b5fd132e47758a75332715f0f99c9363d7840e66fbde92cc717a450a49cf8b736bd47bdb6e0c2e9528130c01ef8827c4348bc5
+DIST gnatboot-4.1-i386.tar.bz2 15367514 SHA256 597b4a16f38fb173b1eecc259c1566ccf81291e13b88e2160102a512cefcc518
+DIST gnatboot-4.1-ppc.tar.bz2 13651598 SHA256 2c9ed035b964a7dfcc427cb5c16dc30d3b99276fb424d25b0ebfde23a68013eb
+DIST gnatboot-4.3-amd64.tar.bz2 20294401 SHA256 3506500b4cda06eaaf9bb70ec26fbe9be2a05b1f8edf0b2f7aeceb451a558333 SHA512 29a74d636d3566cd01ae3ed99c7b71146ee971639ad119dfacc4b502c76f8556cbf7a7f2d1d95b4dc85dcaebff1ab89244e2ee6c063ce0888f915bd7c8a6faeb WHIRLPOOL c4b83d27063b5a888f705d3c8ec404bb11573e9376d3e0704a47be59e057fa5b9a62e6807ae72a0fd2b7c198bcc1584fb6b4e1d2d09054a03cc73a8a16a4b17a
+DIST gnatboot-4.3-i686.tar.bz2 16065767 SHA256 7afbea3216c24dde950d7d511e5fc897db5e5c8099ff4a524048519abc54f0b9
+DIST gnatboot-4.3-sparc.tar.bz2 13065130 SHA256 e234336123fd65c0f73cd25af99dbb439ea08f0286fe7f5b1e05dd414b9878e7
+DIST gnatboot-4.4-amd64.tar.bz2 26117669 SHA256 fd6c6ea6e4d57eb178d239a8b1e4d99d6638cb9d7d322c0789b37e8ed6a49b67 SHA512 bf68582e8e8ecc9c4f4dbec90ef47edf10769ca7a2dd197b065f44e5ad1e40b81c44592bb362651654b187ebad972095176509273b5e98edc1a26c2164075d80 WHIRLPOOL 59d714a3ea70dae7c4b9e6d177336810bbb5ea7bcdbe038c7c34d543ef8c45f40d240ecbc58de1b49c88904b245cdd3ef9121bc88fa3bdecf413762f67301cde
+DIST gnatboot-4.4-i686.tar.bz2 17194327 SHA256 1081cdf2514fd1c03b40f0923d0046ffd2886b3bc6eabd217eaa40da1765ba5b
+DIST gnatboot-4.4-sparc.tar.bz2 13962662 SHA256 467fa1da5ee4c769a10b2c870e132e1bf7827688e88860fdd27259e9b258109b
--- a/dev-lang/gnat-gcc/gnat-gcc-4.4.7.ebuild
+++ b/dev-lang/gnat-gcc/gnat-gcc-4.4.7.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-lang/gnat-gcc/gnat-gcc-4.4.7.ebuild,v 1.1 2012/09/25 10:38:32 george Exp $
+
+inherit gnatbuild
+
+DESCRIPTION="GNAT Ada Compiler - gcc version"
+HOMEPAGE="http://gcc.gnu.org/"
+LICENSE="GMGPL"
+
+IUSE=""
+
+BOOT_SLOT="4.3"
+
+# SLOT is set in gnatbuild.eclass, depends only on PV (basically SLOT=GCCBRANCH)
+# so the URI's are static.
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-ada-${PV}.tar.bz2
+	amd64? ( http://dev.gentoo.org/~george/src/gnatboot-${SLOT}-amd64.tar.bz2 )
+	sparc? ( http://dev.gentoo.org/~george/src/gnatboot-${SLOT}-sparc.tar.bz2 )
+	x86?   ( http://dev.gentoo.org/~george/src/gnatboot-${SLOT}-i686.tar.bz2 )"
+#	ppc?   ( mirror://gentoo/gnatboot-${BOOT_SLOT}-ppc.tar.bz2 )
+
+KEYWORDS="~amd64 ~x86 ~sparc"
+
+# starting with 4.3.0 gnat needs these libs
+RDEPEND=">=dev-libs/mpfr-3.0.1
+	>=dev-libs/gmp-5.0
+	>=sys-libs/zlib-1.2
+	>=sys-libs/ncurses-5.7"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-1.875
+	>=sys-libs/glibc-2.8
+	>=sys-devel/binutils-2.20"
+
+#QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatbind ${BINPATH:1}/gnatmake
+#	${LIBEXECPATH:1}/gnat1 ${LIBPATH:1}/adalib/libgnat-${SLOT}.so"
+
+src_unpack() {
+	gnatbuild_src_unpack
+
+	#fixup some hardwired flags
+	cd "${S}"/gcc/ada
+
+	# universal gcc -> gnatgcc substitution occasionally produces lines too long
+	# and then build halts on the style check.
+	#
+	sed -i -e 's:and Nam is "gnatgcc":and Nam is "gcc":' osint.ads ||
+		die	"reversing [gnat]gcc substitution in comments failed"
+
+	# gcc pretty much ignores --with-system-zlib. At least it still descends
+	# into zlib and does configure and build there (gcc bug@7125?). For whatever
+	# reason this conflicts with multilib in gcc-4.4..
+	sed -i -e "s:libgui zlib:libgui:" "${S}"/configure
+}
+
+src_compile() {
+	# looks like gnatlib_and_tools and gnatlib_shared have become part of
+	# bootstrap
+	gnatbuild_src_compile configure make-tools bootstrap
+}
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@ -1,4 +1,5 @@
 DIST nasm-2.09.10.tar.bz2 803380 SHA256 e3afb011f762144b4d13acb1f2d9363e4a73264dc6f2d3f4dab358c8203dd59e SHA512 bc8648cc1bf4e97de4d27da0dc91ead8ee32aa35c74d13616e0af9691464d70e2e15ca288af195f867e7b6118cc913f98ed7b6955c4e9b0dc4702634ac4debef WHIRLPOOL 9ce1631f29daecf6cab8e8e753586faf391f4930c6aa1dabb723edcec74fdda61e61d3b459290fffe82660bfc08ffd808211a63e52962ce5c002c0c9ed20717d
 DIST nasm-2.10.01.tar.bz2 813979 SHA256 ac9b37d265c35492ab1bc29dd5a4f3da11b42dd9fea7a31d95f6cb4c812bda84 SHA512 f028bde12deb8ddb558a4c37581874011c4083a0b3121581978735f8098a143321a99e0f2013bb6d045810dad51f933632508deea28d8428f7552f822813872e WHIRLPOOL efd048f8242e1ed31bbe476a69b262a5856bab50010dcada31f94df40bf0a2f3fcc8a3bca8811acc33c8c9cc9b18a2772b4a14804e15c235956c52685dc01754
 DIST nasm-2.10.04.tar.bz2 813956 SHA256 6ad90fca575fc87d4b093c3f84f3148ef9f0453471723f4971ccbddaa9882b27 SHA512 a55ab9c09e0ee2ac9a73aadbeafaecb940288a2bb38442cf840b54cc6c61f6a67e42cb63dee67a58b8e05e44cd9a162cdf3af7e7a42dfbdee16496119499329d WHIRLPOOL 996f79484a2edd2bb63dff512f5722cf09a6a0086e51a4e918cbee4d2aa4aa57fd1fdb83f0a0d0c23376b2dc949a02f6218a704446f87278e2a42478576f5f5b
+DIST nasm-2.10.05.tar.bz2 814524 SHA256 de5af263ce344d3a89711c61802e3ad8a4e14a61d539f521f7554cdbbe04ed0f SHA512 0a0a8752dcea6b1d205c265f72d7bbd56c90f8ea1438af3839696d21523cda7ac98441ad148c3ca0f0f3b18d83c989213d6e4366cf479b300749879e0c0fcbf0 WHIRLPOOL 1c9e19dccb9c5d5484ccc5a664dc4b5532d7cc1f80b3551ad06b1e6cf796ce845a075f678240a95c171e96321dd4bea0deb35af856ea48f8546d37760ea00da8
 DIST nasm-2.10.tar.bz2 815091 SHA256 687aa1a69b78801b7d85ca2b7f1c73503eb5925b17f1ac243f61194023a89df1 SHA512 b6e0ef7a932a54562c58133603fe0527d70b56c6bab808282a82359ac2b3d7457e0a53fba57ab0b45559c136a0223eee9c6a996bf5af7d51b5ea1b217c76fa18 WHIRLPOOL 7c9d1af9d01949792bb5bbd9bb271e331e98e90643c2c6a81f18fa5e16fc97b641d350707c149b4c6a6cea2f9274ad0d6ccbf6dc2d4f90fcd3cddabd046452a9
--- a/dev-lang/nasm/nasm-2.10.05.ebuild
+++ b/dev-lang/nasm/nasm-2.10.05.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-2.10.05.ebuild,v 1.1 2012/09/25 04:50:16 mr_bones_ Exp $
+
+EAPI=2
+inherit flag-o-matic
+
+DESCRIPTION="groovy little assembler"
+HOMEPAGE="http://nasm.sourceforge.net/"
+SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+DEPEND="dev-lang/perl
+	doc? ( app-text/ghostscript-gpl sys-apps/texinfo )"
+RDEPEND=""
+
+S=${WORKDIR}/${P/_}
+
+src_configure() {
+	strip-flags
+	econf
+}
+
+src_compile() {
+	emake nasmlib.o || die
+	emake all || die
+	if use doc ; then
+		emake doc || die
+	fi
+}
+
+src_install() {
+	emake INSTALLROOT="${D}" install install_rdf || die
+	dodoc AUTHORS CHANGES ChangeLog README TODO
+	if use doc ; then
+		doinfo doc/info/*
+		dohtml doc/html/*
+		dodoc doc/nasmdoc.*
+	fi
+}
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@ -2,5 +2,4 @@ DIST vala-0.10.4.tar.bz2 2418192 SHA256 4d23bd8b904ec59537ed5bcf44064104ccc41d63
 DIST vala-0.12.1.tar.xz 2286024 SHA256 f102bb64549ebe88955bb9fa0f502d974413aec71fec88e3544c65adfeb0afb4 SHA512 7f783aaf5b5a39f6d9d425a6c0ced10451454a7bc975c019dcbba83ea7c0cf381fc5647d3ac8dc5b3f94f611185ec7a30337c53ab68641513ba7c5bae31f7a0f WHIRLPOOL bfdd27e3fedf0bf65249196dca718592325e4967364a983be5c369e1e0a8bb3f91ebc0ee4e0c628db6d762bd376bec1863a6e0337358b12a2d132fb64b5aee8c
 DIST vala-0.14.2.tar.xz 2640560 SHA256 807e6978484f66cab3cf4fefd72f37a4293d2831d7a5fd29119bdf9d38a5b3d0 SHA512 e6cfe7b22a351d54980402f899fcb4aa3e81eef252d20da1b748c5845211cdb5e09c0976d69b1d3971cb817871db734cbfac6dffb969c8661c58ee77f515abe5 WHIRLPOOL b36b37fd5b5de1e1d9ad4cd5907d01f64a31a6b8d48f9bf4d59f097aa7e7038c8f04bbf50091e33bb114cf8186cbf7c55c6e99bf1e9a763ac2abbd4e21d8eeb7
 DIST vala-0.16.1.tar.xz 2636952 SHA256 8be28ff6347feecb391220ceb4e2209d32b697278e87ed7fc6c9fb1e9345e0d8 SHA512 caf4a58a72b146611e59c7a65f8b0fba9412002a3aa3039ef20f47b05a527da7d46f3eafa24ff6b8e8ac0ce48b72e6b038135106aad4519df8a88c26351c0987 WHIRLPOOL ce99be65e8749cc53c17bc25d5344e1572474d77c0118347759f7de960ec438a99421f040ba17e6b040fb5bd937e1b235f85401b05153db367f4cb6072f47a58
-DIST vala-0.17.6.tar.xz 2532996 SHA256 79bfa454813c22ca9eb0864a77bf51764e8944dc02c7e4b301feb45d782e2e25 SHA512 6f220f996d369d9aa7b446d0fef832350e7afd88d642384fec83aa46579fc007449a5a2cb31704896c2d96e8784431d3e2cf62ead70aeb5ec0d48b2afcd4ab23 WHIRLPOOL fd2dbfa1a01855398813f1504d1dddaac5b2b54be494d492eeef0a7453e57219cb361f6ce8b50800c12ec94d60096cb7bdafb7fedc4e154518d5330833732468
-DIST vala-0.17.7.tar.xz 2582860 SHA256 dfdb9b3cb1c455462a57fd71a7e832c3b7b4131e85d2d0a2030111dae9fae24f SHA512 ae75c12638a41ac532d1f4a08687a19d33c847ccecede65b430d64e03a5379127ed2ca2640fe31abbe22b70b4e82df0967bc54edd2beb7e0b4b5a5462906c721 WHIRLPOOL ee5fd010f854c14ba56b873dc99c7fb31427e8ea7959237865679da3edc5d3913e08df242b2ae4b102c698a6b65bbe6e9d9bb95b806ab94d520f147fe880ec6e
+DIST vala-0.18.0.tar.xz 2554088 SHA256 18cb2220ce7352a9dd71be058530f7d4a6c8215a1d9c471430af60a04496a60b SHA512 9078a1eac9274a7ce4d65afcec0fd433bd5d668c0810592020b4eccd9d8732406784f858de81118f14137da2bd12fe6c540b3dd60e37b5182414e73d7d04ecd7 WHIRLPOOL 596cec47c32c789ac0f209f0e5dfe49a4a020b244f4e68f233c061b03b369865494f685f84c1e98a7a2c97cce4229d3f0032dd2661f97f8c3ad40b13526073a0
--- a/dev-lang/vala/vala-0.17.7.ebuild
+++ b/dev-lang/vala/vala-0.17.7.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.17.7.ebuild,v 1.1 2012/09/22 10:17:26 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Vala - Compiler for the GObject type system"
-HOMEPAGE="http://live.gnome.org/Vala"
-
-LICENSE="LGPL-2.1"
-SLOT="0.18"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="test +vapigen"
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=dev-libs/vala-common-${PV}"
-DEPEND="${RDEPEND}
-	!${CATEGORY}/${PN}:0
-	dev-libs/libxslt
-	sys-devel/flex
-	|| ( sys-devel/bison dev-util/byacc dev-util/yacc )
-	virtual/pkgconfig
-	test? (
-		dev-libs/dbus-glib
-		>=dev-libs/glib-2.26:2 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-unversioned
-		$(use_enable vapigen)"
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-}
--- a/dev-lang/vala/vala-0.18.0.ebuild
+++ b/dev-lang/vala/vala-0.18.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.17.6.ebuild,v 1.1 2012/09/05 02:17:02 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.18.0.ebuild,v 1.1 2012/09/25 07:56:30 tetromino Exp $

 EAPI="4"
 GCONF_DEBUG="no"
--- a/dev-lang/yasm/yasm-9999.ebuild
+++ b/dev-lang/yasm/yasm-9999.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-lang/yasm/yasm-9999.ebuild,v 1.1 2012/09/25 04:35:12 vapier Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2:2.7"
+inherit autotools eutils python
+if [[ ${PV} == "9999"* ]] ; then
+	EGIT_REPO_URI="git://github.com/yasm/yasm.git"
+	inherit git-2
+else
+	SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
+HOMEPAGE="http://www.tortall.net/projects/yasm/"
+
+LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
+SLOT="0"
+IUSE="nls python"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="nls? ( sys-devel/gettext )
+	python? ( >=dev-python/cython-0.14 )"
+
+DOCS=( AUTHORS )
+
+pkg_setup() {
+	# Python is required for generating x86insns.c, see
+	# modules/arch/x86/Makefile.inc for more details.
+	if use python || [[ ${PV} == "9999" ]] ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# ksh doesn't grok $(xxx), makes aclocal fail
+	sed -i -e '1c\#!/usr/bin/env sh' YASM-VERSION-GEN.sh || die
+	eautoreconf
+
+	if [[ ${PV} == "9999" ]] ; then
+		./modules/arch/x86/gen_x86_insn.py || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-warnerror \
+		$(use_enable python) \
+		$(use_enable python python-bindings) \
+		$(use_enable nls)
+}
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@ -1,3 +1,4 @@
 DIST atk-1.32.0.tar.bz2 688186 SHA256 e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e SHA512 f10a752e2c57ffdaeaa2e41c5fb31acf6cd04ec850e002b6f5bfad2680a2a931db6ac395ebfcf7fca6356894dda14f4f87b02df1aff8d0096e265cf841e90d21 WHIRLPOOL 0ae816ec6e1999e5376f560ed0dfe84fd27ce899a953b9513eabec6a24d227e087f148ba42d256b738931f4353ff326754acad7cc826dab8ca773dc9df9bab30
 DIST atk-2.2.0.tar.xz 600140 SHA256 8b22f0e7803dd3734c676ccd68ea999ff1156ca49d99c3de5c1d269ad0c3739d SHA512 efdf135f7869dcb96b548e6278fb34ab2abd8b2f0e45c23794231a031af2f16690b8e5875e728ae5db8d325a578c7abae06989802896013623af83de765064e8 WHIRLPOOL c089c93646997860ea45ff8bd7d5c4232d83934e64f508ac38878ce13499cc2db344c19d04ac0e2880e155354acd39be41521138064a640f93cd277a6de74d28
 DIST atk-2.4.0.tar.xz 607156 SHA256 091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d SHA512 20316b4de66a1871bb9f802831b2262c54eaecf8d7c3696d3949f8464834c6aeca32d57382f0c9a9c093d2099e7d4c71c83b917474d528758339dcd1397e1571 WHIRLPOOL 77d882ae7d10fbbf6f81c7be149dbd85458b57b258da7a677b521e01ea19a727589d2aabd364fc23cf5569c8c6a1e398e09247aea291735fd506509041e29e0b
+DIST atk-2.6.0.tar.xz 609136 SHA256 eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f SHA512 2dbc6807987ac2e434d6c2f3df49d618ee0e3c80c4bec023bec71eb04c78691881bf6df54b6ffe5311bd580239220fc915c0a66b2e22c639ec191eed0af27bc4 WHIRLPOOL 2c38b5e3cabd1c256b708e83e5cb31a5f9be8512f57fb1bf3262564f82b93c18fa72f5096f8f74d436b22001db17f1d825ed1c4cd6c2899f78121851cd255e52
--- a/dev-libs/atk/atk-1.32.0-r1.ebuild
+++ b/dev-libs/atk/atk-1.32.0-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/atk/atk-1.32.0-r1.ebuild,v 1.11 2012/05/04 18:35:50 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-1.32.0-r1.ebuild,v 1.12 2012/09/25 11:52:11 tetromino Exp $

 EAPI="3"
 GCONF_DEBUG="no"
@ -10,7 +10,7 @@ inherit gnome2
 DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
 HOMEPAGE="http://projects.gnome.org/accessibility/"

-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc +introspection nls"
--- a/dev-libs/atk/atk-2.2.0.ebuild
+++ b/dev-libs/atk/atk-2.2.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.2.0.ebuild,v 1.10 2012/05/20 19:30:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.2.0.ebuild,v 1.11 2012/09/25 11:52:11 tetromino Exp $

 EAPI="4"
 GCONF_DEBUG="no"
@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
 HOMEPAGE="http://projects.gnome.org/accessibility/"

-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc +introspection nls"
--- a/dev-libs/atk/atk-2.4.0.ebuild
+++ b/dev-libs/atk/atk-2.4.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.4.0.ebuild,v 1.4 2012/05/04 18:35:50 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.4.0.ebuild,v 1.5 2012/09/25 11:52:11 tetromino Exp $

 EAPI="4"
 GCONF_DEBUG="no"
@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
 HOMEPAGE="http://projects.gnome.org/accessibility/"

-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc +introspection nls"
--- a/dev-libs/atk/atk-2.6.0.ebuild
+++ b/dev-libs/atk/atk-2.6.0.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/atk/atk-2.6.0.ebuild,v 1.1 2012/09/25 11:52:11 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
+HOMEPAGE="http://projects.gnome.org/accessibility/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc +introspection nls"
+
+RDEPEND=">=dev-libs/glib-2.31.2:2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.13 )
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable introspection)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	if ! use test; then
+		# don't waste time building tests (bug #226353)
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed failed"
+	fi
+
+	# Remove DEPRECATED flags
+	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i atk/Makefile.am atk/Makefile.in \
+		tests/Makefile.am tests/Makefile.in || die "sed 2 failed"
+}
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST libsecret-0.10.tar.xz 473952 SHA256 4015ac83042fa408bf66ca8526709662d194fe566181db6ab3d86a6ea4ab8880 SHA512 28b09871e532c26f04b760d014b54cfb478997840e010a07d8862ebf9f8f87f7e67f5ec60e486577020aee29ea75701d7263891126aec638eaad9245e5c2c076 WHIRLPOOL 5b55093a83dfacefad59735ecae895d5145b289d7ee2b0181345fa0f6053b7c8f736ac7833fc686b9b180cd0b977d5048b25ee0952dccb6f28764359926b8165`
				`@ -0,0 +1 @@`
				`DIST lolcat-42.0.99.gem 204288 SHA256 cafd788a6b3e0177a20a9e44dfbb144ea0b6b62c9c9fb413c5223778cdd92558 SHA512 fe5a1b77634c430dd699372f026b9947b53aa6def822dc1292b7bf9f5575747abef03c6625eee76e1d26c2b01fdae06409b79bc5286ef85a6c28be0af4429e50 WHIRLPOOL 79e54ea2054dc70d1629020144efbb6e60fef1c43834e5412c32b9e040b27627de9e8bae6a4c771c98b72aaffcb0c43e3397ab2a6f34d7b2c718b468afad781f`