Sync with portage [Mon Sep 8 09:32:02 MSK 2014].

10 years ago · 9fc87b832c
parent ea5de7146b
commit 9fc87b832c
389 changed files with 2326 additions and 5990 deletions
--- a/app-crypt/opencdk/Manifest
+++ b/app-crypt/opencdk/Manifest
@ -1,3 +0,0 @@
-DIST opencdk-0.5.5.tar.bz2 330280 SHA256 52722dfb410252faef6b6c8c0b897ced447bd28c5872746d9cf9c4604a85d08f SHA512 627367be6fbe3840a1d32cfb9f7795761b7373dd1c47c5d6d3200aa43a8850a2719962081719ea574d10d060c1949b9b57e5f6f021d92e82580d9674f0ca8cd1 WHIRLPOOL de813e98b39809964ec499ef0bbf9b541875309fc27cf2cff11e8fdc886a8a2b540ca8a8a2942a356a61c7e90ad1f768880278ad3d93ca743084a9be68cbb298
-DIST opencdk-0.5.7.tar.gz 479925 SHA256 a1dbf6e06b21c29483e6017b400d9065caddc9929de5f3afc1af4c98523dd302 SHA512 c7a7832f8584127cc7d0431bf11cc19df9c167ad3903671c5dc17bee3daeaf2f7c159278998d6469080c335cbc9032cfbd0914a2ed2a294c203514f7ea9e8d61 WHIRLPOOL 4e7a6009fa336a165880d7f877767c53890c1094f422d0125da232f20791de787cba4faaef8372448eb4f048f250c60802fedcfbc5e53b7e734b1afd649d5da0
-DIST opencdk-0.6.6.tar.bz2 481904 SHA256 d7fc0a6bf7360793f64301a085d72c604c9aa255ab33ab8ec58e3ed62e517048 SHA512 f45cbea2b9cdbe0c5b99c6c90d1fb5da60f10307f6f5251dac48a1ce5d1c0a1d28c107040468700660a2e9d67efa610751ab0f3bda7620398a53888a7d3a5d6b WHIRLPOOL 1e333810094b2c846baf908b7f286cae23c8ed11c044fcc0c7ff331d9c818ec33f8c495b256b81f122dc77928cf8a8c5a176bcfbdaa92192409a69a73d8fe612
--- a/app-crypt/opencdk/metadata.xml
+++ b/app-crypt/opencdk/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>crypto</herd>
-</pkgmetadata>
--- a/app-crypt/opencdk/opencdk-0.5.5.ebuild
+++ b/app-crypt/opencdk/opencdk-0.5.5.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/opencdk/opencdk-0.5.5.ebuild,v 1.21 2014/03/01 22:52:29 mgorny Exp $
-
-EAPI=1
-
-DESCRIPTION="Open Crypto Development Kit for basic OpenPGP message manipulation"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/opencdk/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/libgcrypt-1.1.94:0"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.6"
-
-src_install() {
-	einstall || die "installed failed"
-
-	dodoc AUTHORS ChangeLog NEWS README README-alpha THANKS TODO
-	use doc && dohtml doc/opencdk-api.html
-}
--- a/app-crypt/opencdk/opencdk-0.5.7.ebuild
+++ b/app-crypt/opencdk/opencdk-0.5.7.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/opencdk/opencdk-0.5.7.ebuild,v 1.18 2014/03/01 22:52:29 mgorny Exp $
-
-EAPI=1
-
-inherit libtool
-
-DESCRIPTION="Open Crypto Development Kit for basic OpenPGP message manipulation"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/opencdk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/libgcrypt-1.1.94:0"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.6"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	elibtoolize
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "installed failed"
-	dodoc AUTHORS ChangeLog NEWS README README-alpha THANKS TODO
-	use doc && dohtml doc/opencdk-api.html
-}
--- a/app-crypt/opencdk/opencdk-0.6.6-r1.ebuild
+++ b/app-crypt/opencdk/opencdk-0.6.6-r1.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/opencdk/opencdk-0.6.6-r1.ebuild,v 1.2 2014/03/01 22:52:29 mgorny Exp $
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="Open Crypto Development Kit for basic OpenPGP message manipulation"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/opencdk/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/libgcrypt-1.2.0:0"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.6"
-
-src_prepare() {
-	use test || sed -e "/SUBDIRS/s/ tests//" -i Makefile.am
-
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	use doc && dohtml doc/opencdk-api.html
-}
--- a/app-crypt/opencdk/opencdk-0.6.6.ebuild
+++ b/app-crypt/opencdk/opencdk-0.6.6.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/opencdk/opencdk-0.6.6.ebuild,v 1.12 2014/03/01 22:52:29 mgorny Exp $
-
-EAPI=1
-
-inherit autotools
-
-DESCRIPTION="Open Crypto Development Kit for basic OpenPGP message manipulation"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/opencdk/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/libgcrypt-1.2.0:0"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.6"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use test; then
-		sed -e "/SUBDIRS/s/ tests//" -i Makefile.am
-	fi
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	use doc && dohtml doc/opencdk-api.html
-}
--- a/app-emulation/emul-linux-x86-glibc-errno-compat/Manifest
+++ b/app-emulation/emul-linux-x86-glibc-errno-compat/Manifest
@ -1,3 +0,0 @@
-DIST glibc-2.5-patches-1.8.tar.bz2 493626 SHA256 d71810e9e25a131633a5681b4a632f09caf4957451ee67f0514b7264314eeb84 SHA512 ec324d2a025fc7f0b37705e74d289f55d7175d054c71a8f08503c5f5c8679ec3f6b3a9330093e141502e53185cb5e762481a30ced8a558020b976c56a05a50e2 WHIRLPOOL 5561a0f0de51828ac6b34f03103bbc20246a6cde447ee31ef8951ff0c76e3de5003433e5b7cfd60b9330f6a608be65f856f78d7a14cb290ad8e11fa562a17b51
-DIST glibc-2.5.tar.bz2 15321839 SHA256 9b2e12bb1eafb55ab2e5a868532b8e6ec39216c66c25b8998d7474bc4d4eb529 SHA512 b341b5b172472338ff2bcffe569f3a0796defe1d326eb85ce52daeff5ce1fb0c9304ec10052c604cadea4056f58f50d11c302ba02b979e88e1d9f112e614b7a9 WHIRLPOOL 33937ccd99ec2c2d9020d8ceef03362999e49878c1e50d0e47c3cdd3b696794b7c2f121ef4c82a0ad444da4a0d2e80740972c9bab5a1b326761016f7eb04c62b
-DIST glibc-linuxthreads-2.5.tar.bz2 242445 SHA256 ee27aeba6124a8b351c720eb898917f0f8874d9a384cc2f17aa111a3d679bd2c SHA512 e6231590d976762f22c1668f20ec5f5288c2aa45dfcc246c8b628207948ecd009f4e7fb999fbf63d3fb590f0a20b2ade819ddacdf391ec2cf8562d7556335b66 WHIRLPOOL c3f943dc39b9a271fdd32b98a875a308f14532e810c8ffa6b6994c7723d8dd57fa22c17fdc6173f659d440958c15d3b2763210376be6802c4feefcd397a5d6db
--- a/app-emulation/emul-linux-x86-glibc-errno-compat/emul-linux-x86-glibc-errno-compat-2.5.ebuild
+++ b/app-emulation/emul-linux-x86-glibc-errno-compat/emul-linux-x86-glibc-errno-compat-2.5.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-glibc-errno-compat/emul-linux-x86-glibc-errno-compat-2.5.ebuild,v 1.3 2012/05/31 22:32:20 zmedico Exp $
-
-inherit eutils flag-o-matic
-
-PATCH_VER="1.8"
-
-DESCRIPTION="standalone glibc for old x86 binaries that require errno compat"
-HOMEPAGE="http://dev.gentoo.org/~vapier/old-broken-errno-apps"
-SRC_URI="mirror://gnu/glibc/glibc-${PV}.tar.bz2
-	mirror://gnu/glibc/glibc-linuxthreads-${PV}.tar.bz2
-	mirror://gentoo/glibc-${PV}-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-S=${WORKDIR}/glibc-${PV}
-
-CRAZY_PREFIX="/usr/lib/glibc-errno-compat"
-
-src_unpack() {
-	unpack glibc-${PV}.tar.bz2
-	cd "${S}"
-	unpack glibc-linuxthreads-${PV}.tar.bz2
-	unpack glibc-${PV}-patches-${PATCH_VER}.tar.bz2
-	grep -l '^--- ports/' patches/*.patch | xargs rm -f
-	EPATCH_SUFFIX="patch" epatch patches
-	test-flags -fgnu89-inline && append-flags -fgnu89-inline
-}
-
-src_compile() {
-	mkdir build || die
-	cd build || die
-	../configure \
-		--prefix="${CRAZY_PREFIX}" \
-		--build=${CBUILD} \
-		--host=${CHOST} \
-		--without-tls \
-		--without-__thread \
-		--disable-sanity-checks \
-		--enable-add-ons=linuxthreads \
-		|| die
-	sed -i '/^defines/s:$: -U__i686 -U_FORTIFY_SOURCE:' config.make || die
-	emake -j1 \
-		PARALLELMFLAGS="${MAKEOPTS}" \
-		build-programs="no" \
-		lib \
-		|| die
-	emake -C ../linuxthreads objdir=${PWD} ${PWD}/linuxthreads/libpthread.so || die
-}
-
-src_install() {
-	dobin "${FILESDIR}"/glibc-errno-wrapper || die
-	dosed "s:@PREFIX@:${CRAZY_PREFIX}:g" /usr/bin/glibc-errno-wrapper || die
-
-	cd build || die
-	into "${CRAZY_PREFIX}"
-	newlib.so elf/ld.so ld-linux.so.2 || die
-	newlib.so libc.so libc.so.6 || die
-	newlib.so linuxthreads/libpthread.so libpthread.so.0 || die
-}
--- a/app-emulation/emul-linux-x86-glibc-errno-compat/files/glibc-errno-wrapper
+++ b/app-emulation/emul-linux-x86-glibc-errno-compat/files/glibc-errno-wrapper
@ -1,2 +0,0 @@
-#!/bin/sh
-exec @PREFIX@/lib/ld-linux.so.2 --library-path @PREFIX@/lib "$@"
--- a/app-emulation/emul-linux-x86-glibc-errno-compat/metadata.xml
+++ b/app-emulation/emul-linux-x86-glibc-errno-compat/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>toolchain</herd>
-</pkgmetadata>
--- a/app-misc/discomatic/Manifest
+++ b/app-misc/discomatic/Manifest
@ -1 +0,0 @@
-DIST discomatic-0.3.tar.bz2 99480 SHA256 fdbcebdb8a00713f869446cfb694f02a00ffce09c728733e5bcf0b10de9fa378 SHA512 10db8471b61ec4ee53aeef99a7e6b5398d4dba668798bfd263056c6dd113ec716a72780650416fd7ee55888558d3b2c7d981c291e5318aaf4caa7cb898a7fd18 WHIRLPOOL 5712fb53b1f8d3e790c1571e000ea72d6377084d751ebf40fab53f209912b7f9d22f3462bdc939c69e8eeb5584f7116561f46d99f7ff63607a38fe986ccf634e
--- a/app-misc/discomatic/discomatic-0.3.ebuild
+++ b/app-misc/discomatic/discomatic-0.3.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/discomatic/discomatic-0.3.ebuild,v 1.12 2012/05/03 19:41:35 jdhore Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="GTK+ CD-ROM archiving tool for mastering and burning multiple CD-ROM"
-HOMEPAGE="http://discomatic.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="${DEPEND}
-	virtual/cdrtools"
-DEPEND=">=dev-libs/glib-2.2
-	>=x11-libs/gtk+-2.2
-	virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-glib.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-}
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README* TODO"
--- a/app-misc/discomatic/files/discomatic-0.3-gcc43.patch
+++ b/app-misc/discomatic/files/discomatic-0.3-gcc43.patch
@ -1,22 +0,0 @@
-diff -Naur discomatic-0.3.orig/src/folderutils.cpp discomatic-0.3/src/folderutils.cpp
--- discomatic-0.3.orig/src/folderutils.cpp	2003-10-17 22:54:37.000000000 +0200
-+++ discomatic-0.3/src/folderutils.cpp	2008-12-15 19:15:55.000000000 +0100
-@@ -6,6 +6,7 @@
- #include "project.h"
- #include "math.h"
- #include <sstream>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -Naur discomatic-0.3.orig/src/process.cpp discomatic-0.3/src/process.cpp
--- discomatic-0.3.orig/src/process.cpp	2003-10-17 22:54:37.000000000 +0200
-+++ discomatic-0.3/src/process.cpp	2008-12-15 19:18:33.000000000 +0100
-@@ -1,5 +1,6 @@
- #include "process.h"
- #include <fstream>
-+#include <cstring>
- 
- gboolean read_input(GIOChannel *source, GIOCondition condition, gpointer data){
-   ((Process*)data)->processInput(source);
-
--- a/app-misc/discomatic/files/discomatic-0.3-glib.patch
+++ b/app-misc/discomatic/files/discomatic-0.3-glib.patch
@ -1,11 +0,0 @@
--- discomatic-0.3/src/process.cpp.orig	2003-10-17 22:54:37.000000000 +0200
-+++ discomatic-0.3/src/process.cpp	2007-04-30 18:34:43.000000000 +0200
-@@ -134,7 +134,7 @@
- int Process::processInput(GIOChannel *source){
-   gchar buf;
-   gchar *buf2;
-  guint count;
-+  gsize count;
-   g_io_channel_read(source, &buf, 1, &count);
-   if(count){
-     if(buf == '\b'){
--- a/app-misc/discomatic/metadata.xml
+++ b/app-misc/discomatic/metadata.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
- <email>maintainer-needed@gentoo.org</email>
-</maintainer>
-<longdescription>
-    GTK+ CD-ROM archiving tool for mastering and burning multiple CD-ROM
-</longdescription>
-</pkgmetadata>
--- a/app-mobilephone/yaps/yaps-0.96-r4.ebuild
+++ b/app-mobilephone/yaps/yaps-0.96-r4.ebuild
@ -1,87 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r4.ebuild,v 1.4 2013/01/24 21:01:18 sbriesen Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Yet Another Pager Software (optional with CAPI support)"
-HOMEPAGE="ftp://sunsite.unc.edu/pub/Linux/apps/serialcomm/machines/"
-SRC_URI="capi? ( ftp://ftp.melware.net/capi4yaps/${P}.c4.tgz )
-	!capi? ( ftp://sunsite.unc.edu/pub/Linux/apps/serialcomm/machines/${P}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="capi lua slang unicode"
-
-RDEPEND="capi? ( net-dialup/capi4k-utils )
-	slang? ( >=sys-libs/slang-1.4 )
-	lua? ( dev-lang/lua )
-	!media-sound/abcmidi"  # also contains "yaps"
-DEPEND="${RDEPEND}
-	!capi? ( sys-apps/sed )
-	lua? ( virtual/pkgconfig )"
-
-pkg_setup() {
-	if ! use capi; then
-		ewarn
-		ewarn "You are now compiling some *very* old and unmaintained stuff!"
-		ewarn
-		ewarn "YAPS with CAPI 2.0 support is actively maintained, but needs"
-		ewarn "net-dialup/capi4k-utils installed. But I advice you to use"
-		ewarn "this version, since it can still be used with an ordinary"
-		ewarn "modem (that's what you probably wanted). So just add 'capi'"
-		ewarn "to your USE flags to get the new and maintained version."
-		ewarn
-		ebeep
-	fi
-}
-
-src_prepare() {
-	use capi && mv -f "${S}.c4" "${S}"
-	cd "${S}"
-
-	# apply patches
-	epatch "${FILESDIR}/${P}-gentoo.diff"
-	epatch "${FILESDIR}/${P}-getline-rename.patch"
-
-	# fix compile warning
-	use capi || \
-	sed -i -e 's:^\(.*\)\(<stdlib.h>\):\1\2\n\1<string.h>:g' scr.c
-
-	# if specified, convert all relevant files from latin1 to UTF-8
-	if use unicode; then
-		for i in yaps.doc; do
-			einfo "Converting '${i}' to UTF-8"
-			iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
-		done
-	fi
-}
-
-src_compile() {
-	local myconf=""
-	use lua && myconf="${myconf} LUA=True"
-	use slang && myconf="${myconf} SLANG=True"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" ${myconf} || die "emake failed"
-}
-
-src_install() {
-	dobin yaps
-	insinto /etc
-	doins yaps.rc
-	keepdir /usr/lib/yaps
-	doman yaps.1
-	dohtml yaps.html
-	dodoc BUGREPORT COPYRIGHT README yaps.lsm yaps.doc
-	newdoc contrib/README README.contrib
-	insinto /usr/share/doc/${PF}/contrib
-	doins contrib/{m2y.pl,tap.sl}
-}
-
-pkg_postinst() {
-	elog
-	elog "Please edit /etc/yaps.rc to suit your needs."
-	elog
-}
--- a/app-mobilephone/yaps/yaps-0.96-r5.ebuild
+++ b/app-mobilephone/yaps/yaps-0.96-r5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r5.ebuild,v 1.1 2014/08/19 13:46:46 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/yaps/yaps-0.96-r5.ebuild,v 1.2 2014/09/07 13:09:53 ago Exp $

 EAPI=5

@ -13,7 +13,7 @@ SRC_URI="capi? ( ftp://ftp.melware.net/capi4yaps/${P}.c4.tgz )

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="capi lua slang unicode"

 RDEPEND="capi? ( net-dialup/capi4k-utils )
--- a/app-office/libreoffice/libreoffice-4.2.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.2.5.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.5.2.ebuild,v 1.8 2014/08/21 12:13:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.5.2.ebuild,v 1.11 2014/09/07 12:37:30 scarabeus Exp $

 EAPI=5

@ -97,9 +97,9 @@ COMMON_DEPEND="
 	app-arch/unzip
 	>=app-text/hunspell-1.3.2-r3
 	app-text/mythes
-	app-text/libabw
+	=app-text/libabw-0.0*
 	>=app-text/libexttextcat-3.2
-	app-text/libebook
+	=app-text/libebook-0.0*
 	app-text/libetonyek
 	app-text/liblangtag
 	app-text/libmspub
@ -107,7 +107,7 @@ COMMON_DEPEND="
 	>=app-text/libodfgen-0.0.3
 	app-text/libwpd:0.9[tools]
 	app-text/libwpg:0.2
-	>=app-text/libwps-0.2.2
+	=app-text/libwps-0.2*
 	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
 	dev-cpp/libcmis:0.4
--- a/app-office/libreoffice/libreoffice-4.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.2.6.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.6.2.ebuild,v 1.1 2014/08/23 09:56:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.6.2.ebuild,v 1.4 2014/09/07 12:37:30 scarabeus Exp $

 EAPI=5

@ -97,9 +97,9 @@ COMMON_DEPEND="
 	app-arch/unzip
 	>=app-text/hunspell-1.3.2-r3
 	app-text/mythes
-	app-text/libabw
+	=app-text/libabw-0.0*
 	>=app-text/libexttextcat-3.2
-	app-text/libebook
+	=app-text/libebook-0.0*
 	app-text/libetonyek
 	app-text/liblangtag
 	app-text/libmspub
@ -107,7 +107,7 @@ COMMON_DEPEND="
 	>=app-text/libodfgen-0.0.3
 	app-text/libwpd:0.9[tools]
 	app-text/libwpg:0.2
-	>=app-text/libwps-0.2.2
+	=app-text/libwps-0.2*
 	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
 	dev-cpp/libcmis:0.4
--- a/app-office/libreoffice/libreoffice-4.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.2.9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.14 2014/08/15 09:10:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.17 2014/09/07 12:37:30 scarabeus Exp $

 EAPI=5

@ -97,9 +97,9 @@ COMMON_DEPEND="
 	app-arch/unzip
 	>=app-text/hunspell-1.3.2-r3
 	app-text/mythes
-	app-text/libabw
+	=app-text/libabw-0.0*
 	>=app-text/libexttextcat-3.2
-	app-text/libebook
+	=app-text/libebook-0.0*
 	app-text/libetonyek
 	app-text/liblangtag
 	app-text/libmspub
@ -107,7 +107,7 @@ COMMON_DEPEND="
 	>=app-text/libodfgen-0.0.3
 	app-text/libwpd:0.9[tools]
 	app-text/libwpg:0.2
-	>=app-text/libwps-0.2.2
+	=app-text/libwps-0.2*
 	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
 	dev-cpp/libcmis:0.4
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.219 2014/08/15 09:10:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.223 2014/09/07 12:37:30 scarabeus Exp $

 EAPI=5

@ -97,17 +97,17 @@ COMMON_DEPEND="
 	app-arch/unzip
 	>=app-text/hunspell-1.3.2-r3
 	app-text/mythes
-	app-text/libabw
+	>=app-text/libabw-0.1.0
 	>=app-text/libexttextcat-3.2
-	app-text/libebook
+	>=app-text/libebook-0.1.1
 	app-text/libetonyek
 	app-text/liblangtag
 	app-text/libmspub
 	>=app-text/libmwaw-0.2
 	>=app-text/libodfgen-0.0.3
-	app-text/libwpd:0.9[tools]
-	app-text/libwpg:0.2
-	>=app-text/libwps-0.2.2
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.3.0
 	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
 	dev-cpp/libcmis:0.4
--- a/app-officeext/languagetool/Manifest
+++ b/app-officeext/languagetool/Manifest
@ -1,2 +1,2 @@
-DIST LanguageTool-2.4.oxt 46832353 SHA256 3b52138e25da54ee184603755317bc093da0f527ce6eecd2edff760af3bd0bdd SHA512 1bc1852ee2c418c584e583c17d4cb5619e52735d2e834015f3ede788e7df7b60c4ad6cd6dea4eb6dcef5706409924ab783821df18bbe7bdde356ce90cf62ee6c WHIRLPOOL e93a6a9a4b5c33ce46d143cdb273995b7927c69291d99f6b1dfae6057b75c0f0344d1489ad886eae9aa389c2f35a374a756126be29db698023fbea400d54224e
 DIST LanguageTool-2.5.oxt 46952282 SHA256 0ceb08b67c1d85505f3e97a978316ed54ade4d7bfd6ef848c02b710ee3deee17 SHA512 8813a7d3e4c199d416287ab9af38b8429f7d484bc6e93f775917ba968a302b3a64581588e5464cce9b6b368aabe62576f8cb9d4d8ad27e8d04f1ef622dcd081d WHIRLPOOL 6d2742d11a039953c9c4c728f2188fd3bb5c98f10bfaefb726c38346126359b01a59756c11560e4c0438af9a10dd8cbc80b82787491c90962b770ee614886fa1
+DIST LanguageTool-2.6.oxt 47343996 SHA256 13123590d90fb38b68df2655bf6ab8e82fc2f87255f011da6af87f93a3fcb333 SHA512 185d5d2473c83fc7a18b345eec631f019c1c8f48295b932bc684a4bed7e6dc62c11bf4d7ec1c4dc9aaa387c95c027d14358c70550aab744357c5b88707177e2a WHIRLPOOL 248b3b29b1f93642cefaf67531f02155164bd82754161af854549745f0066aa314e8b223b1ab2985c949073a73440cf1d05c208947322fcaad83c6b9632ea9ed
--- a/app-officeext/languagetool/languagetool-2.5.ebuild
+++ b/app-officeext/languagetool/languagetool-2.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-officeext/languagetool/languagetool-2.5.ebuild,v 1.1 2014/04/06 08:57:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/languagetool/languagetool-2.5.ebuild,v 1.2 2014/09/07 12:41:43 scarabeus Exp $

 EAPI=5

@ -20,7 +20,7 @@ SRC_URI="http://www.languagetool.org/download/${MY_P}.oxt"

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

-RDEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jdk-1.6"
--- a/app-officeext/languagetool/languagetool-2.6.ebuild
+++ b/app-officeext/languagetool/languagetool-2.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-officeext/languagetool/languagetool-2.4.ebuild,v 1.2 2014/04/06 08:57:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/languagetool/languagetool-2.6.ebuild,v 1.1 2014/09/07 12:41:43 scarabeus Exp $

 EAPI=5

@ -20,7 +20,7 @@ SRC_URI="http://www.languagetool.org/download/${MY_P}.oxt"

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

-RDEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jdk-1.7"
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild,v 1.14 2014/06/20 14:44:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild,v 1.15 2014/09/07 13:36:14 pacho Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -14,7 +14,9 @@ HOMEPAGE="http://live.gnome.org/GnomeDocUtils"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
 IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 RDEPEND="
 	${PYTHON_DEPS}
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10.ebuild,v 1.13 2014/04/24 01:23:57 leio Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
-
-inherit gnome2 python
-
-DESCRIPTION="A collection of documentation utilities for the Gnome project"
-HOMEPAGE="http://live.gnome.org/GnomeDocUtils"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.6.12[python]
-	 >=dev-libs/libxslt-1.1.8
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	app-text/docbook-xml-dtd:4.4
-	app-text/scrollkeeper-dtd
-	sys-devel/gettext
-	virtual/awk
-	virtual/pkgconfig"
-# dev-libs/glib needed for eautofoo, bug #255114.
-
-# If there is a need to reintroduce eautomake or eautoreconf, make sure
-# to AT_M4DIR="tools m4", bug #224609 (m4 removes glib build time dep)
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF} --disable-scrollkeeper"
-	python_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	python_clean_py-compile_files
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -d -s
-}
-
-src_test() {
-	python_execute_function -d -s
-}
-
-src_install() {
-	installation() {
-		gnome2_src_install
-		python_convert_shebangs $(python_get_version) "${ED}"usr/bin/xml2po
-		mv "${ED}"usr/bin/xml2po "${ED}"usr/bin/xml2po-$(python_get_version)
-	}
-	python_execute_function -s installation
-	python_clean_installation_image
-
-	python_generate_wrapper_scripts -E -f "${ED}"usr/bin/xml2po
-}
-
-pkg_postinst() {
-	python_mod_optimize xml2po
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	python_mod_cleanup xml2po
-	gnome2_pkg_postrm
-}
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@ -1 +1,2 @@
 DIST libabw-0.0.2.tar.xz 307432 SHA256 d5cec855722e3c9caf451db2557aa8c81b279a562e67593477c58b02e948b594 SHA512 3c656fb7d3e2b4388ea33fbc380ffd01d03abefffa6089f21708b78da75cce71f95a067f05b389823ca3857b2ec14aae9371978062571aa74bf854c6948fcd82 WHIRLPOOL fb112e1a94b8983518ac3911215ea6f31091d922dfe4c3b80efbba747a71b100aa37aeb75753085d5cab15bb6b15541d401c0b55d29c85f716c972b1f3ff49fd
+DIST libabw-0.1.0.tar.xz 282268 SHA256 ee99b280b7af226a48fd9afd395cc10bef2d8e4f844151277e90793706dfc0c1 SHA512 209965359e1446862039c88c4199815583bbc4f63f3f0549f4261d3cb54ab0fb483480068d68a9bf9fe65fe6e3f9b0e05efe4cf8b9163efeadba129a70f93fd2 WHIRLPOOL 801eda0667c80b09f60e47c68fe759c3d245dd82d17b8d8dafe359c9bc96639dce44f18ab88dac92b338ca459dd8b69859aa795286c4fac4aab7a290213dfb22
--- a/app-text/libabw/libabw-0.1.0.ebuild
+++ b/app-text/libabw/libabw-0.1.0.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/libabw/libabw-0.1.0.ebuild,v 1.1 2014/09/07 12:32:37 scarabeus Exp $
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Library parsing abiword documents"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libabw/"
+SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@ -1 +1,2 @@
 DIST libe-book-0.0.2.tar.bz2 409605 SHA256 c6f10ca827a2060e1a64497fbf43c5c113a07d4673f17a7c2c3da4ac6e2677ae SHA512 843fb7c92e7bedb3f7747e3baa547b14845718075c6fc5f12fdc0af91ca976014b651b8cc5960e7ae2bf7c89dcad99b9fd60712c68faccbcbd84fd0f54683e78 WHIRLPOOL 357fbac27c16d0e4cc2fb97561e8af817de65223099c6e1824a33b90a58b473aa2d379dc715c4dfd33aab168bdafa6be61b0076ad443ddb79d6be14322653591
+DIST libe-book-0.1.1.tar.bz2 466712 SHA256 90353fc60827a33b391d0b63ecfe5239229d489af99ff6ea014ede3b39fa32b5 SHA512 5d952cac33ece4481057686f89f5a953508e6d5b8ddfdb45c745f79c881cd4429ec0a8024144bfc9cc3a53f7a201f25e831f9125f7cc4fc8591563df09d1feec WHIRLPOOL ff702630f2b8e05edaba25bc2f003f21f2ba838a7876aaa03777146083cd4539479f74785a02b41e166e448de2b27e83e9816cfd8dd2d8fc7b314716929a4d8b
--- a/app-text/libebook/libebook-0.1.1.ebuild
+++ b/app-text/libebook/libebook-0.1.1.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/libebook/libebook-0.1.1.ebuild,v 1.1 2014/09/07 12:36:36 scarabeus Exp $
+
+EAPI=5
+
+MY_PN="libe-book"
+MY_P="${MY_PN}-${PV}"
+
+inherit eutils
+
+DESCRIPTION="Library parsing various ebook formats"
+HOMEPAGE="http://www.sourceforge.net/projects/libebook/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost:=
+	dev-util/gperf
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
--- a/app-text/libwpg/Manifest
+++ b/app-text/libwpg/Manifest
@ -1 +1,2 @@
 DIST libwpg-0.2.2.tar.xz 301000 SHA256 b49bfd77b9447534dee0d43bbdc48b4dcb09339605be21c01726243d5069a6cd SHA512 d60f8c0d29f7dbde2592d2afce1ccbe01ab10be4051d048fca0a2234f488a2764af2134ccf9ca150767d769d17dcd010433a3d977457b3a521be8f0dc628e65c WHIRLPOOL a52b90bd4c9aea2b72f615bcaaa43445dc72dad7e23f8f4667912ac3a95b729a7910b0c7608b3b47fd23a19399c72bb792432243e312d767d67c43b5c170e2f6
+DIST libwpg-0.3.0.tar.xz 300244 SHA256 6f709199235f4c061c3ffe1a5112ce6430e8434e621bf7b3e3dca16114eaf224 SHA512 5715a38f7c2b69123056288576073aa36a97f971a749cffb1b176a5c4a9f7da0b6568cdf62fc4e8ebd8204b681200c1a64e5e52cfd127af986580720914f973e WHIRLPOOL db0876540fde7533f1b73b4bd1cf08c09c9d845b822fcfa7a7d375014aee597aace4c5e4662c61449cd4c09747db4013ff225acd66c33b492d6348b7243945dc
--- a/app-text/libwpg/libwpg-0.2.2.ebuild
+++ b/app-text/libwpg/libwpg-0.2.2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpg/libwpg-0.2.2.ebuild,v 1.10 2013/05/07 17:51:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpg/libwpg-0.2.2.ebuild,v 1.11 2014/09/07 13:41:26 scarabeus Exp $

 EAPI=5

@ -39,7 +39,7 @@ src_install() {
 pkg_postinst() {
 	alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
 	alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
-	alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"	fi
+	alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
 }

 pkg_postrm() {
--- a/app-text/libwpg/libwpg-0.3.0.ebuild
+++ b/app-text/libwpg/libwpg-0.3.0.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpg/libwpg-0.3.0.ebuild,v 1.2 2014/09/07 13:41:26 scarabeus Exp $
+
+EAPI=5
+
+inherit alternatives eutils
+
+DESCRIPTION="C++ library to read and parse graphics in WPG"
+HOMEPAGE="http://libwpg.sourceforge.net/libwpg.htm"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0.3"
+KEYWORDS="~amd64 ~hppa ~mips ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	app-text/libwpd:0.10[tools]
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		--program-suffix=-${SLOT} \
+		--docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
+	alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
+	alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
+}
+
+pkg_postrm() {
+	alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
+	alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
+	alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
+}
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@ -1 +1,2 @@
 DIST libwps-0.2.9.tar.xz 387340 SHA256 cf9a17a6c0452ab32cce342c1410f1620c66f9cb6f9431b82f95da7fe9730177 SHA512 60ddc8db5a90589248a0a8f90950907ca3be3362983f6c4847670e6eaf4d7ad22a2b6795b0a1b0a1920075f25f1ffcfd581757c26bfb74deacd000e94459da34 WHIRLPOOL bc847cb65c72daa01db5d6f17a20cbaff741fab1fc7a63d789993334b7853009f59c1ca370d7d3798a26b294c96c3435664314b07ff5a2324fa7ca7980378fe8
+DIST libwps-0.3.0.tar.xz 408036 SHA256 e341d340b16b33f1b1fb66612311b3bdf664c103ebd48beb8db87b434333bef3 SHA512 e2583dd0bda832f1a56f8676fc78a7e37f20c30ab43e26d0db40b59079d34cfc525452a7e9dadcdf577ae325854b174730f862bdb373fa1c7194cd2025383b29 WHIRLPOOL a8386baef64eb152651d71c53cfea5403dd21b56a38011a97a3dc687448167e90ffccec9b26a46490722386f1dc77ec75cace5c0af011361696cbac37f3fd0ca
--- a/app-text/libwps/libwps-0.3.0.ebuild
+++ b/app-text/libwps/libwps-0.3.0.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/libwps-0.3.0.ebuild,v 1.1 2014/09/07 12:20:32 scarabeus Exp $
+
+EAPI=5
+
+inherit base eutils
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="http://libwps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE="doc debug static-libs"
+
+RDEPEND="
+	app-text/libwpd:0.10
+	dev-libs/boost:=
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable static-libs static) \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_with doc docs) \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@ -1,5 +1,2 @@
-DIST Firebird-2.0.3.12981-0.tar.bz2 12623689 SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e SHA512 feed7f72281ec5b4aa6b8902781a43c16c8d3349281e8fc636a6a6a77df592ce39bc757920847caad97d0148702937dce25830dc1e8a2b12045c3f310938b83f WHIRLPOOL 75c969486394d93bb37330c2c1a298be16f2de3bb3715039851d8b4cbe82787d497afc9441e8dbc1657633416b4919dae0c978386ed0bd2ea950e27ac0f505bb
-DIST Firebird-2.1.3.18185-0.tar.bz2 13770360 SHA256 8047cbd4bdc79928be7369bf0cdfde74873f1de29c0ac74e7241826c02f0fd28 SHA512 806423287e1292eacd4f97447023e7fa39e44faf757d527086d62dcaba08326b7dff2afe2eb64a5a0bbb1bd68dd0fb7d22dca4898b058dafae21f255e1ef20bd WHIRLPOOL ab32a78d8ca33fab6db0ce8af371bbbb76fd3691c3b64e26a7973ba6daca7fe54b32570dd80008d5b3c6ab3489e5b5c05db292b0e6ebbd02f04ea91fba9ec247
-DIST Firebird-2.5.2.26539-0.tar.bz2 13708119 SHA256 6b90e5579f9dc3f527b7cf84ac869682aa9582a61f81c6288926c332a863abc8 SHA512 f3b3a8ec35202620bd6b35d5b1004a0d668b8d1a0a7c0864b40b9a7fb682e8b0d0f7b68fbbdc1ee8ace4602f1756103798a1ed8f4b8b14dfa921e06b81c10e8b WHIRLPOOL 669ac7b611dbe7badedc2c3cbf0d3d51b1555b7aaf7ed1bd48f1103e8c85304579411a40a5d29626580cb24eb40ba694639c8a02f98f715b16b0bb18f317c393
 DIST Firebird-2.5.2.26540-0.tar.bz2 13805637 SHA256 bbb9a408198898818d5be3c301dde0f8524fd8e2f509662121d7393e02520721 SHA512 a057f78825bcfe992f9e079704621a1c659588a906e200ed56e269d0a3d78f968553146f21bde1b680795c760b896af1ec689f33dd293dbbc2242ba77b491b3c WHIRLPOOL eb14e30caff8ce1f8fee3651311ce1976ca5041d6c0d739eb916c33d6dc2d810cc10be66dfddf869b0a1dce3171c14ff2db393b5d4b0c0bdf8523d7e73c19606
 DIST ib_b60_doc.zip 10530848 SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a WHIRLPOOL 5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f
--- a/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0387.patch
+++ b/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0387.patch
@ -1,91 +0,0 @@
-diff -Naur Firebird-2.0.3.12981-0_orig/src/remote/protocol.cpp Firebird-2.0.3.12981-0/src/remote/protocol.cpp
--- Firebird-2.0.3.12981-0_orig/src/remote/protocol.cpp	2007-11-05 21:07:50.000000000 -0500
-+++ Firebird-2.0.3.12981-0/src/remote/protocol.cpp	2008-02-17 19:39:16.000000000 -0500
-@@ -1347,7 +1347,7 @@
- 
- 	rem_port* port = (rem_port*) xdrs->x_public;
- 
-	if (request_id >= port->port_object_vector->vec_count)
-+	if (!port->port_objects || request_id >= port->port_object_vector->vec_count)
- 		return FALSE;
- 
- 	rrq* request = (rrq*) port->port_objects[request_id];
-@@ -1644,7 +1644,7 @@
- 	rem_port* port = (rem_port*) xdrs->x_public;
- 	RSR statement;
- 	if (statement_id >= 0) {
-		if (statement_id >= port->port_object_vector->vec_count)
-+		if (!port->port_objects || statement_id >= port->port_object_vector->vec_count)
- 			return FALSE;
- 		if (!(statement = (RSR) port->port_objects[statement_id]))
- 			return FALSE;
-@@ -1736,7 +1736,7 @@
- 
- 	rem_port* port = (rem_port*) xdrs->x_public;
- 	if (statement_id >= 0) {
-		if (statement_id >= port->port_object_vector->vec_count)
-+		if (!port->port_objects || statement_id >= port->port_object_vector->vec_count)
- 			return FALSE;
- 		statement = (RSR) port->port_objects[statement_id];
- 	}
-diff -Naur Firebird-2.0.3.12981-0_orig/src/remote/server.cpp Firebird-2.0.3.12981-0/src/remote/server.cpp
--- Firebird-2.0.3.12981-0_orig/src/remote/server.cpp	2007-11-05 21:07:50.000000000 -0500
-+++ Firebird-2.0.3.12981-0/src/remote/server.cpp	2008-02-17 19:39:31.000000000 -0500
-@@ -74,7 +74,8 @@
- 
- #define CHECK_HANDLE(blk, cast, type, id, err)							\
- 	{																\
-		if (id >= port->port_object_vector->vec_count ||			\
-+		if (!port->port_objects ||									\
-+			id >= port->port_object_vector->vec_count ||			\
- 			!(blk = (cast) port->port_objects [id]) ||				\
- 			((BLK) blk)->blk_type != (UCHAR) type)					\
- 		{															\
-@@ -87,7 +88,8 @@
- 
- #define CHECK_HANDLE_MEMBER(blk, cast, type, id, err)					\
- 	{																\
-		if (id >= this->port_object_vector->vec_count ||			\
-+		if (!this->port_objects ||									\
-+			id >= this->port_object_vector->vec_count ||			\
- 			!(blk = (cast) this->port_objects [id]) ||				\
- 			((BLK) blk)->blk_type != (UCHAR) type)					\
- 		{															\
-@@ -1011,6 +1013,12 @@
- 	port->port_status_vector = status_vector;
- 	success(status_vector);
- 
-+	// This buffer is used by INET and WNET transports
-+	// to return the server identification string
-+	UCHAR buffer[BUFFER_TINY];
-+	const CSTRING save_string = send->p_resp.p_resp_data;
-+	send->p_resp.p_resp_data.cstr_address = buffer;
-+
- 	rem_port* aux_port = port->request(send);
- 	RDB rdb = port->port_context;
- 	if (bad_db(status_vector, rdb))
-@@ -1026,6 +1034,7 @@
- 		/* restore the port status vector */
- 
- 		port->port_status_vector = save_status;
-+		send->p_resp.p_resp_data = save_string;
- 		return;
- 	}
- 
-@@ -1037,6 +1046,7 @@
- /* restore the port status vector */
- 
- 	port->port_status_vector = save_status;
-+	send->p_resp.p_resp_data = save_string;
- }
- 
- 
-@@ -1448,6 +1458,8 @@
- 	printf("disconnect(server)        free rdb         %x\n", rdb);
- #endif
- 	this->port_context = NULL;
-+	if (this->port_async)
-+		this->port_async->port_context = NULL;
- 	ALLR_release(rdb);
- 	if (this->port_object_vector)
- 	{
--- a/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0467.patch
+++ b/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0467.patch
@ -1,629 +0,0 @@
-# Stolen from upstream CVS B2_0_Release branch
-# Fixes CVE-2008-0467http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0467
-# Debian BTS: http://bugs.debian.org/463596
-# Upstream CORE-1603: http://tracker.firebirdsql.org/browse/CORE-1603?page=com.atlassian.jira.plugin.system.issuetabpanels:cvs-tabpanel
--- 2.0.orig/src/jrd/constants.h
-+++ 2.0/src/jrd/constants.h
-@@ -56,7 +56,7 @@
- 
- /* Misc constant values */
- 
-const int USERNAME_LENGTH	= 31;	/* Characters */
-+const unsigned int USERNAME_LENGTH	= 31;	/* Characters */
- 
- const size_t MAX_SQL_IDENTIFIER_SIZE = 32;
- const size_t MAX_SQL_IDENTIFIER_LEN = MAX_SQL_IDENTIFIER_SIZE - 1;
--- 2.0.orig/src/jrd/isc.cpp
-+++ 2.0/src/jrd/isc.cpp
-@@ -87,14 +87,13 @@
- 
- #include <windows.h>
- #include <aclapi.h>
-+#include <lmcons.h>
- 
- static USHORT os_type;
- static SECURITY_ATTRIBUTES security_attr;
- 
- //static TEXT interbase_directory[MAXPATHLEN];
- 
-static bool check_user_privilege();
-
- #endif // WIN_NT
- 
- static TEXT user_name[256];
-@@ -393,14 +392,29 @@
- }
- #endif
- 
-+const TEXT* ISC_get_host(Firebird::string& host)
-+{
-+/**************************************
-+ *
-+ *      I S C _ g e t _ h o s t
-+ *
-+ **************************************
-+ *
-+ * Functional description
-+ *      Get host name in non-plain buffer.
-+ *
-+ **************************************/
-+	TEXT buffer[BUFFER_SMALL];
-+	ISC_get_host(buffer, sizeof(buffer));
-+	host = buffer;
-+	return host.c_str();
-+}
-+
- #ifdef UNIX
-int ISC_get_user(TEXT*	name,
-									  int*	id,
-									  int*	group,
-									  TEXT*	project,
-									  TEXT*	organization,
-									  int*	node,
-									  const TEXT*	user_string)
-+bool ISC_get_user(Firebird::string*	name, 
-+				  int*	id,
-+				  int*	group,
-+				  const TEXT*	user_string)
- {
- /**************************************
-  *
-@@ -448,7 +462,7 @@
- 	}
- 
- 	if (name)
-		strcpy(name, p);
-+		*name = p;
- 
- 	if (id)
- 		*id = euid;
-@@ -456,15 +470,6 @@
- 	if (group)
- 		*group = egid;
- 
-	if (project)
-		*project = 0;
-
-	if (organization)
-		*organization = 0;
-
-	if (node)
-		*node = 0;
-
- 	return (euid == 0);
- }
- #endif
-@@ -573,13 +578,10 @@
- #endif
- 
- #ifdef WIN_NT
-int ISC_get_user(TEXT*	name,
-									  int*	id,
-									  int*	group,
-									  TEXT*	project,
-									  TEXT*	organization,
-									  int*	node,
-									  const TEXT*	user_string)
-+bool ISC_get_user(Firebird::string*	name, 
-+				  int*	id,
-+				  int*	group,
-+				  const TEXT*	user_string)
- {
- /**************************************
-  *
-@@ -597,162 +599,25 @@
- 	if (group)
- 		*group = -1;
- 
-	if (project)
-		*project = 0;
-
-	if (organization)
-		*organization = 0;
-
-	if (node)
-		*node = 0;
-
- 	if (name)
- 	{
-		name[0] = 0;
-		DWORD  name_len = 128;
-		if (GetUserName(name, &name_len))
-		{
-			name[name_len] = 0;
-
-			/* NT user name is case insensitive */
-
-			for (DWORD i = 0; i < name_len; i++)
-			{
-				name[i] = UPPER7(name[i]);
-			}
-
-/* This check is not internationalized, the security model needs to be
- * reengineered, especially on SUPERSERVER where none of these local
- * user (in process) assumptions are valid.
-			if (!strcmp(name, "ADMINISTRATOR"))
-			{
-				if (id)
-					*id = 0;
-
-				if (group)
-					*group = 0;
-			}
- */
-		}
-	}
-
-	return check_user_privilege();
-}
-
-
-//____________________________________________________________
-//
-// Check to see if the user belongs to the administrator group.
-//
-// This routine was adapted from code in routine RunningAsAdminstrator
-// in \mstools\samples\regmpad\regdb.c.
-//
-static bool check_user_privilege()
-{
-	HANDLE tkhandle;
-	SID_IDENTIFIER_AUTHORITY system_sid_authority = {SECURITY_NT_AUTHORITY};
-
-	// First we must open a handle to the access token for this thread.
-
-	if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &tkhandle))
-	{
-		if (GetLastError() == ERROR_NO_TOKEN)
-+		DWORD name_len = UNLEN;
-+		TEXT* nm = name->getBuffer(name_len + 1);
-+		if (GetUserName(nm, &name_len))
- 		{
-			// If the thread does not have an access token, we'll examine the
-			// access token associated with the process.
-+			nm[name_len] = 0;
- 
-			if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &tkhandle))
-			{
-				CloseHandle(tkhandle);
-				return false;
-			}
-+			// NT user name is case insensitive
-+			CharUpperBuff(nm, name_len);
-+			name->recalculate_length();
- 		}
- 		else
- 		{
-			return false;
-+			*name = "";
- 		}
- 	}
- 
-	TOKEN_GROUPS*	ptg       = NULL;
-	DWORD			token_len = 0;
-
-	while (true)
-	{
-		/* Then we must query the size of the group information associated with
-		   the token.  This is guarenteed to fail the first time through
-		   because there is no buffer. */
-
-		if (GetTokenInformation(tkhandle,
-								TokenGroups,
-								ptg,
-								token_len,
-								&token_len))
-		{
-			break;
-		}
-
-		/* If there had been a buffer, it's either too small or something
-		   else is wrong.  Either way, we can dispose of it. */
-
-		if (ptg)
-		{
-			gds__free(ptg);
-		}
-
-		/* Here we verify that GetTokenInformation failed for lack of a large
-		   enough buffer. */
-
-		if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-		{
-			CloseHandle(tkhandle);
-			return false;
-		}
-
-		// Allocate a buffer for the group information.
-		ptg = (TOKEN_GROUPS *) gds__alloc((SLONG) token_len);
-
-		if (!ptg)
-		{
-			CloseHandle(tkhandle);
-			return false;		/* NOMEM: */
-		}
-		// FREE: earlier in this loop, and at procedure return
-	}
-
-	// Create a System Identifier for the Admin group.
-
-	PSID admin_sid;
-
-	if (!AllocateAndInitializeSid(&system_sid_authority, 2,
-								  SECURITY_BUILTIN_DOMAIN_RID,
-								  DOMAIN_ALIAS_RID_ADMINS,
-								  0, 0, 0, 0, 0, 0, &admin_sid))
-	{
-		gds__free(ptg);
-		CloseHandle(tkhandle);
-		return false;
-	}
-
-	// Finally we'll iterate through the list of groups for this access
-	// token looking for a match against the SID we created above.
-
-	bool admin_priv = false;
-
-	for (DWORD i = 0; i < ptg->GroupCount; i++)
-	{
-		if (EqualSid(ptg->Groups[i].Sid, admin_sid))
-		{
-			admin_priv = true;
-			break;
-		}
-	}
-
-	// Deallocate the SID we created.
-
-	FreeSid(admin_sid);
-	gds__free(ptg);
-	CloseHandle(tkhandle);
-	return admin_priv;
-+	return false;
- }
- #endif
- 
--- 2.0.orig/src/jrd/isc_proto.h
-+++ 2.0/src/jrd/isc_proto.h
-@@ -25,6 +25,7 @@
- #define JRD_ISC_PROTO_H
- 
- #include "../jrd/isc.h"
-+#include "../common/classes/fb_string.h"
- 
- void	ISC_ast_enter(void);
- void	ISC_ast_exit(void);
-@@ -32,9 +33,9 @@
- // There's no body for those functions.
- //void	ISC_get_config(TEXT *, struct ipccfg *);
- //int		ISC_set_config(TEXT *, struct ipccfg *);
-TEXT*	ISC_get_host(TEXT *, USHORT);
-int		ISC_get_user(TEXT*, int*, int*, TEXT*,
-											 TEXT*, int*, const TEXT*);
-+TEXT*  ISC_get_host(TEXT *, USHORT);
-+const TEXT* ISC_get_host(Firebird::string&);
-+bool  ISC_get_user(Firebird::string*, int*, int*, const TEXT*);
- SLONG	ISC_get_user_group_id(const TEXT*);
- void	ISC_set_user(const TEXT*);
- SLONG	ISC_get_prefix(const TEXT*);
--- 2.0.orig/src/jrd/jrd.cpp
-+++ 2.0/src/jrd/jrd.cpp
-@@ -6699,12 +6699,9 @@
-  **/
- static void getUserInfo(UserId& user, const DatabaseOptions& options)
- {
-	TEXT name[129] = "";
-	TEXT project[33] = "";
-	TEXT organization[33] = "";
-
-	int node_id = 0;
- 	int id = -1, group = -1;	// CVC: This var contained trash
-+	int node_id = 0;
-+	Firebird::string name;
- 
- #ifdef BOOT_BUILD
- 	bool wheel = true;
-@@ -6712,12 +6709,9 @@
- 	bool wheel = false;
- 	if (options.dpb_user_name.isEmpty()) 
- 	{
-       wheel = ISC_get_user(name,
-+       wheel = ISC_get_user(&name,
-                             &id,
-                             &group,
-                            project,
-                            organization,
-                            &node_id,
-                             options.dpb_sys_user_name.nullStr());
- 	}
- 
-@@ -6738,18 +6732,18 @@
- 		{
- 			if (options.dpb_user_name.hasData())
- 			{
-				options.dpb_user_name.copyTo(name, sizeof name);
-+				name = options.dpb_user_name;
- 			}
- 			else
- 			{
-				strcpy(name, "<Unknown>");
-+				name = "<Unknown>";
- 			}
- 		}
- 
- 		// if the name from the user database is defined as SYSDBA,
- 		// we define that user id as having system privileges
- 
-		if (!strcmp(name, SYSDBA_USER_NAME))
-+		if (name == SYSDBA_USER_NAME)
- 		{
- 			wheel = true;
- 		}
-@@ -6761,12 +6755,12 @@
- 
- 	if (wheel)
- 	{
-		strcpy(name, SYSDBA_USER_NAME);
-+		name = SYSDBA_USER_NAME;
- 	}
- 
- 	user.usr_user_name = name;
-	user.usr_project_name = project;
-	user.usr_org_name = organization;
-+	user.usr_project_name = "";
-+	user.usr_org_name = "";
- 	user.usr_sql_role_name = options.dpb_role_name;
- 	user.usr_user_id = id;
- 	user.usr_group_id = group;
--- 2.0.orig/src/jrd/jrd_pwd.h
-+++ 2.0/src/jrd/jrd_pwd.h
-@@ -66,11 +66,11 @@
- 
- 	static void initialize();
- 	static void shutdown();
-	static void verifyUser(TEXT*, const TEXT*, const TEXT*, const TEXT*,
-+	static void verifyUser(Firebird::string&, const TEXT*, const TEXT*, const TEXT*,
- 		int*, int*, int*, const Firebird::string&);
- 
- 	static void hash(Firebird::string& h, 
-					 const TEXT* userName, 
-+					 const Firebird::string& userName, 
- 					 const TEXT* passwd)
- 	{
- 		Firebird::string salt;
-@@ -79,7 +79,7 @@
- 	}
- 
- 	static void hash(Firebird::string& h, 
-					 const TEXT* userName, 
-+					 const Firebird::string& userName, 
- 					 const TEXT* passwd,
- 					 const Firebird::string& oldHash)
- 	{
-@@ -110,7 +110,7 @@
- 
- 	void fini();
- 	void init();
-	bool lookup_user(TEXT*, int*, int*, TEXT*);
-+	bool lookup_user(const TEXT*, int*, int*, TEXT*);
- 	bool prepare();
- 
- 	static SecurityDatabase instance;
--- 2.0.orig/src/jrd/pwd.cpp
-+++ 2.0/src/jrd/pwd.cpp
-@@ -263,7 +263,7 @@
- 	counter += (is_cached) ? 1 : 0;
- }
- 
-bool SecurityDatabase::lookup_user(TEXT * user_name, int *uid, int *gid, TEXT * pwd)
-+bool SecurityDatabase::lookup_user(const TEXT* user_name, int* uid, int* gid, TEXT* pwd)
- {
- 	bool found = false;		// user found flag
- 	TEXT uname[129];		// user name buffer
-@@ -433,7 +433,7 @@
- 	instance.fini();
- }
- 
-void SecurityDatabase::verifyUser(TEXT* name,
-+void SecurityDatabase::verifyUser(Firebird::string& name,
- 								  const TEXT* user_name,
- 								  const TEXT* password,
- 								  const TEXT* password_enc,
-@@ -444,12 +444,11 @@
- {
- 	if (user_name)
- 	{
-		TEXT* p = name;
-		for (const TEXT* q = user_name; *q; ++q, ++p)
-+		name = user_name;
-+		for (unsigned int n = 0; n < name.length(); ++n)
- 		{
-			*p = UPPER7(*q);
-+			name[n] = UPPER7(name[n]);
- 		}
-		*p = 0;
- 	}
- 
- #ifndef EMBEDDED
-@@ -459,7 +458,7 @@
- 	// that means the current context must be saved and restored.
- 
- 	TEXT pw1[MAX_PASSWORD_LENGTH + 1];
-	const bool found = instance.lookup_user(name, uid, gid, pw1);
-+	const bool found = instance.lookup_user(name.c_str(), uid, gid, pw1);
- 	pw1[MAX_PASSWORD_LENGTH] = 0;
- 	Firebird::string storedHash(pw1, MAX_PASSWORD_LENGTH);
- 	storedHash.rtrim();
--- 2.0.orig/src/jrd/svc.cpp
-+++ 2.0/src/jrd/svc.cpp
-@@ -516,7 +516,7 @@
- 		}
- 		else 
- 		{
-			TEXT name[129]; // unused after retrieved
-+			Firebird::string name; // unused after retrieved
- 			int id, group, node_id;
- 			
- 			Firebird::string remote = options.spb_network_protocol +
--- 2.0.orig/src/remote/inet.cpp
-+++ 2.0/src/remote/inet.cpp
-@@ -462,20 +462,16 @@
- 
- /* Pick up some user identification information */
- 	Firebird::ClumpletWriter user_id(Firebird::ClumpletReader::UnTagged, MAX_DPB_SIZE);
-	char buffer[BUFFER_SMALL];
-
-+	Firebird::string buffer;
- 	int eff_gid;
- 	int eff_uid;
-	ISC_get_user(buffer, &eff_uid, &eff_gid, 0, 0, 0, user_string);
-	user_id.insertString(CNCT_user, buffer, strlen(buffer));
- 
-	ISC_get_host(buffer, sizeof(buffer));
-	for (char* p = buffer; *p; p++) {
-		if (*p >= 'A' && *p <= 'Z') {
-			*p = *p - 'A' + 'a';
-		}
-	}
-	user_id.insertString(CNCT_host, buffer, strlen(buffer));
-+	ISC_get_user(&buffer, &eff_uid, &eff_gid, user_string);
-+	user_id.insertString(CNCT_user, buffer);
-+
-+	ISC_get_host(buffer);
-+	buffer.lower();
-+	user_id.insertString(CNCT_host, buffer);
- 
- 	if ((eff_uid == -1) || uv_flag) {
- 		user_id.insertTag(CNCT_user_verification);
--- 2.0.orig/src/remote/inet_server.cpp
-+++ 2.0/src/remote/inet_server.cpp
-@@ -96,6 +96,7 @@
- #include "../jrd/sch_proto.h"
- #include "../jrd/thread_proto.h"
- #include "../common/utils_proto.h"
-+#include "../common/classes/fb_string.h"
- 
- #ifdef UNIX
- #ifdef NETBSD
-@@ -328,14 +329,14 @@
-             // Remove restriction on username, for DEV builds
-             // restrict only for production builds.  MOD 21-July-2002
- #ifndef DEV_BUILD
-			TEXT user_name[256];	/* holds the user name */
-+			Firebird::string user_name;	/* holds the user name */
- 			/* check user id */
-			ISC_get_user(user_name, NULL, NULL, NULL, NULL, NULL, NULL);
-+			ISC_get_user(&user_name, NULL, NULL, NULL);
- 
-			if (strcmp(user_name, "root") &&
-				strcmp(user_name, FIREBIRD_USER_NAME) &&
-				strcmp(user_name, INTERBASE_USER_NAME) &&
-				strcmp(user_name, INTERBASE_USER_SHORT))
-+			if (user_name != "root" &&
-+				user_name != FIREBIRD_USER_NAME &&
-+				user_name != INTERBASE_USER_NAME &&
-+				user_name != INTERBASE_USER_SHORT)
- 			{
- 				/* invalid user -- bail out */
- 				fprintf(stderr,
--- 2.0.orig/src/remote/os/win32/wnet.cpp
-+++ 2.0/src/remote/os/win32/wnet.cpp
-@@ -135,25 +135,17 @@
- 	PACKET* packet = &rdb->rdb_packet;
- 
- /* Pick up some user identification information */
-	TEXT buffer[128];
-+	Firebird::string buffer;
- 	TEXT *p;
- 	Firebird::ClumpletWriter user_id(Firebird::ClumpletReader::UnTagged, MAX_DPB_SIZE);
- 
-	ISC_get_user(buffer, 0, 0, 0, 0, 0, 0);
-	for (p = buffer; *p; p++) {
-		if (*p >= 'A' && *p <= 'Z') {
-			*p = *p - 'A' + 'a';
-		}
-	}
-	user_id.insertString(CNCT_user, buffer, strlen(buffer));
-
-	ISC_get_host(buffer, sizeof(buffer));
-	for (p = buffer; *p; p++) {
-		if (*p >= 'A' && *p <= 'Z') {
-			*p = *p - 'A' + 'a';
-		}
-	}
-	user_id.insertString(CNCT_host, buffer, strlen(buffer));
-+	ISC_get_user(&buffer, 0, 0, 0);
-+	buffer.lower();
-+	user_id.insertString(CNCT_user, buffer);
-+
-+	ISC_get_host(buffer);
-+	buffer.lower();
-+	user_id.insertString(CNCT_host, buffer);
- 
- 	if (uv_flag) {
- 		user_id.insertTag(CNCT_user_verification);
--- 2.0.orig/src/remote/xnet.cpp
-+++ 2.0/src/remote/xnet.cpp
-@@ -214,25 +214,16 @@
- 
- 	// Pick up some user identification information
- 
-	TEXT buffer[BUFFER_TINY];
-	TEXT *p;
-+	Firebird::string buffer;
- 	Firebird::ClumpletWriter user_id(Firebird::ClumpletReader::UnTagged, MAX_DPB_SIZE);
- 
-	ISC_get_user(buffer, 0, 0, 0, 0, 0, 0);
-	for (p = buffer; *p; p++) {
-		if (*p >= 'A' && *p <= 'Z') {
-			*p = *p - 'A' + 'a';
-		}
-	}
-	user_id.insertString(CNCT_user, buffer, strlen(buffer));
-
-	ISC_get_host(buffer, sizeof(buffer));
-	for (p = buffer; *p; p++) {
-		if (*p >= 'A' && *p <= 'Z') {
-			*p = *p - 'A' + 'a';
-		}
-	}
-	user_id.insertString(CNCT_host, buffer, strlen(buffer));
-+	ISC_get_user(&buffer, 0, 0, 0);
-+	buffer.lower();
-+	user_id.insertString(CNCT_user, buffer);
-+
-+	ISC_get_host(buffer);
-+	buffer.lower();
-+	user_id.insertString(CNCT_host, buffer);
- 
- 	if (uv_flag) {
- 		user_id.insertTag(CNCT_user_verification);
--- 2.0.orig/src/utilities/guard/guard.cpp
-+++ 2.0/src/utilities/guard/guard.cpp
-@@ -45,6 +45,7 @@
- #include "../jrd/gds_proto.h"
- #include "../jrd/file_params.h"
- #include "../utilities/guard/util_proto.h"
-+#include "../common/classes/fb_string.h"
- 
- const USHORT FOREVER	= 1;
- const USHORT ONETIME	= 2;
-@@ -107,12 +108,13 @@
- 	}							/* while */
- 
- /* check user id */
-	TEXT user_name[256];		/* holds the user name */
-	ISC_get_user(user_name, NULL, NULL, NULL, NULL, NULL, NULL);
-+	Firebird::string user_name;		/* holds the user name */
-+	ISC_get_user(&user_name, NULL, NULL, NULL);
- 
-	if (strcmp(user_name, INTERBASE_USER) && strcmp(user_name, "root")
-		&& strcmp(user_name, FIREBIRD_USER)
-		&& strcmp(user_name, INTERBASE_USER_SHORT))
-+	if (user_name != INTERBASE_USER && 
-+		user_name != "root" &&
-+		user_name != FIREBIRD_USER &&
-+		user_name != INTERBASE_USER_SHORT)
- 	{
- 		/* invalid user bail out */
- 		fprintf(stderr,
--- a/dev-db/firebird/files/firebird-2.0.3.12981.0-external-libs.patch
+++ b/dev-db/firebird/files/firebird-2.0.3.12981.0-external-libs.patch
@ -1,45 +0,0 @@
-Index: firebird-2.0.0.12748/builds/posix/Makefile.in.firebird
-===================================================================
--- firebird-2.0.0.12748.orig/builds/posix/Makefile.in.firebird
-+++ firebird-2.0.0.12748/builds/posix/Makefile.in.firebird
-@@ -186,10 +186,10 @@ $(GEN_ROOT)/Make.Version : $(SRC_ROOT)/m
- # 
- 
- external_libraries:
-	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
-ifeq ($(EDITLINE_FLG),Y)
-	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
-endif
-+#	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
-+#ifeq ($(EDITLINE_FLG),Y)
-+#	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
-+#endif
- 
- #---------------------------------------------------------------------------
- # Phase1: make a gpre_static from scratch so we can parse .e and .epp files
-Index: firebird-2.0.0.12748/configure.in
-===================================================================
--- firebird-2.0.0.12748.orig/configure.in
-+++ firebird-2.0.0.12748/configure.in
-@@ -445,7 +445,7 @@
-			AC_CHECK_LIB(termcap, tgetent, , \
-				AC_CHECK_LIB(tinfo, tgetent, , \
-					AC_MSG_ERROR(termcap support not found)))))  
-	AC_SUBST(EDITLINE_A, -leditline)
-+	AC_SUBST(EDITLINE_A, -ledit)
- fi
- AC_CHECK_LIB(stdc++, main,,, $LIBS)
- 
-Index: firebird-2.0.0.12748/builds/posix/make.rules
-===================================================================
--- firebird-2.0.0.12748.orig/builds/posix/make.rules
-+++ firebird-2.0.0.12748/builds/posix/make.rules
-@@ -33,7 +33,7 @@
- 
- 
- # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
-CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n -DNAMESPACE=Vulcan
-+CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
- 
- ifeq ($(IsProdTypeBuild),Y)
-   CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
--- a/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch
+++ b/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch
@ -1,12 +0,0 @@
-diff -Naur Firebird-2.0.3.12981-0_orig/builds/posix/prefix.linux Firebird-2.0.3.12981-0/builds/posix/prefix.linux
--- Firebird-2.0.3.12981-0_orig/builds/posix/prefix.linux	2007-11-05 21:07:48.000000000 -0500
-+++ Firebird-2.0.3.12981-0/builds/posix/prefix.linux	2007-11-05 21:23:36.000000000 -0500
-@@ -20,7 +20,7 @@
- 
- # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
- # you may remove it if engine is getting compiled with any other GCC version
-PROD_FLAGS=-ggdb -O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin -DNDEBUG -DLINUX -pipe -MMD -fPIC -fmessage-length=0
-+PROD_FLAGS=-ggdb -DNDEBUG -DLINUX -pipe -MMD -fPIC
- DEV_FLAGS=-DUSE_VALGRIND -ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
- #DEV_FLAGS=-ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
- 
--- a/dev-db/firebird/files/firebird-2.0.3.12981.0-make-deps.patch
+++ b/dev-db/firebird/files/firebird-2.0.3.12981.0-make-deps.patch
@ -1,41 +0,0 @@
-Index: firebird-2.0.0.12748/builds/posix/make.shared.targets
-===================================================================
--- firebird-2.0.0.12748.orig/builds/posix/make.shared.targets
-+++ firebird-2.0.0.12748/builds/posix/make.shared.targets
-@@ -57,7 +57,7 @@ $(SRC_ROOT)/dsql/parse.cpp: $(SRC_ROOT)/
- 
- # gpre_meta needs a special boot build since there is no database.
- 
-$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
-+$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
- 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
- 
- 
-Index: firebird-2.0.0.12748/builds/posix/make.rules
-===================================================================
--- firebird-2.0.0.12748.orig/builds/posix/make.rules
-+++ firebird-2.0.0.12748/builds/posix/make.rules
-@@ -103,19 +103,19 @@ DSQL_GPRE_FLAGS =  -lang_internal -r -m 
- 
- .SUFFIXES: .c .e .epp .cpp
- 
-.e.c:
-+.e.c: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
-.epp.cpp:
-+.epp.cpp: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
-$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp 
-+$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp  $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
- 
- 
-$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp 
-+$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp  $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(DSQL_GPRE_FLAGS) $< $@
- 
- 
--- a/dev-db/firebird/files/firebird-2.1.2.18118.0-deps-flags-libs.patch
+++ b/dev-db/firebird/files/firebird-2.1.2.18118.0-deps-flags-libs.patch
@ -1,107 +0,0 @@
-diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/Makefile.in.firebird Firebird-2.1.2.18118-0/builds/posix/Makefile.in.firebird
--- Firebird-2.1.2.18118-0_orig/builds/posix/Makefile.in.firebird	2008-12-10 17:22:15.000000000 +0200
-+++ Firebird-2.1.2.18118-0/builds/posix/Makefile.in.firebird	2009-05-20 15:13:47.673202327 +0300
-@@ -185,14 +185,7 @@
- # 
- 
- external_libraries:
-ifeq ($(STD_ICU),false)
-	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
-endif
-ifeq ($(STD_EDITLINE),false)
-ifeq ($(EDITLINE_FLG),Y)
-	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
-endif
-endif
-+
- 
- btyacc_binary: $(BTYACC)
- 
-diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.defaults Firebird-2.1.2.18118-0/builds/posix/make.defaults
--- Firebird-2.1.2.18118-0_orig/builds/posix/make.defaults	2008-09-04 14:47:18.000000000 +0300
-+++ Firebird-2.1.2.18118-0/builds/posix/make.defaults	2009-05-20 15:15:31.088202976 +0300
-@@ -232,11 +232,7 @@
- LIBFBSTATIC_A = $(LIB)/libfbstatic.a
- 
- ifeq ($(EDITLINE_FLG),Y)
-  ifeq ($(STD_EDITLINE), true)
-	LIBEDITLINE := -leditline
-  else
-	LIBEDITLINE := $(LIB)/libeditline.a
-  endif
-+  LIBEDITLINE := -ledit
- endif
- 
- LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \
-diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.rules Firebird-2.1.2.18118-0/builds/posix/make.rules
--- Firebird-2.1.2.18118-0_orig/builds/posix/make.rules	2008-12-10 03:03:31.000000000 +0200
-+++ Firebird-2.1.2.18118-0/builds/posix/make.rules	2009-05-20 15:21:04.114225351 +0300
-@@ -33,9 +33,6 @@
- 
- # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
- CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
-ifeq ($(STD_ICU),false)
-  CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
-endif
- 
- ifeq ($(IsProdTypeBuild),Y)
-   CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
-@@ -69,7 +66,7 @@
- 
- .SUFFIXES: .c .e .epp .cpp
- 
-.e.c:
-+.e.c: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
-diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.shared.targets Firebird-2.1.2.18118-0/builds/posix/make.shared.targets
--- Firebird-2.1.2.18118-0_orig/builds/posix/make.shared.targets	2008-12-10 03:03:31.000000000 +0200
-+++ Firebird-2.1.2.18118-0/builds/posix/make.shared.targets	2009-05-20 15:21:59.299203496 +0300
-@@ -49,7 +49,7 @@
- 
- # gpre_meta needs a special boot build since there is no database.
- 
-$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
-+$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
- 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
- 
- 
-diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/prefix.linux Firebird-2.1.2.18118-0/builds/posix/prefix.linux
--- Firebird-2.1.2.18118-0_orig/builds/posix/prefix.linux	2007-05-03 14:24:50.000000000 +0300
-+++ Firebird-2.1.2.18118-0/builds/posix/prefix.linux	2009-05-20 15:23:17.286523276 +0300
-@@ -20,12 +20,10 @@
- 
- # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
- # you may remove it if engine is getting compiled with any other GCC version
-
-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
-OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin
-+COMMON_FLAGS=-ggdb -DLINUX -pipe -MMD -fPIC
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- 
-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS)
- DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
- #DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
- 
-diff -Naur Firebird-2.1.2.18118-0_orig/configure Firebird-2.1.2.18118-0/configure
--- Firebird-2.1.2.18118-0_orig/configure	2009-03-30 09:42:44.000000000 +0300
-+++ Firebird-2.1.2.18118-0/configure	2009-05-20 15:26:30.856202564 +0300
-@@ -4027,13 +4027,13 @@
- # not need editline in default libs, but need to test for its presence
- saveLIBS=$LIBS
- if test "$STD_EDITLINE" = "true"; then
-  { echo "$as_me:$LINENO: checking for readline in -leditline" >&5
-echo $ECHO_N "checking for readline in -leditline... $ECHO_C" >&6; }
-+  { echo "$as_me:$LINENO: checking for readline in -ledit" >&5
-+echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; }
- if test "${ac_cv_lib_editline_readline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-LIBS="-leditline  $LIBS"
-+LIBS="-ledit  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
--- a/dev-db/firebird/files/firebird-2.1.2.18118.0-gcc-icu-declare.patch
+++ b/dev-db/firebird/files/firebird-2.1.2.18118.0-gcc-icu-declare.patch
@ -1,27 +0,0 @@
--- src/common/classes/alloc.h.old	2009-07-09 13:04:14.000000000 +0200
-+++ src/common/classes/alloc.h	2009-07-09 13:05:37.000000000 +0200
-@@ -48,6 +48,8 @@
- 					   stdlib.h (EKU) */
- #endif
- 
-+#include <new>
-+
- #ifdef _MSC_VER
- #define THROW_BAD_ALLOC
- #else
-@@ -448,15 +450,6 @@
- 	);
- }
- 
-inline void* operator new(size_t, void* ptr) throw() 
-{
-	return ptr;
-}
-inline void* operator new[](size_t, void* ptr) throw() 
-{
-	return ptr;
-}
-
- inline void operator delete(void* mem) throw()
- {
- 	Firebird::MemoryPool::globalFree(mem);
--- a/dev-db/firebird/files/firebird-2.5.0.26074.0-build.patch
+++ b/dev-db/firebird/files/firebird-2.5.0.26074.0-build.patch
@ -1,228 +0,0 @@
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.client.util B2_5_Release/builds/posix/Makefile.in.client.util
--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.client.util	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.client.util	2011-03-09 23:35:01.000000000 -0500
-@@ -53,11 +53,6 @@
- $(CLUMPLETS_Objects) $(FBCONFIG_Objects)
- 
- 
-CREATEDB_Files= create_db.cpp
-CREATEDB_Sources = $(addprefix utilities/, $(CREATEDB_Files))
-CREATEDB_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CREATEDB_Sources))))
-
-
- DROP_Other_Sources = common/utils.cpp lock/lock.cpp jrd/isc_sync.cpp jrd/isc.cpp \
- common/config/config.cpp common/config/config_file.cpp $(OS_SPECIFIC_Sources)
- 
-@@ -133,7 +128,7 @@
- RELAY_Sources = $(addprefix utilities/, $(RELAY_Files))
- RELAY_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(RELAY_Sources))))
- 
-AllObjects = $(CREATEDB_Object) $(DROP_Object) $(GSTAT_Object) $(FBGUARD_Objects) \
-+AllObjects = $(DROP_Object) $(GSTAT_Object) $(FBGUARD_Objects) \
- 			 $(FBMGR_Objects) $(REBUILD_Objects) $(RELAY_Objects) $(FBSVCMGR_Objects) \
- 			  $(FBTRACEMGR_Objects)
- 
-@@ -141,17 +136,11 @@
- Dependencies = $(AllObjects:.o=.d) 
- 
- 
-.PHONY: all gstat gsec fbguard fbmgr_bin nbackup gds_drop gds_relay create_db fb_lock_print \
-+.PHONY: all gstat gsec fbguard fbmgr_bin nbackup gds_drop gds_relay fb_lock_print \
- 	fbsvcmgr fbtracemgr
- 
- all: $(CLIENT_UTIL_TARGETS)
- 
-create_db: $(CREATE_DB)
-
-$(CREATE_DB):	$(CREATEDB_Objects) 
-	$(STATICEXE_LINK) $(LINK_OPTS) $(CREATEDB_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
-
-
- nbackup: $(LIBFBCLIENT_SO) $(NBACKUP)
- 
- $(NBACKUP):	$(NBACKUP_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.codes B2_5_Release/builds/posix/Makefile.in.codes
--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.codes	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.codes	2011-03-09 23:35:01.000000000 -0500
-@@ -22,7 +22,8 @@
- # 
- #
- ROOT=..
-ObjModuleType=std
-+ObjModuleType=boot
-+CXXFLAGS+= -DBOOT_BUILD
- 
- include     $(ROOT)/gen/make.defaults
- include     $(ROOT)/gen/make.platform
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.embed.util B2_5_Release/builds/posix/Makefile.in.embed.util
--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.embed.util	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.embed.util	2011-03-09 23:35:01.000000000 -0500
-@@ -56,11 +56,6 @@
- $(FBCONFIG_Objects)
- 
- 
-CREATEDB_Files= create_db.cpp
-CREATEDB_Sources = $(addprefix utilities/, $(CREATEDB_Files))
-CREATEDB_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CREATEDB_Sources))))
-
-
- DROP_Other_Sources += common/utils.cpp jrd/isc_sync.cpp jrd/isc.cpp \
- common/config/config.cpp common/config/config_file.cpp $(OS_SPECIFIC_Sources)
- 
-@@ -128,30 +123,19 @@
- RELAY_Sources = $(addprefix utilities/, $(RELAY_Files))
- RELAY_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(RELAY_Sources))))
- 
-AllObjects = $(CREATEDB_Object) $(DROP_Object) $(FBSVCMGR_Objects) \
-+AllObjects = $(DROP_Object) $(FBSVCMGR_Objects) \
- 			 $(GSEC_Objects) $(GSTAT_Object) $(FBGUARD_Objects) \
- 			 $(IBMGR_Objects) $(REBUILD_Objects) $(RELAY_Objects) $(CLUMPLETS_Objects)
- 
- Dependencies = $(AllObjects:.o=.d) 
- 
- 
-.PHONY: create_db gstat gds_drop gds_relay gsec fbguard ibmgr_bin nbackup fb_lock_print \
-+.PHONY: gstat gds_drop gds_relay gsec fbguard ibmgr_bin nbackup fb_lock_print \
- 	fbsvcmgr fbtracemgr
- 
- all: $(EMBED_UTIL_TARGETS)
- 
- 
-# it's important to note here that create_db is linked against the static
-# 'boot' libraries rather than the later embedded shared library.  The
-# other utilities are released but create_db is used in construction.
-# MOD 29-July-2002
-
-create_db: $(CREATE_DB)
-
-$(CREATE_DB):	$(CREATEDB_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
-	$(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS)
-
-
- nbackup: $(LIBFBEMBED_SO) $(NBACKUP)
- 
- $(NBACKUP):	$(NBACKUP_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.examples B2_5_Release/builds/posix/Makefile.in.examples
--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.examples	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.examples	2011-03-09 23:35:01.000000000 -0500
-@@ -29,7 +29,8 @@
- #
- #
- ROOT=../..
-ObjModuleType=std
-+ObjModuleType=boot
-+CXXFLAGS+= -DBOOT_BUILD
- 
- # Add the install include directory to the search path since the
- # examples need to build using those headers values.
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.fbtrace B2_5_Release/builds/posix/Makefile.in.fbtrace
--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.fbtrace	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.fbtrace	2011-03-21 16:00:40.000000000 -0400
-@@ -71,6 +71,12 @@
- 
- fbtrace: $(FBTRACE)
- 
-+ifeq (@FIREBIRD_ARCH_TYPE@,classic)
-+  LINK_TRACE_LIBS += -lfbembed
-+else
-+  FBTRACE_Objects += $(addprefix $(OBJ)/, $(addsuffix .o, $(basename jrd/gds.cpp)))
-+endif
-+
- $(FBTRACE):	$(FBTRACE_Objects)
- 	$(LINK_TRACE) -o $@ $^ $(LINK_TRACE_LIBS)
- 
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird B2_5_Release/builds/posix/Makefile.in.firebird
--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.firebird	2011-03-09 23:35:01.000000000 -0500
-@@ -263,7 +263,7 @@
- $(ISC_GDB): create_db empty_db gbak_static isql_static ref_databases
- 
- create_db:
-	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.util $(CREATE_DB)
-+	$(MAKE) -f $(GEN_ROOT)/Makefile.static.createdb
- 
- gbak_static:
- 	$(MAKE) $(CPU_OPTION) -f $(GEN_ROOT)/Makefile.static.gbak
-@@ -286,8 +286,7 @@
- 
- #--------------------------------------------------------------------------
- #Phase3: Now we start building the tools we are actually going to use
-#  against the shared library.
-#  an empty database (lock manager and create_db).  Then we rebuild all the
-+#  against the shared library. Then we rebuild all the
- #  items we have built in the static library into a dynamic library.
- #  (It's probably possible to directly build the dynamic library - but thats
- #  for another day). We still don't have the security database stuff.
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.msgs B2_5_Release/builds/posix/Makefile.in.msgs
--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.msgs	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.msgs	2011-03-09 23:35:01.000000000 -0500
-@@ -28,7 +28,8 @@
- # 
- #
- ROOT=..
-ObjModuleType=std
-+ObjModuleType=boot
-+CXXFLAGS+= -DBOOT_BUILD
- 
- include     $(ROOT)/gen/make.defaults
- include     $(ROOT)/gen/make.platform
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.refDatabases B2_5_Release/builds/posix/Makefile.in.refDatabases
--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.refDatabases	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.refDatabases	2011-03-09 23:35:01.000000000 -0500
-@@ -29,7 +29,8 @@
- #
- #
- ROOT=..
-ObjModuleType=std
-+ObjModuleType=boot
-+CXXFLAGS+= -DBOOT_BUILD
- 
- include     $(ROOT)/gen/make.defaults
- include     $(ROOT)/gen/make.platform
-@@ -53,8 +54,8 @@
- 
- .PHONY: empty_db refDatabases
- 
-# This is where you are going to have trouble if there is one, at creating 
-# the first empty database.  Things to watch out for, $INTERBASE variable 
-+# This is where you are going to have trouble if there is one, at creating
-+# the first empty database.  Things to watch out for, $INTERBASE variable
- # pointing in the wrong place, shared library path LD_LIBRARY_PATH
- # not pointing to new stuff (mind you this point it should be creating
- # using create_db statically linked).
-@@ -62,7 +63,7 @@
- empty_db : empty.fdb yachts.lnk
- 
- empty.fdb : $(CREATE_DB)
-	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.util $(BIN)/create_db
-+	$(MAKE) -f $(GEN_ROOT)/Makefile.static.createdb
- 	-$(RM) $@
- 	$(BIN)/create_db $@
- 	$(TOUCH) $@
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults B2_5_Release/builds/posix/make.defaults
--- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/make.defaults	2011-03-09 23:35:01.000000000 -0500
-@@ -49,9 +49,11 @@
- 
- FIREBIRD=$(GEN_ROOT)/firebird
- INTERBASE=$(FIREBIRD)
-+FIREBIRD_LOCK=$(shell cd $(FIREBIRD); pwd)
- 
- export INTERBASE
- export FIREBIRD
-+export FIREBIRD_LOCK
- 
- LIB=$(FIREBIRD)/lib
- BIN=$(FIREBIRD)/bin
-diff -Naur Firebird-2.5.0.26074-0_orig/configure.in B2_5_Release/configure.in
--- Firebird-2.5.0.26074-0_orig/configure.in    2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/configure.in   2011-06-13 17:10:35.412587676 -0400
-@@ -1359,6 +1389,7 @@
- gen/Makefile.static.gpre:${MAKE_SRC_DIR}/Makefile.in.static.gpre
- gen/Makefile.static.gbak:${MAKE_SRC_DIR}/Makefile.in.static.gbak
- gen/Makefile.static.isql:${MAKE_SRC_DIR}/Makefile.in.static.isql
-+gen/Makefile.static.createdb:${MAKE_SRC_DIR}/Makefile.in.static.createdb
- gen/Makefile.refDatabases:${MAKE_SRC_DIR}/Makefile.in.refDatabases
- gen/Makefile.fbserver:${MAKE_SRC_DIR}/Makefile.in.fbserver
- gen/Makefile.smp_server:${MAKE_SRC_DIR}/Makefile.in.smp_server
-
--- a/dev-db/firebird/files/firebird-2.5.0.26074.0-client.patch
+++ b/dev-db/firebird/files/firebird-2.5.0.26074.0-client.patch
@ -1,12 +0,0 @@
-diff -Naur orig/builds/posix/Makefile.in.firebird builds/posix/Makefile.in.firebird
--- orig/builds/posix/Makefile.in.firebird	2010-11-12 15:46:22.000000000 -0500
-+++ builds/posix/Makefile.in.firebird	2010-11-12 16:36:22.000000000 -0500
-@@ -145,7 +145,7 @@
- 
- firebird : firebird_@FIREBIRD_ARCH_TYPE@ $(PLATFORM_POSTBUILD_TARGET)
- 
-firebird_classic firebird_embedded: firebird_basic classic_targets fbtrace
-+firebird_classic firebird_embedded: firebird_boot libfbclient includes
- firebird_super firebird_server: firebird_basic super_targets fbtrace
- 
- 
--- a/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags-libs.patch
+++ b/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags-libs.patch
@ -1,155 +0,0 @@
-diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0/builds/posix/Makefile.in.firebird
--- Firebird-2.5.0.26074-0_orig//builds/posix/Makefile.in.firebird	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/builds/posix/Makefile.in.firebird	2010-11-12 15:45:04.000000000 -0500
-@@ -158,7 +158,7 @@
- # some complications particularly for super in needing to start the server
- # that you are currently building. MOD 28-July-2002
- 
-firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets
-+firebird_basic: firebird_boot basic_targets
- 
- firebird_boot: updateBuildNum boot_phase1 boot_phase2 
- 
-@@ -189,14 +189,6 @@
- # 
- 
- external_libraries:
-ifeq ($(STD_ICU),false)
-	$(MAKE) CFLAGS="@CFLAGS@" -f $(GEN_ROOT)/Makefile.extern.icu
-endif
-ifeq ($(STD_EDITLINE),false)
-ifeq ($(EDITLINE_FLG),Y)
-	$(MAKE) CFLAGS="@CFLAGS@" $(CPU_OPTION) -f $(GEN_ROOT)/Makefile.extern.editline
-endif
-endif
- 
- btyacc_binary: $(BTYACC)
- 
-@@ -373,7 +365,7 @@
- .PHONY: fbserver 
- .PHONY: libfbclient client_gfix client_gbak client_isql client_gpre client_util client_fbudf
- 
-super_targets: $(PLAT_SUPER_PRE_TARGET) fbserver libfbclient client_gfix client_gbak client_gsec\
-+super_targets: $(PLAT_SUPER_PRE_TARGET) fbserver libfbclient libfbembed fb_smp_server client_gfix client_gbak client_gsec\
- 			client_isql client_gpre client_util client_fbudf client_gdef client_qli $(PLAT_SUPER_POST_TRAGET) 
- 
- fbserver:
-diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/make.defaults Firebird-2.5.0.26074-0/builds/posix/make.defaults
--- Firebird-2.5.0.26074-0_orig//builds/posix/make.defaults	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/builds/posix/make.defaults	2010-11-12 15:42:03.000000000 -0500
-@@ -138,7 +138,7 @@
- AR=			ar @AR_OPTIONS@ crsu
- LN=			@LN_S@
- RANLIB=			@RANLIB@
-BTYACC=$(ROOT)/extern/btyacc/btyacc
-+BTYACC=/usr/bin/btyacc
- 
- CC =	@CC@
- CXX =	@CXX@
-@@ -222,13 +222,7 @@
- 
- LIBFBSTATIC_A = $(LIB)/libfbstatic.a
- 
-ifeq ($(EDITLINE_FLG),Y)
-  ifeq ($(STD_EDITLINE), true)
-	LIBEDITLINE := -l$(READLINE)
-  else
-	LIBEDITLINE := $(LIB)/libedit.a
-  endif
-endif
-+LIBEDITLINE := -ledit
- 
- LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc*.$(SHRLIB_FOREIGN_EXT) \
- 			$(LIB)/$(LIB_PREFIX)icudata*.$(SHRLIB_FOREIGN_EXT) \
-diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/make.rules Firebird-2.5.0.26074-0/builds/posix/make.rules
--- Firebird-2.5.0.26074-0_orig//builds/posix/make.rules	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/builds/posix/make.rules	2010-11-12 15:06:43.000000000 -0500
-@@ -35,10 +35,6 @@
- WFLAGS:=-I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan \
- 	-DNAMESPACE=Vulcan
- 
-ifeq ($(STD_ICU),false)
-  WFLAGS:= $(WFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
-endif
-
- ifeq ($(IsProdTypeBuild),Y)
-   WFLAGS:= $(WFLAGS) $(PROD_FLAGS)
- else
-@@ -72,7 +68,7 @@
- 
- .SUFFIXES: .c .e .epp .cpp
- 
-.e.c:
-+.e.c: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
-diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/make.shared.targets Firebird-2.5.0.26074-0/builds/posix/make.shared.targets
--- Firebird-2.5.0.26074-0_orig//builds/posix/make.shared.targets	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/builds/posix/make.shared.targets	2010-11-12 15:06:43.000000000 -0500
-@@ -49,7 +49,7 @@
- 
- # gpre_meta needs a special boot build since there is no database.
- 
-$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
-+$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
- 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
- 
- 
-diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/prefix.linux Firebird-2.5.0.26074-0/builds/posix/prefix.linux
--- Firebird-2.5.0.26074-0_orig//builds/posix/prefix.linux	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/builds/posix/prefix.linux	2010-11-12 15:06:43.000000000 -0500
-@@ -18,11 +18,10 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
- 
-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
-OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
-+COMMON_FLAGS=-DLINUX -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- 
-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
- 
-diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0/builds/posix/prefix.linux_amd64
--- Firebird-2.5.0.26074-0_orig//builds/posix/prefix.linux_amd64	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/builds/posix/prefix.linux_amd64	2010-11-12 15:06:43.000000000 -0500
-@@ -18,12 +18,11 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
- 
-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer 
-+COMMON_FLAGS=-DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- CXXFLAGS:= $(CXXFLAGS) -fno-rtti
- 
-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
- 
-diff -Naur Firebird-2.5.0.26074-0_orig//configure Firebird-2.5.0.26074-0/configure
--- Firebird-2.5.0.26074-0_orig//configure	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/configure	2010-11-12 15:06:44.000000000 -0500
-@@ -4585,13 +4585,15 @@
- if test "x$ac_cv_lib_edit_readline" = x""yes; then
-   READLINE=edit EDITLINE_FLG=Y
- else
-  { $as_echo "$as_me:$LINENO: checking for readline in -leditline" >&5
-$as_echo_n "checking for readline in -leditline... " >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for readline in -ledit" >&5
-+$as_echo_n "checking for readline in -ledit... " >&6; }
-+
-+
- if test "${ac_cv_lib_editline_readline+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-LIBS="-leditline  $LIBS"
-+LIBS="-ledit  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
--- a/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags.patch
+++ b/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags.patch
@ -1,59 +0,0 @@
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird
--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird	2011-03-28 15:10:09.814370706 -0400
-@@ -158,7 +158,7 @@
- # some complications particularly for super in needing to start the server
- # that you are currently building. MOD 28-July-2002
- 
-firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets
-+firebird_basic: firebird_boot basic_targets
- 
- firebird_boot: updateBuildNum boot_phase1 boot_phase2 
- 
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults
--- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults	2011-03-28 15:21:26.904370708 -0400
-@@ -138,7 +138,7 @@
- AR=			ar @AR_OPTIONS@ crsu
- LN=			@LN_S@
- RANLIB=			@RANLIB@
-BTYACC=$(ROOT)/extern/btyacc/btyacc
-+BTYACC=/usr/bin/btyacc
- 
- CC =	@CC@
- CXX =	@CXX@
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux
--- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux	2011-03-25 21:38:29.031037374 -0400
-@@ -18,11 +18,10 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
- 
-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
-OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
-+COMMON_FLAGS=-DLINUX -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- 
-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
- 
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64
--- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64	2011-03-25 21:39:15.134370707 -0400
-@@ -18,12 +18,11 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
- 
-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer 
-+COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- CXXFLAGS:= $(CXXFLAGS) -fno-rtti
- 
-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
- 
--- a/dev-db/firebird/files/firebird-2.5.0.26074.0-superclassic.patch
+++ b/dev-db/firebird/files/firebird-2.5.0.26074.0-superclassic.patch
@ -1,12 +0,0 @@
-diff -Naur orig/builds/posix/Makefile.in.firebird builds/posix/Makefile.in.firebird
--- orig/builds/posix/Makefile.in.firebird	2010-11-09 12:42:45.000000000 -0500
-+++ builds/posix/Makefile.in.firebird	2011-03-07 20:26:56.612573632 -0500
-@@ -332,7 +332,7 @@
- .PHONY: libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql 
- .PHONY: embed_gpre embed_util
- 
-classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql \
-+classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed fbserver fb_smp_server embed_gfix embed_gbak embed_isql \
- 	embed_gpre libfbclient embed_util embed_gdef embed_qli embed_fbudf $(PLAT_CLASSIC_POST_TARGET)
- 
- libfbembed:
--- a/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild
+++ b/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild
@ -1,273 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild,v 1.6 2012/06/04 06:30:31 zmedico Exp $
-
-inherit flag-o-matic eutils autotools user versionator multilib
-
-MY_P=Firebird-$(replace_version_separator 4 -)
-
-DESCRIPTION="A relational database offering many ANSI SQL-99 features"
-HOMEPAGE="http://www.firebirdsql.org/"
-SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
-	 doc? (	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="amd64 -ia64 x86"
-IUSE="doc xinetd examples debug"
-RESTRICT="userpriv"
-
-RDEPEND="dev-libs/libedit
-	dev-libs/icu"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )"
-RDEPEND="${RDEPEND}
-	xinetd? ( virtual/inetd )
-	!sys-cluster/ganglia"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
-}
-
-function check_sed() {
-	MSG="sed of $3, required $2 lines modified $1"
-	einfo "${MSG}"
-	[[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-src_unpack() {
-	if use doc; then
-		# Unpack docs
-		mkdir "${WORKDIR}/manuals"
-		cd "${WORKDIR}/manuals"
-		unpack ib_b60_doc.zip
-		cd "${WORKDIR}"
-	fi
-
-	unpack "${MY_P}.tar.bz2"
-
-	# compile time relative path hacks, ew :(
-	mkdir -p "${WORKDIR}/../etc" \
-		"${WORKDIR}/usr" \
-		"${WORKDIR}/var/log/firebird" \
-		"${WORKDIR}/var/run/firebird"
-	cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin"
-	cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird
-
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-CVE-2008-0387.patch"
-	epatch "${FILESDIR}/${P}-CVE-2008-0467.patch"
-	epatch "${FILESDIR}/${P}-external-libs.patch"
-	epatch "${FILESDIR}/${P}-flags.patch"
-	epatch "${FILESDIR}/${P}-make-deps.patch"
-
-	einfo "Split up Firebird via relative path hacks"
-	# sed vs patch for portability and addtional location changes
-	# based on FIREBIRD=/usr/lib/firebird
-	check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \
-		src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \
-		-e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \
-		-e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \
-		-e 's:"isc_config:"../../../var/run/firebird/isc_config:w /dev/stdout' \
-		-e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \
-		-e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \
-		-e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/jrd/file_params.h | wc -l)" "14" "src/jrd/file_params.h" # 14 lines
-	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line
-	check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
-		src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \
-		-e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \
-		-e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \
-		-e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \
-		-e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \
-		-e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \
-		-e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \
-		-e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \
-		-e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \
-		src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines
-	check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \
-		src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line
-	check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
-		src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \
-		src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \
-		src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line
-	check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \
-		src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line
-
-	# Rename references to isql to fbsql
-	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
-		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		src/msgs/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		-e 's:ISQL :FBSQL :w /dev/stdout' \
-		src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.sql" # 4 lines
-
-	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
-	rm -rf "${S}"/extern/{editline,icu}
-
-	eautoreconf
-}
-
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	econf --prefix=/usr/$(get_libdir)/firebird --with-editline \
-		$(use_enable !xinetd superserver) \
-		$(use_enable debug) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "error during make"
-}
-
-src_install() {
-	cd "${S}/gen/firebird"
-
-# Seems to be ignored?
-	insinto /usr/share/firebird/bin
-	dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-	rm bin/*.sh || die "Could not remove *sh files"
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql
-
-	insinto /usr/bin
-	dobin bin/*
-
-	insinto /usr/include
-	doins include/*
-
-	insinto /usr/$(get_libdir)
-	dolib.so lib/*.so*
-	dolib.a lib/*.a*
-
-	insinto /usr/$(get_libdir)/firebird
-	doins *.msg
-
-	insinto /usr/$(get_libdir)/firebird/help
-	doins help/help.fdb
-
-	insinto /usr/share/firebird/upgrade
-	doins "${S}"/src/misc/upgrade/v2/*
-
-	insinto /etc/firebird
-	insopts -m0644 -o firebird -g firebird
-	doins misc/*
-	doins ../install/misc/aliases.conf
-	insopts -m0660 -o firebird -g firebird
-	doins security2.fdb
-
-	exeinto /usr/$(get_libdir)/firebird/UDF
-	doexe UDF/*.so
-
-	exeinto /usr/$(get_libdir)/firebird/intl
-	newexe intl/libfbintl.so fbintl.so
-
-	insinto /usr/$(get_libdir)/firebird/intl
-	doins ../install/misc/fbintl.conf
-
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/firebird
-	dodir /var/run/firebird
-	keepdir /var/log/firebird
-	keepdir /var/run/firebird
-
-	# create links for backwards compatibility
-	cd "${D}/usr/$(get_libdir)"
-	ln -s libfbclient.so libgds.so
-	ln -s libfbclient.so libgds.so.0
-	ln -s libfbclient.so libfbclient.so.1
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
-	else
-		newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-		newconfd "${FILESDIR}/${PN}.conf.d.2" ${PN}
-		fperms 640 /etc/conf.d/${PN}
-	fi
-	doenvd "${FILESDIR}/70${PN}"
-
-	# Install docs
-	use doc && dodoc "${WORKDIR}"/manuals/*
-	use examples && docinto examples
-}
-
-pkg_postinst() {
-	# Hack to fix ownership/perms
-	chown -fR firebird:firebird "${ROOT}/etc/firebird" \
-		"${ROOT}/usr/$(get_libdir)/firebird"
-	chmod 750 "${ROOT}/etc/firebird"
-
-	elog
-	elog "Firebird is no longer installed in /opt. Binaries are in"
-	elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
-	elog "are in /var/log/firebird, and lock files in /var/run/firebird"
-	elog "The command line tool isql has been renamed to fbsql."
-	elog "Please report any problems or issues to bugs.gentoo.org."
-	elog
-}
-
-pkg_config() {
-	# if found /etc/security.gdb from previous install, backup, and restore as
-	# /etc/security2.fdb
-	if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
-		# if we have scurity2.fdb already, back it 1st
-		if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
-			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
-		fi
-		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
-		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
-		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
-		rm "${ROOT}/etc/firebird/security.gbk"
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
-		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
-
-		einfo
-		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
-		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
-		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
-		einfo
-	fi
-
-	# we need to enable local access to the server
-	if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
-		touch "${ROOT}/etc/hosts.equiv"
-		chown root:0 "${ROOT}/etc/hosts.equiv"
-		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost.localdomain' to the hosts.equiv file...
-	if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost' to the hosts.equiv file...
-	if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /usr/lib/firebird/UDF"
-}
--- a/dev-db/firebird/firebird-2.1.3.18185.0-r1.ebuild
+++ b/dev-db/firebird/firebird-2.1.3.18185.0-r1.ebuild
@ -1,279 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.3.18185.0-r1.ebuild,v 1.1 2013/01/24 04:52:12 pinkbyte Exp $
-
-inherit flag-o-matic eutils autotools user versionator
-
-MY_P=Firebird-$(replace_version_separator 4 -)
-#MY_P=Firebird-${PV/_rc/-ReleaseCandidate}
-
-DESCRIPTION="A relational database offering many ANSI SQL-99 features"
-HOMEPAGE="http://www.firebirdsql.org/"
-SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
-	 doc? (	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 -ia64 ~x86"
-IUSE="doc xinetd examples debug"
-RESTRICT="userpriv"
-
-RDEPEND="dev-libs/libedit
-	dev-libs/icu"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )"
-RDEPEND="${RDEPEND}
-	xinetd? ( virtual/inetd )
-	!sys-cluster/ganglia"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /usr/lib/firebird firebird
-}
-
-function check_sed() {
-	MSG="sed of $3, required $2 lines modified $1"
-	einfo "${MSG}"
-	[[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-src_unpack() {
-	if use doc; then
-		# Unpack docs
-		mkdir "${WORKDIR}/manuals"
-		cd "${WORKDIR}/manuals"
-		unpack ib_b60_doc.zip
-		cd "${WORKDIR}"
-	fi
-
-	unpack "${MY_P}.tar.bz2"
-
-	# compile time relative path hacks, ew :(
-	mkdir -p "${WORKDIR}/../etc" \
-		"${WORKDIR}/usr" \
-		"${WORKDIR}/var/log/firebird" \
-		"${WORKDIR}/var/run/firebird"
-	cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin"
-	cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird
-
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-2.1.2.18118.0-deps-flags-libs.patch"
-
-	einfo "Split up Firebird via relative path hacks"
-	# sed vs patch for portability and addtional location changes
-	# based on FIREBIRD=/usr/lib/firebird
-	check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \
-		src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \
-		-e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \
-		-e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \
-		-e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \
-		-e 's:"isc_monitor1:"../../../var/run/firebird/isc_monitor1:w /dev/stdout' \
-		-e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \
-		-e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/jrd/file_params.h | wc -l)" "12" "src/jrd/file_params.h" # 12 lines
-	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line
-	check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
-		src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \
-		-e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \
-		-e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \
-		-e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \
-		-e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \
-		-e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \
-		-e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \
-		-e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \
-		-e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \
-		src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines
-	check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \
-		src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line
-	check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
-		src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \
-		src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \
-		src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line
-	check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \
-		src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line
-
-	# Rename references to isql to fbsql
-	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
-		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		src/msgs/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		-e 's:ISQL :FBSQL :w /dev/stdout' \
-		src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.sql" # 4 lines
-	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
-		-e 's:isql :fbsql :w /dev/stdout' \
-		-e 's:ISQL :FBSQL :w /dev/stdout' \
-		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
-
-	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
-	rm -rf "${S}"/extern/{editline,icu}
-
-	epatch "${FILESDIR}/${PN}-2.1.2.18118.0-gcc-icu-declare.patch"
-
-	# allow debug to use valgrind 3.4 (instead of obsolete valgrind 3.3)
-	epatch "${FILESDIR}/${PN}-update-valgrind.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	econf --prefix=/usr/lib/firebird --with-editline \
-		$(use_enable !xinetd superserver) \
-		$(use_enable debug) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "error during make"
-}
-
-src_install() {
-	cd "${S}/gen/firebird"
-
-# Seems to be ignored?
-	insinto /usr/share/firebird/bin
-	dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-	rm bin/*.sh || die "Could not remove *sh files"
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql
-
-	insinto /usr/bin
-	dobin bin/*
-
-	insinto /usr/include
-	doins include/*
-
-	insinto /usr/lib
-	dolib.so lib/*.so*
-	dolib.a lib/*.a*
-
-	insinto /usr/lib/firebird
-	doins *.msg
-
-	insinto /usr/lib/firebird/help
-	doins help/help.fdb
-
-	insinto /usr/share/firebird/upgrade
-	doins "${S}"/src/misc/upgrade/v2/*
-
-	insinto /etc/firebird
-	insopts -m0644 -o firebird -g firebird
-	doins misc/*
-	doins ../install/misc/aliases.conf
-	insopts -m0660 -o firebird -g firebird
-	doins security2.fdb
-
-	exeinto /usr/lib/firebird/UDF
-	doexe UDF/*.so
-
-	exeinto /usr/lib/firebird/intl
-	newexe intl/libfbintl.so fbintl.so
-
-	insinto /usr/lib/firebird/intl
-	doins ../install/misc/fbintl.conf
-
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/firebird
-	dodir /var/run/firebird
-	keepdir /var/log/firebird
-	keepdir /var/run/firebird
-
-	# create links for backwards compatibility
-	cd "${D}/usr/lib"
-	ln -s libfbclient.so libgds.so
-	ln -s libfbclient.so libgds.so.0
-	ln -s libfbclient.so libfbclient.so.1
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
-	else
-		newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-		newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-		fperms 640 /etc/conf.d/${PN}
-	fi
-
-	# Install docs
-	use doc && dodoc "${WORKDIR}"/manuals/*
-	use examples && docinto examples
-}
-
-pkg_postinst() {
-	# Hack to fix ownership/perms
-	chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/lib/firebird"
-	chmod 750 "${ROOT}/etc/firebird"
-
-	elog
-	elog "Firebird is no longer installed in /opt. Binaries are in"
-	elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
-	elog "are in /var/log/firebird, and lock files in /var/run/firebird"
-	elog "The command line tool isql has been renamed to fbsql."
-	elog "Please report any problems or issues to bugs.gentoo.org."
-	elog
-}
-
-pkg_config() {
-	# if found /etc/security.gdb from previous install, backup, and restore as
-	# /etc/security2.fdb
-	if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
-		# if we have scurity2.fdb already, back it 1st
-		if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
-			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
-		fi
-		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
-		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
-		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
-		rm "${ROOT}/etc/firebird/security.gbk"
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
-		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
-
-		einfo
-		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
-		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
-		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
-		einfo
-	fi
-
-	# we need to enable local access to the server
-	if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
-		touch "${ROOT}/etc/hosts.equiv"
-		chown root:0 "${ROOT}/etc/hosts.equiv"
-		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost.localdomain' to the hosts.equiv file...
-	if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost' to the hosts.equiv file...
-	if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /usr/lib/firebird/UDF"
-}
--- a/dev-db/firebird/firebird-2.5.2.26539.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.2.26539.0.ebuild
@ -1,299 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.2.26539.0.ebuild,v 1.2 2013/10/09 15:38:02 hasufell Exp $
-
-EAPI=4
-
-inherit flag-o-matic eutils autotools multilib user versionator
-
-MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
-
-DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features"
-HOMEPAGE="http://www.firebirdsql.org/"
-SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
-	 doc? (	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 -ia64 ~x86"
-IUSE="doc client superserver xinetd examples debug"
-RESTRICT="userpriv"
-
-RDEPEND="dev-libs/libedit
-	dev-libs/icu"
-DEPEND="${RDEPEND}
-	>=dev-util/btyacc-3.0-r2
-	doc? ( app-arch/unzip )"
-RDEPEND="${RDEPEND}
-	xinetd? ( virtual/inetd )
-	!sys-cluster/ganglia"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use client && use superserver ; then
-		die "Use flags client and superserver cannot be used together"
-	fi
-	if use client && use xinetd ; then
-		die "Use flags client and xinetd cannot be used together"
-	fi
-	if use superserver && use xinetd ; then
-		die "Use flags superserver and xinetd cannot be used together"
-	fi
-}
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
-}
-
-function check_sed() {
-	MSG="sed of $3, required $2 lines modified $1"
-	einfo "${MSG}"
-	[[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-src_unpack() {
-	if use doc; then
-		# Unpack docs
-		mkdir "${WORKDIR}/manuals"
-		cd "${WORKDIR}/manuals"
-		unpack ib_b60_doc.zip
-		cd "${WORKDIR}"
-	fi
-	unpack "${MY_P}.tar.bz2"
-	cd "${S}"
-}
-
-src_prepare() {
-	# This patch might be portable, and not need to be duplicated per version
-	# also might no longer be necessary to patch deps or libs, just flags
-	epatch "${FILESDIR}/${PN}-2.5.1.26351.0-deps-flags.patch"
-
-	use client && epatch "${FILESDIR}/${PN}-2.5.1.26351.0-client.patch"
-	if ! use superserver ; then
-		epatch "${FILESDIR}/${PN}-2.5.1.26351.0-superclassic.patch"
-	fi
-
-	# Rename references to isql to fbsql
-	# sed vs patch for portability and addtional location changes
-	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
-		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
-	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
-		-e 's:isql :fbsql :w /dev/stdout' \
-		-e 's:ISQL :FBSQL :w /dev/stdout' \
-		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
-
-	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
-	rm -rf "${S}"/extern/{btyacc,editline,icu}
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	econf --prefix=/usr/$(get_libdir)/firebird \
-		$(use_enable superserver superserver) \
-		$(use_enable debug) \
-		--with-editline \
-		--with-system-editline \
-		--with-system-icu \
-		--with-fbbin=/usr/bin \
-		--with-fbsbin=/usr/sbin \
-		--with-fbconf=/etc/${PN} \
-		--with-fblib=/usr/$(get_libdir) \
-		--with-fbinclude=/usr/include \
-		--with-fbdoc=/usr/share/doc/${P} \
-		--with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
-		--with-fbsample=/usr/share/doc/${P}/examples \
-		--with-fbsample-db=/usr/share/doc/${P}/examples/db \
-		--with-fbhelp=/usr/$(get_libdir)/${PN}/help \
-		--with-fbintl=/usr/$(get_libdir)/${PN}/intl \
-		--with-fbmisc=/usr/share/${PN} \
-		--with-fbsecure-db=/etc/${PN} \
-		--with-fbmsg=/usr/$(get_libdir)/${PN} \
-		--with-fblog=/var/log/${PN}/ \
-		--with-fbglock=/var/run/${PN} \
-		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
-		--with-gnu-ld \
-		${myconf}
-}
-
-src_compile() {
-	MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
-	emake
-}
-
-src_install() {
-	cd "${S}/gen/${PN}"
-
-	if use doc; then
-		dodoc "${S}"/doc/*.pdf
-		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
-	fi
-
-	insinto /usr/include
-	doins include/*
-
-	rm lib/libfbstatic.a
-
-	insinto /usr/$(get_libdir)
-	dolib.so lib/*.so*
-
-	# links for backwards compatibility
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
-	dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
-
-	insinto /usr/$(get_libdir)/${PN}
-	doins *.msg
-
-	use client && return
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql
-
-	local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
-	for bin in ${bins[@]}; do
-		dobin bin/${bin}
-	done
-
-	dosbin bin/fb_lock_print
-	# SuperServer
-	if use superserver ; then
-		dosbin bin/{fbguard,fbserver}
-	# ClassicServer
-	elif use xinetd ; then
-		dosbin bin/fb_inet_server
-	# SuperClassic
-	else
-		dosbin bin/{fbguard,fb_smp_server}
-
-		#Temp should not be necessary, need to patch/fix
-		dosym "${D}"/usr/$(get_libdir)/libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
-	fi
-
-	exeinto /usr/bin/${PN}
-	exeopts -m0755
-	doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-
-	insinto /usr/$(get_libdir)/${PN}/help
-	doins help/help.fdb
-
-	exeinto /usr/$(get_libdir)/firebird/intl
-	dolib.so intl/libfbintl.so
-	dosym "${D}"/usr/$(get_libdir)/libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
-	dosym "${D}"/etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
-
-	exeinto /usr/$(get_libdir)/${PN}/plugins
-	dolib.so plugins/libfbtrace.so
-	dosym "${D}"/usr/$(get_libdir)/libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
-
-	exeinto /usr/$(get_libdir)/${PN}/UDF
-	doexe UDF/*.so
-
-	insinto /usr/share/${PN}/upgrade
-	doins "${S}"/src/misc/upgrade/v2/*
-
-	insinto /etc/${PN}
-	insopts -m0644 -o firebird -g firebird
-	doins ../install/misc/*.conf
-	insopts -m0660 -o firebird -g firebird
-	doins security2.fdb
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd" ${PN}
-	else
-		newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN}
-		newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN}
-		fperms 640 /etc/conf.d/${PN}
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/${PN}
-	dodir /var/run/${PN}
-	keepdir /var/log/${PN}
-	keepdir /var/run/${PN}
-
-	use examples && docinto examples
-}
-
-pkg_postinst() {
-	use client && return
-
-	# Hack to fix ownership/perms
-	chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
-	chmod 750 "${ROOT}/etc/${PN}"
-
-	elog
-	elog "Firebird is no longer installed in /opt. Binaries are in"
-	elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
-	elog "are in /var/log/firebird, and lock files in /var/run/firebird"
-	elog "The command line tool isql has been renamed to fbsql."
-	elog "Please report any problems or issues to bugs.gentoo.org."
-	elog
-}
-
-pkg_config() {
-	use client && return
-
-	# if found /etc/security.gdb from previous install, backup, and restore as
-	# /etc/security2.fdb
-	if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
-		# if we have scurity2.fdb already, back it 1st
-		if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
-			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
-		fi
-		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
-		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
-		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
-		rm "${ROOT}/etc/firebird/security.gbk"
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
-		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
-
-		einfo
-		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
-		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
-		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
-		einfo
-	fi
-
-	# we need to enable local access to the server
-	if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
-		touch "${ROOT}/etc/hosts.equiv"
-		chown root:0 "${ROOT}/etc/hosts.equiv"
-		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost.localdomain' to the hosts.equiv file...
-	if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost' to the hosts.equiv file...
-	if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /usr/lib/firebird/UDF"
-}
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
 <maintainer>
-<email>wlt@obsidian-studios.com</email>
-<name>William L. Thomson Jr.</name>
-<description>Maintainer</description>
-</maintainer>
-<maintainer>
-<email>patrick@gentoo.org</email>
-<name>Patrick Lauer</name>
-<description>Proxy maintainer</description>
+<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 	<longdescription>
 	Firebird is a relational database offering many ANSI SQL standard 
--- a/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
+++ b/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcmdline/jcmdline-1.0.2-r2.ebuild,v 1.1 2014/09/07 14:56:22 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Library for parsing/handling of command line parameters"
+HOMEPAGE="http://jcmdline.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jcmdline/${P}.zip"
+LICENSE="MPL-1.1"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+EANT_DOC_TARGET="doc"
+
+java_prepare() {
+	find -name "*.jar" -delete || die
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	dodoc CHANGES CREDITS README
+	use doc && java-pkg_dojavadoc doc/jcmdline/api
+	use source && java-pkg_dosrc src/*
+}
--- a/dev-java/jdepend/jdepend-2.9-r5.ebuild
+++ b/dev-java/jdepend/jdepend-2.9-r5.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/jdepend-2.9-r5.ebuild,v 1.1 2014/09/07 15:09:36 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JDepend traverses Java class file directories and generates design quality metrics per package"
+HOMEPAGE="http://www.clarkware.com/software/JDepend.html"
+SRC_URI="http://www.clarkware.com/software/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	>=app-arch/unzip-5.50-r1"
+RDEPEND=">=virtual/jre-1.4"
+
+java_prepare() {
+	rm -v "${S}"/lib/*.jar || die
+}
+
+src_install() {
+	java-pkg_newjar dist/jdepend-2.9.jar
+	dodoc README || die
+	dohtml -r docs/* || die
+	use doc && java-pkg_dojavadoc build/docs/api
+	use source && java-pkg_dosrc src/*
+}
--- a/dev-java/jexcelapi/files/2.5.1-jikes.patch
+++ b/dev-java/jexcelapi/files/2.5.1-jikes.patch
@ -1,17 +0,0 @@
-diff -uprN jexcelapi.orig/src/jxl/write/biff/CompoundFile.java jexcelapi/src/jxl/write/biff/CompoundFile.java
--- jexcelapi.orig/src/jxl/write/biff/CompoundFile.java	2005-01-23 15:39:35.389297104 +0100
-+++ jexcelapi/src/jxl/write/biff/CompoundFile.java	2005-01-23 15:40:59.715477576 +0100
-@@ -169,11 +169,11 @@ final class CompoundFile extends BaseCom
-    */
-   private static final class ReadPropertyStorage
-   {
-    PropertyStorage propertyStorage;
-+    jxl.biff.BaseCompoundFile.PropertyStorage propertyStorage;
-     byte[] data;
-     int number;
- 
-    ReadPropertyStorage(PropertyStorage ps, byte[] d, int n)
-+    ReadPropertyStorage(jxl.biff.BaseCompoundFile.PropertyStorage ps, byte[] d, int n)
-     {
-       propertyStorage = ps;
-       data = d;
--- a/dev-java/jexcelapi/jexcelapi-2.6.8-r1.ebuild
+++ b/dev-java/jexcelapi/jexcelapi-2.6.8-r1.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jexcelapi/jexcelapi-2.6.8-r1.ebuild,v 1.1 2014/09/07 15:17:52 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${P//-/_}"
+MY_P="${MY_P//./_}"
+
+DESCRIPTION="A Java API to read, write, and modify Excel spreadsheets"
+HOMEPAGE="http://jexcelapi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jexcelapi/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="2.5"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/${PN}
+
+EANT_BUILD_XML="build/build.xml"
+EANT_FILTER_COMPILER="jikes"
+EANT_BUILD_TARGET="jxl"
+EANT_DOC_TARGET="docs"
+
+java_prepare() {
+	find "${S}" -name "*.jar" -o -name "*.class" -delete || die
+}
+
+src_install() {
+	java-pkg_newjar jxl.jar  ${PN}.jar
+
+	java-pkg_dohtml index.html tutorial.html
+	use doc && java-pkg_dojavadoc docs
+	use source && java-pkg_dosrc "${S}"/src/*
+}
--- a/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild
+++ b/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild,v 1.3 2008/10/25 17:12:28 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jexcelapi/jexcelapi-2.6.8.ebuild,v 1.4 2014/09/07 15:17:52 ercpe Exp $

 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/jexcelapi/${MY_P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="2.5"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""

 DEPEND=">=virtual/jdk-1.4
--- a/dev-java/jgoodies-animation/files/build.xml
+++ b/dev-java/jgoodies-animation/files/build.xml
@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="animation" default="jar" basedir=".">
-   
-   <!-- This is a customized build.xml for portage! -->
-   <!--
-      <property file="${basedir}/build.properties"/>
-      <property file="${basedir}/default.properties"/>
-   -->
-
-   <property name="build" value="${basedir}/build"/>
-
-   <property name="spec.title" value="JGoodies Animation"/>
-   <property name="spec.version" value="1.1"/>
-   <property name="spec.vendor" value="Apache Software Foundation"/>
-   <property name="imp.title" value="com.jgoodies.animation"/>
-   <property name="imp.version" value="1.1.3"/>
-   <property name="imp.vendor" value="Apache Software Foundation"/>
-
-   <property name="animation.src" value="${basedir}"/>
-   
-   <property name="animation.javadoc" value="${build}/doc"/>
-   <property name="animation.packages" value="com.jgoodies.animation.*"/>
-
-   <target name="init">
-      <tstamp />
-      <mkdir dir="${build}"/>
-      <mkdir dir="${build}/doc"/>
-   </target>
-
-   <target name="compile" depends="init">
-      <javac srcdir="${animation.src}"
-             destdir="${build}"
-             source="1.4"
-             target="1.4"/>
-   </target>
-
-   <target name="manifest" depends="init">
-      <manifest file="MANIFEST.MF" mode="update">
-         <attribute name="Built-By" value="Gentoo Portage"/>
-
-         <section name="com/jgoodies/forms">
-            <attribute name="Specification-Title" value="${spec.title}"/>
-            <attribute name="Specification-Version" value="${spec.version}"/>
-            <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-            <attribute name="Implementation-Title" value="${imp.title}"/>
-            <attribute name="Implementation-Version" value="${imp.version}"/>
-            <attribute name="Implementation-Vendor" value="${imp.vendor}"/>
-         </section>
-      </manifest>
-   </target>
-   
-   <target name="javadoc" depends="compile">
-      <javadoc sourcepath="${animation.src}"
-               destdir="${animation.javadoc}"
-               packagenames="${animation.packages}"/>
-   </target>
-
-   <target name="jar" depends="compile,manifest">
-      <jar jarfile="animation-${imp.version}.jar" manifest="MANIFEST.MF">
-         <fileset dir="${build}"/>
-      </jar>
-   </target>
-</project>
--- a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild
+++ b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild,v 1.1 2014/09/07 15:26:13 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_V=${PV//./_}
+
+DESCRIPTION="JGoodies Animation Library"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/animation-${MY_V}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	test? ( dev-java/ant-junit )"
+
+RDEPEND=">=virtual/jre-1.4
+	examples? (
+		>=dev-java/jgoodies-binding-1.1:1.0
+		>=dev-java/jgoodies-forms-1.0:0
+	)"
+
+S="${WORKDIR}/animation-${PV}"
+
+EANT_FILTER_COMPILER="jikes"
+EANT_DOC_TARGET=""
+
+java_prepare() {
+	find -name "*.jar" -delete || die
+}
+
+src_test() {
+	eant test -Djunit.jar.present=true \
+		-Djunit.jar=$(java-pkg_getjar junit junit.jar)
+}
+
+src_install() {
+	java-pkg_dojar build/animation.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	dohtml README.html || die
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/core/*
+	use examples && java-pkg_doexamples src/tutorial
+}
--- a/dev-java/jgoodies-binding/files/build-1.0.3.xml
+++ b/dev-java/jgoodies-binding/files/build-1.0.3.xml
@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Binding" default="jar" basedir=".">
-   
-   <!-- This is a customized build.xml for portage! -->
-   <!--
-      <property file="${basedir}/build.properties"/>
-      <property file="${basedir}/default.properties"/>
-   -->
-
-   <!-- Specification data -->
-   <property name="spec.title" value="JGoodies Binding API Specification"/>
-   <property name="spec.version" value="1.0.3"/>
-   <property name="spec.vendor" value="Karsten Lentzsch"/>
-
-   <!-- Implementation data -->
-   <property name="impl.title" value="JGoodies Binding"/>
-   <property name="impl.version" value="1.0.3"/>
-   <property name="impl.vender" value="Karsten Lentzsch"/>
-   
-   <!-- Directory structure information -->
-   <property name="build" value="${basedir}/build"/>
-   <property name="src" value="${basedir}/src"/>
-
-   <!-- JavaDoc information -->
-   <property name="packages" value="com.jgoodies.*"/>
-   
-   <target name="init">
-      <tstamp />
-      <mkdir dir="${build}"/>
-      <mkdir dir="${build}/doc"/>
-      <mkdir dir="${build}/doc/api"/>
-   </target>
-
-   <target name="manifest" depends="init">
-      <manifest file="MANIFEST.MF" mode="update">
-         <attribute name="Built-By" value="Gentoo Portage"/>
-         <attribute name="Specification-Title" value="${spec.title}"/>
-         <attribute name="Specification-Version" value="${spec.version}"/>
-         <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-         <attribute name="Implementation-Title" value="${impl.title}"/>
-         <attribute name="Implementation-Version" value="${impl.version}"/>
-         <attribute name="Implementation-Vendor" value="${impl.vendor}"/>
-      </manifest>
-   </target>
-   
-   <target name="compile" depends="init">
-      <javac srcdir="${src}"
-             destdir="${build}"
-             source="1.4"
-             target="1.4"
-             encoding="ISO-8859-1"/>
-   </target>
-
-   <target name="javadoc" depends="compile">
-	   <javadoc sourcepath="${src}" packagenames="${packages}" destdir="${build}/docs/"/>
-   </target>
-
-   <target name="jar" depends="compile,manifest">
-      <jar jarfile="binding-${impl.version}.jar" manifest="MANIFEST.MF">
-         <fileset dir="${build}"/>
-      </jar>
-   </target>
-
-</project>
--- a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
+++ b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild,v 1.6 2008/02/13 03:53:55 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild,v 1.1 2014/09/07 15:53:57 ercpe Exp $
+
+EAPI=5

 JAVA_PKG_IUSE="doc examples source"

@ -13,7 +15,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/binding-${MY_V}.zip"

 LICENSE="BSD"
 SLOT="1.0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND=">=virtual/jdk-1.4.2
@ -23,37 +25,20 @@ RDEPEND=">=virtual/jre-1.4.2

 S=${WORKDIR}/binding-${PV}

-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Clean up the directory structure
-	rm -rvf *.jar lib
+RESTRICT="test"

-	# Copy the Gentoo'ized build.xml
-	# cp ${FILESDIR}/build-${PV}.xml ${S}
-	java-ant_xml-rewrite -f build.xml -d -e javac -a bootclasspath
-	#	|| die "Failed to fix bootclasspath"
-	java-pkg_filter-compiler jikes
-}
+EANT_FILTER_COMPILER="jikes"

-src_compile() {
-	eant jar # precompile javadocs
+java_prepare() {
+	find -name "*.jar" -delete || die
 }

-RESTRICT="test"
-# Needs X
-#src_test() {
-#	eant test -D\
-#		-Djunit.jar=$(java-pkg_getjar junit junit.jar)
-#}
-
 src_install() {
 	java-pkg_dojar build/binding.jar

 	dodoc RELEASE-NOTES.txt || die
 	dohtml README.html || die
 	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/core/*
+	use source && java-pkg_dosrc src/core/com
 	use examples && java-pkg_doexamples src/tutorial
 }
--- a/dev-java/jgoodies-forms/files/jgoodies-forms-1.0.7-build.xml.patch
+++ b/dev-java/jgoodies-forms/files/jgoodies-forms-1.0.7-build.xml.patch
@ -1,53 +0,0 @@
-diff -Nru forms-1.0.7.vanilla/build.xml forms-1.0.7/build.xml
--- forms-1.0.7.vanilla/build.xml	2006-08-02 23:05:21.000000000 +0200
-+++ forms-1.0.7/build.xml	2006-08-02 23:07:45.000000000 +0200
-@@ -27,8 +27,6 @@
-     <!-- ***************************************************************** -->
-     <!-- Give users a chance to override build properties.                 -->
-     <!-- ***************************************************************** -->
-    <property file="${user.home}/forms.build.properties" />
-    <property file="${user.home}/build.properties" />
-     <property file="${basedir}/build.properties" />
-     <property file="${basedir}/default.properties" />
-  
-@@ -118,8 +116,7 @@
- 			optimize     ="${build.compile.optimize}"
-             source       ="${build.compile.source}"
- 			target       ="${build.compile.target}"
-			verbose      ="${build.compile.verbose}"
-			bootclasspath="${build.boot.classpath}" />
-+			verbose      ="${build.compile.verbose}" />
- 	</target>
- 	
-     <!-- ***************************************************************** -->
-@@ -139,7 +136,6 @@
-             source       ="${build.compile.source}"
- 			target       ="${build.compile.target}"
- 			verbose      ="${build.compile.verbose}"
-			bootclasspath="${build.boot.classpath}"
- 			classpathref ="classpath.core" />
- 	</target>
- 	
-@@ -161,7 +157,6 @@
-             source       ="${build.compile.source}"
-             target       ="${build.compile.target}"
-             verbose      ="${build.compile.verbose}"
-            bootclasspath="${build.boot.classpath}"
-             classpathref ="classpath.tests" />
-     </target>   
-     
-@@ -182,7 +177,6 @@
-             source       ="${build.compile.source}"
- 			target       ="${build.compile.target}"
- 			verbose      ="${build.compile.verbose}"
-			bootclasspath="${build.boot.classpath}"
- 			classpathref ="classpath.tutorial" />
- 	</target>
- 
-@@ -300,4 +294,4 @@
- 	</target>
- 	
-     
-</project>
-\ No newline at end of file
-+</project>
--- a/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
+++ b/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-forms/jgoodies-forms-1.3.0-r1.ebuild,v 1.1 2014/09/07 15:59:54 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="forms"
+MY_PV=${PV//./_}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="JGoodies Forms Library"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+EANT_FILTER_COMPILTER="jikes"
+
+java_prepare() {
+	find -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_dojar build/${MY_PN}.jar
+
+	dodoc RELEASE-NOTES.txt README.html || die
+
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/{core,extras}/com
+	use examples && java-pkg_doexamples src/tutorial
+}
--- a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild,v 1.1 2014/09/07 16:13:25 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="looks"
+MY_PV="${PV//./_}"
+
+DESCRIPTION="JGoodies Looks Library"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}-${MY_PV}.zip"
+
+LICENSE="BSD"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+EANT_DOC_TARGET="javadoc"
+
+java_prepare() {
+	find -name "*.jar" -delete || die
+	cp "${FILESDIR}/build.xml" "${FILESDIR}/plastic.txt" "${S}" || die
+
+	unzip ${MY_PN}-${PV}-src.zip || die
+}
+
+src_install() {
+	java-pkg_dojar ${MY_PN}.jar
+
+	dodoc RELEASE-NOTES.txt
+	use source && java-pkg_dosrc com
+	use doc && java-pkg_dohtml -r build/doc
+	use examples && java-pkg_doexamples src/examples
+}
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild,v 1.1 2014/09/07 16:22:14 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="looks"
+MY_PV="${PV//./_}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="JGoodies Looks Library"
+HOMEPAGE="http://www.jgoodies.com/"
+SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="2.0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# bug #150970
+EANT_FILTER_COMPILER="jikes"
+# jar target fails unless we make descriptors.dir an existing directory
+# update: it's where it looks for all.txt file
+EANT_EXTRA_ARGS="-Ddescriptors.dir=\"${S}\""
+
+EANT_BUILD_TARGET="jar-all"
+
+java_prepare() {
+	# remove the bootclasspath brokedness, make building demo optional
+	epatch "${FILESDIR}/${PN}-2.0.4-build.xml.patch"
+
+	# unzip the look&feel settings from bundled jar before we delete it
+	unzip -j looks-${PV}.jar META-INF/services/javax.swing.LookAndFeel \
+		|| die "unzip of javax.swing.LookAndFeel failed"
+	# and rename it to what build.xml expects
+	mv javax.swing.LookAndFeel all.txt
+
+	find -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_dojar build/looks.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	dohtml README.html || die
+	use doc && java-pkg_dojavadoc build/docs/api
+	use source && java-pkg_dosrc src/core/com
+	use examples && java-pkg_doexamples src/demo
+}
--- a/dev-java/jisp/jisp-2.5.1-r3.ebuild
+++ b/dev-java/jisp/jisp-2.5.1-r3.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jisp/jisp-2.5.1-r3.ebuild,v 1.1 2014/09/07 16:36:11 ercpe Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple eutils
+
+DESCRIPTION="Java Indexed Serialization Package: A small, embedded database engine written in Pure Java"
+HOMEPAGE="http://www.coyotegulch.com/products/jisp/"
+
+# TODO contact upstream about hosting jisp-2.5 on their site.
+# They only maintain 3.0 at the moment
+# This tarball is from jpackage's jisp2 source rpm
+SRC_URI="http://gentooexperimental.org/distfiles/${P}-source.tar.gz"
+
+LICENSE="SVFL"
+SLOT="2.5"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-java15.patch
+
+	mkdir src || die
+	mv com src || die
+}
--- a/dev-libs/libmodbus/Manifest
+++ b/dev-libs/libmodbus/Manifest
@ -1,4 +1,2 @@
-DIST libmodbus-3.0.3.tar.gz 470324 SHA256 6fc7cf91f7293e522afde6ae5fc605c6cd7bdca4ee2ec953db5bb91158ab8677 SHA512 f296abdefa69040757b02b8e65d004c0465035aaa395722792e7d6ec32b73b9149ecd6d0cbcdd1bf7f49e4367487b2e23815fb282c665a41f720573573afe123 WHIRLPOOL 0c9aae6d2eacfe3c769d8e10ea04e6d889e85352b0eede48035d0362b36b7b3366119acefdae3387d92a1f231366d501af4b4defd44eb037c6e3d533f898eff1
 DIST libmodbus-3.0.6.tar.gz 504757 SHA256 046d63f10f755e2160dc56ef681e5f5ad3862a57c1955fd82e0ce036b69471b6 SHA512 47a271b3677822701bac924f3e3245e3db72dbadfe1d860ae5d8171b32d2dbb1c761a351d055eafc661a15bc13cb60b793b2b0f9654bbafcf01b457d51991dca WHIRLPOOL f586f4e98083d9eccda7bc49dfda2ff24b167e50fb7cbf9a515066cef179b8a43190daecbf2de0871d09d443ff5d1ec871a77590b8d6f0d992354912a80d5215
-DIST libmodbus-3.1.0.tar.gz 521675 SHA256 0ee9b40245a2a810de44f345580b7bfc54d79d9b2be60424bab84d5431098e4f SHA512 a2e183b156af350d9e4158100b3e3a4ec877575b863a435b66b213671f13f0cb7f1591d9b937ca2207eb6f8fd85cd723d641791caea24af1bb0848e37dd2a4f0 WHIRLPOOL 44596bd25248010049b97807c0fec3b3890f6c67159c8c8b0deed7e7f78c5b0eff822cd0da861988823b58dccde08274ba97333d59182185ec48f766c60ac20b
 DIST libmodbus-3.1.1.tar.gz 595100 SHA256 76d93aff749d6029f81dcf1fb3fd6abe10c9b48d376f3a03a4f41c5197c95c99 SHA512 0e7b26137b9cdf13decb39a3662767e9309ca4937010a36baba05adb92b7322a85f07557367b80e7242b2cce714007d0e9e6701e127f15f866dae3861e180012 WHIRLPOOL 82ade12450aebad66b0ddd9adf73a1f9f91547e5d7bde85346867ff6a0b991ed532b8b10623e7b79d785092a07b9d34a583114ec573ef7109ec057c714dd4adb
--- a/dev-libs/libmodbus/libmodbus-3.0.3.ebuild
+++ b/dev-libs/libmodbus/libmodbus-3.0.3.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmodbus/libmodbus-3.0.3.ebuild,v 1.1 2012/06/11 09:46:46 xmw Exp $
-
-EAPI=4
-
-DESCRIPTION="Modbus library which supports RTU communication over a serial line or a TCP link"
-HOMEPAGE="http://www.libmodbus.org/"
-SRC_URI="http://github.com/downloads/stephane/libmodbus/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS MIGRATION NEWS README.rst
-	use static-libs || rm "${D}"/usr/*/libmodbus.la
-}
--- a/dev-libs/libmodbus/libmodbus-3.1.0.ebuild
+++ b/dev-libs/libmodbus/libmodbus-3.1.0.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmodbus/libmodbus-3.1.0.ebuild,v 1.1 2012/07/02 07:12:33 xmw Exp $
-
-EAPI=4
-
-DESCRIPTION="Modbus library which supports RTU communication over a serial line or a TCP link"
-HOMEPAGE="http://www.libmodbus.org/"
-SRC_URI="http://github.com/downloads/stephane/libmodbus/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS MIGRATION NEWS README.rst
-	use static-libs || rm "${D}"/usr/*/libmodbus.la
-}
--- a/dev-libs/libsigc++/files/libsigc++-2.3.2-missing-include.patch
+++ b/dev-libs/libsigc++/files/libsigc++-2.3.2-missing-include.patch
@ -0,0 +1,24 @@
+From df361299c3f9a0922a683e5fa3869764932bb19a Mon Sep 17 00:00:00 2001
+From: Kjell Ahlstedt <kjell.ahlstedt@bredband.net>
+Date: Fri, 8 Aug 2014 12:47:02 +0200
+Subject: Add an include in limit_reference.h
+
+* sigc++/macros/limit_reference.h.m4: limit_reference.h must include
+visit_each.h, with the primary definition of template struct visitor.
+https://mail.gnome.org/archives/libsigc-list/2014-August/msg00001.html
+
+diff --git a/sigc++/macros/limit_reference.h.m4 b/sigc++/macros/limit_reference.h.m4
+index 802446c..bb4b3b7 100644
+--- a/sigc++/macros/limit_reference.h.m4
+++ b/sigc++/macros/limit_reference.h.m4
+@@ -137,6 +137,7 @@ divert(0)
+ 
+ _FIREWALL([LIMIT_REFERENCE])
+ 
+#include <sigc++/visit_each.h>
+ #include <sigc++/type_traits.h>
+ #include <sigc++/trackable.h>
+ 
+-- 
+cgit v0.10.1
+
--- a/dev-libs/libsigc++/libsigc++-2.3.2-r1.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.3.2-r1.ebuild
@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.3.2.ebuild,v 1.1 2014/09/04 10:20:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.3.2-r1.ebuild,v 1.1 2014/09/07 12:41:18 pacho Exp $

 EAPI="5"
 GCONF_DEBUG="no"

-inherit gnome2 flag-o-matic
+inherit eutils gnome2 flag-o-matic

 DESCRIPTION="Typesafe callback system for standard C++"
 HOMEPAGE="http://libsigc.sourceforge.net/"
@ -30,6 +30,9 @@ src_prepare() {
 			Makefile.am Makefile.in || die "sed tests failed"
 	fi

+	# Add an include in limit_reference.h (from 'master'), bug #522166
+	epatch "${FILESDIR}/${P}-missing-include.patch"
+
 	gnome2_src_prepare
 }

--- a/dev-python/Bcryptor/Bcryptor-1.2.2.ebuild
+++ b/dev-python/Bcryptor/Bcryptor-1.2.2.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Bcryptor/Bcryptor-1.2.2.ebuild,v 1.1 2013/12/15 11:24:54 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for bcrypt"
-HOMEPAGE="http://www.bitbucket.org/ares/bcryptor/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-LICENSE="ISC"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)"
-RDEPEND="dev-python/Yamlog[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die "testsuite failed under ${EPYTHON}"
-}
--- a/dev-python/Bcryptor/Manifest
+++ b/dev-python/Bcryptor/Manifest
@ -1 +0,0 @@
-DIST Bcryptor-1.2.2.tar.gz 111291 SHA256 5eebe432ab30bd706e9456184a908ce8754de6921d416d9e61b258573d14b6b3 SHA512 896a2f887717e1d80c5ab3d42e7c77d4b1d8965f2bce03086a2deacd5942598d0855df3db83b7e4980213af28df9ce5e6325e2d6f3479eaf94cef47aa5ed641a WHIRLPOOL 55987839935473f85b2184712200c08c385caf653c4638dc6d07931491c10c5c85d43ddc02f5909692cd2df31f548b51e5649cc96483ff1437006521da147f5e
--- a/dev-python/Bcryptor/metadata.xml
+++ b/dev-python/Bcryptor/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <herd>openstack</herd>
-</pkgmetadata>
--- a/dev-python/Yamlog/Manifest
+++ b/dev-python/Yamlog/Manifest
@ -1 +0,0 @@
-DIST Yamlog-0.9.tar.gz 6406 SHA256 56d9688a3cf25cb9e52023d26cc446e3cf5aece5f455a217b15da89dc86e7cbe SHA512 6743d4db7cff8ffe2f4a8585508267a653639f514630f0ba2184c5ec1c33d59d59ffc26bf22a5e86bd729bf98874d17db4d0c8ec484d7d74d4276da99c703af0 WHIRLPOOL 5d15ad2cd3e1641e66c30b733deab81bb52ba0845617dc6fd6011f62c3e6a731e27ef6954361bfb50404bc1fdf15f1413a2cfab0e15b4935adf04e39421b7e1f
--- a/dev-python/Yamlog/Yamlog-0.9.ebuild
+++ b/dev-python/Yamlog/Yamlog-0.9.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Yamlog/Yamlog-0.9.ebuild,v 1.3 2014/03/31 20:44:58 mgorny Exp $
-# the test phase goes seeking Yamlog, not yamlog; semantics. Yamlog for now
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Logging in YAML format"
-# Seems kless has done a runner. Someone please find a home page, putting in pypi for now
-HOMEPAGE="http://github.com/kless/Yamlog/ https://pypi.python.org/pypi/Yamlog/0.9"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-LICENSE="ISC"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}] )"
-
-RDEPEND=""
-
-python_test() {
-	esetup.py test
-}
--- a/dev-python/Yamlog/metadata.xml
+++ b/dev-python/Yamlog/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <herd>openstack</herd>
-</pkgmetadata>
--- a/dev-python/amara/Manifest
+++ b/dev-python/amara/Manifest
@ -1 +0,0 @@
-DIST Amara-2.0.0.tar.gz 1430858 SHA256 59e4d3faba60508025ec8036f69b9c5ff513940aa4ddfb929605c93a3d959138 SHA512 9be0f4171bd9cab7d6d27df1b872485c2a5abb72900205c6540c9979e625352f2606750a1f5a1b3a3ac90430386608a6608226bc3f2f95cfcdbe0b2fe4cb1112 WHIRLPOOL 6e32704475c50387ac5e431f1435b22e5713774cf7edfe58e55d2f05fb13d05bc5c72a4690d659702e97666203f5bb0361355dc90ac04b883fc8dd5bb1bbb068
--- a/dev-python/amara/amara-2.0.0.ebuild
+++ b/dev-python/amara/amara-2.0.0.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/amara/amara-2.0.0.ebuild,v 1.1 2014/08/10 12:18:56 dev-zero Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='wide-unicode(+)'
-
-inherit distutils-r1
-
-MY_PN="Amara"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Library for XML processing in Python"
-HOMEPAGE="http://wiki.xml3k.org/Amara2"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-
-RDEPEND="dev-python/html5lib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/2.0.0_alpha6-unbundle-python-libs.patch"
-)
-
-# Maintainter notes:
-# * Bundles expat-2.0.0 but since it is patched we can not simply unbundle it.
-#   Unbundling expat leads to a segfault, see bug #452962
-# * Many tests still fail. Documentation suggests that they came from 4suite/amara-1.x
-#   and are not fully adapted to amara-2.x. Therefore disabling them.
-
-RESTRICT="test"
-
-python_test() {
-	nosetests -w test -P --exe -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r demo
-		docompress -x "${INSDESTTREE}"/demo
-	fi
-}
--- a/dev-python/amara/files/2.0.0_alpha6-unbundle-python-libs.patch
+++ b/dev-python/amara/files/2.0.0_alpha6-unbundle-python-libs.patch
@ -1,32 +0,0 @@
-diff --git a/lib/bindery/html.py b/lib/bindery/html.py
-index 0d1b953..d838982 100644
--- a/lib/bindery/html.py
-+++ b/lib/bindery/html.py
-@@ -13,7 +13,7 @@ import itertools
- from functools import *
- from itertools import *
- 
-from amara.thirdparty import html5lib
-+import html5lib
- from amara import tree
- from amara.lib import inputsource
- from amara.bindery import nodes
-diff --git a/setup.py b/setup.py
-index b6d0094..d3f8440 100755
--- a/setup.py
-+++ b/setup.py
-@@ -282,11 +282,6 @@ setup(name='Amara',
-                 'amara.xslt.tree',
-                 'amara.xslt.xpatterns',
-                 'amara.xupdate',
-                'amara.thirdparty',
-                'amara.thirdparty.httplib2',
-                'amara.thirdparty.html5lib',
-                'amara.thirdparty.html5lib.treebuilders',
-                # Test support; would be possible to break out into separate
-                 # package at some point.
-                 'amara.test',
-                 'amara.test.xpath',
-- 
-1.7.8.5
-
--- a/dev-python/amara/metadata.xml
+++ b/dev-python/amara/metadata.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>python</herd>
-	<longdescription lang="en">
-		Amara provides a Pythonic interface for processing XML on top of 4suite
-	</longdescription>
-</pkgmetadata>
-
--- a/dev-python/geopy/files/1.1.3-formatpy3.patch
+++ b/dev-python/geopy/files/1.1.3-formatpy3.patch
@ -0,0 +1,15 @@
+https://github.com/geopy/geopy/commit/fe0cd3c6c92b7d7ac47cb2292260485c5b3791c1
+diff --git a/geopy/format.py b/geopy/format.py
+index 965a127..63b1e94 100644
+--- a/geopy/format.py
+++ b/geopy/format.py
+@@ -30,7 +30,7 @@
+ ABBR_ARCSEC = 'arcsec'
+ 
+ DEGREES_FORMAT = (
+-    "%(degrees)d%(deg)s %(minutes)d%(arcmin)s %(seconds)s%(arcsec)s"
+    "%(degrees)d%(deg)s %(minutes)d%(arcmin)s %(seconds)g%(arcsec)s"
+ )
+ 
+ UNICODE_SYMBOLS = {
+
--- a/dev-python/geopy/geopy-1.1.3.ebuild
+++ b/dev-python/geopy/geopy-1.1.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-1.1.3.ebuild,v 1.1 2014/09/06 12:14:50 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-1.1.3.ebuild,v 1.2 2014/09/07 12:53:28 idella4 Exp $

 EAPI=5

@ -24,6 +24,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"

+PATCHES=( "${FILESDIR}"/${PV}-formatpy3.patch )
+
 python_test() {
 	# https://github.com/geopy/geopy/issues/74
 	nosetests --processes=-1 || die "Tests failed under ${EPYTHON}"
--- a/dev-python/matplotlib/matplotlib-1.3.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.3.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.3.0.ebuild,v 1.10 2014/04/26 08:20:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.3.0.ebuild,v 1.11 2014/09/08 04:04:49 zerochaos Exp $

 EAPI=5

@ -34,7 +34,10 @@ COMMON_DEPEND="
 	media-fonts/stix-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
-	gtk? ( dev-python/pygtk[${PY2_USEDEP}] )
+	gtk? ( x11-libs/gtk+:2
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		dev-python/pygtk[${PY2_USEDEP}] )
 	wxwidgets? ( dev-python/wxpython[${PY2_USEDEP}] )"

 # internal copy of pycxx highly patched
--- a/dev-python/matplotlib/matplotlib-1.3.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.3.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.3.1.ebuild,v 1.5 2014/08/27 12:20:22 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.3.1.ebuild,v 1.6 2014/09/08 04:04:49 zerochaos Exp $

 EAPI=5

@ -37,7 +37,10 @@ COMMON_DEPEND="
 	media-fonts/stix-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
-	gtk? ( dev-python/pygtk[${PY2_USEDEP}] )
+	gtk? ( x11-libs/gtk+:2
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		dev-python/pygtk[${PY2_USEDEP}] )
 	wxwidgets? ( >=dev-python/wxpython-2.8[${PY2_USEDEP}] )"

 # internal copy of pycxx highly patched
--- a/dev-python/matplotlib/matplotlib-9999.ebuild
+++ b/dev-python/matplotlib/matplotlib-9999.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild,v 1.2 2013/12/26 19:01:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-9999.ebuild,v 1.3 2014/09/08 04:04:49 zerochaos Exp $

 EAPI=5

--- a/dev-python/nose-testconfig/nose-testconfig-0.9.ebuild
+++ b/dev-python/nose-testconfig/nose-testconfig-0.9.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-testconfig/nose-testconfig-0.9.ebuild,v 1.2 2014/03/31 21:20:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose-testconfig/nose-testconfig-0.9.ebuild,v 1.3 2014/09/07 19:18:21 floppym Exp $

 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0  )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0  )

 inherit distutils-r1

--- a/dev-python/py-gnupg/Manifest
+++ b/dev-python/py-gnupg/Manifest
@ -1 +0,0 @@
-DIST GnuPGInterface-0.3.2.tar.gz 19875 SHA256 0ea672251e2e3f71b62fef0c01539519d500f6b338f803af6b57e67a73cca8e6 SHA512 46c91f2391a1efd472fe08bc6abd71ec17a45dc9e051999d91ccc73da86b64094ef7d0fe3df12b2f58d714146f77fc2183944efa3aa604d8cff05a348ec19386 WHIRLPOOL 9884d3eaafca5b71d601ec713e512fa81a7443655d697a08e2fa0e5ff3dccbb7ef32fbf15280a83e7261093e0ea0f09c295012c78634f4695d4513cf222fdcc6
--- a/dev-python/py-gnupg/metadata.xml
+++ b/dev-python/py-gnupg/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>python</herd>
-</pkgmetadata>
--- a/dev-python/py-gnupg/py-gnupg-0.3.2-r1.ebuild
+++ b/dev-python/py-gnupg/py-gnupg-0.3.2-r1.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-gnupg/py-gnupg-0.3.2-r1.ebuild,v 1.4 2014/08/10 21:15:51 slyfox Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
-
-inherit distutils-r1
-
-MY_P="GnuPGInterface-${PV}"
-
-DESCRIPTION="A Python module to interface with GnuPG"
-HOMEPAGE="http://py-gnupg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/py-gnupg/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=app-crypt/gnupg-1.2.1-r1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	"${PYTHON}" unittests.py || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/py-gnupg/py-gnupg-0.3.2.ebuild
+++ b/dev-python/py-gnupg/py-gnupg-0.3.2.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-gnupg/py-gnupg-0.3.2.ebuild,v 1.14 2014/08/10 21:15:51 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_P="GnuPGInterface-${PV}"
-
-DESCRIPTION="A Python module to interface with GnuPG"
-HOMEPAGE="http://py-gnupg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/py-gnupg/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=">=app-crypt/gnupg-1.2.1-r1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="NEWS PKG-INFO THANKS"
-PYTHON_MODNAME="GnuPGInterface.py"
--- a/dev-python/six/six-9999.ebuild
+++ b/dev-python/six/six-9999.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-9999.ebuild,v 1.9 2014/03/31 20:41:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-9999.ebuild,v 1.10 2014/09/07 19:21:54 floppym Exp $

 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )

 #if LIVE
 EHG_REPO_URI="https://bitbucket.org/gutworth/six"
--- a/games-action/descent3/descent3-1.4.0b-r1.ebuild
+++ b/games-action/descent3/descent3-1.4.0b-r1.ebuild
@ -1,113 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent3/descent3-1.4.0b-r1.ebuild,v 1.20 2014/09/07 09:40:24 ulm Exp $
-
-inherit eutils unpacker cdrom multilib games
-
-IUSE="nocd videos"
-DESCRIPTION="Descent 3 - 3-Dimensional indoor/outdoor spaceship combat"
-HOMEPAGE="http://www.lokigames.com/products/descent3/"
-SRC_URI="mirror://lokigames/${PN}/${PN}-1.4.0a-x86.run
-	mirror://lokigames/${PN}/${P}-x86.run"
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="sys-libs/glibc
-	virtual/opengl
-	sys-libs/lib-compat-loki
-	x86? (
-		x11-libs/libX11
-		x11-libs/libXext
-		=media-libs/libsdl-1.2* )
-	amd64? (
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-compat
-		app-emulation/emul-linux-x86-sdl
-		>=sys-libs/lib-compat-loki-0.2 )"
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	games_pkg_setup
-	if use videos ; then
-		ewarn "The installed game takes about 1.2GB of space!"
-	elif use nocd ; then
-		ewarn "The installed game takes about 510MB of space!"
-	else
-		ewarn "The installed game takes about 220MB of space!"
-	fi
-}
-
-src_unpack() {
-	if use videos ; then
-		cdrom_get_cds missions/d3.mn3 movies/level1.mve
-	else
-		cdrom_get_cds missions/d3.mn3
-	fi
-	mkdir -p "${S}"/{a,b}
-	cd "${S}"/a
-	unpack_makeself ${PN}-1.4.0a-x86.run
-	cd "${S}"/b
-	unpack_makeself ${P}-x86.run
-}
-
-src_install() {
-	einfo "Copying files... this may take a while..."
-	exeinto "${dir}"
-	doexe ${CDROM_ROOT}/bin/x86/glibc-2.1/{${PN},nettest} \
-		|| die "copying executables"
-	insinto "${dir}"
-	doins ${CDROM_ROOT}/{FAQ.txt,README{,.mercenary},d3.hog,icon.{bmp,xpm}} \
-		|| die "copying files"
-
-	cd "${Ddir}"
-	# TODO: move this to src_unpack where it belongs
-	tar xzf ${CDROM_ROOT}/data.tar.gz || die "uncompressing data"
-	tar xzf ${CDROM_ROOT}/shared.tar.gz || die "uncompressing shared"
-
-	if use nocd; then
-		doins -r ${CDROM_ROOT}/missions || die "copying missions"
-	fi
-
-	if use videos ; then
-		cdrom_load_next_cd
-		doins -r ${CDROM_ROOT}/movies || die "copying movies"
-	fi
-
-	cd "${S}"/a
-	bin/Linux/x86/loki_patch --verify patch.dat
-	bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching a"
-	cd "${S}"/b
-	bin/Linux/x86/loki_patch --verify patch.dat
-	bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null || die "patching b"
-
-	# now, since these files are coming off a cd, the times/sizes/md5sums wont
-	# be different ... that means portage will try to unmerge some files (!)
-	# we run touch on ${D} so as to make sure portage doesnt do any such thing
-	find "${Ddir}" -exec touch '{}' \;
-
-	dosym /usr/$(get_libdir)/loki_libsmpeg-0.4.so.0 \
-		"${dir}"/libsmpeg-0.4.so.0 || die "failed compatibility symlink"
-
-	games_make_wrapper descent3 ./descent3.dynamic "${dir}" "${dir}"
-	newicon ${CDROM_ROOT}/icon.xpm ${PN}.xpm
-
-	# Fix for 2.6 kernel crash
-	cd "${Ddir}"
-	ln -sf ppics.hog PPics.Hog
-
-	prepgamesdirs
-	make_desktop_entry ${PN} "Descent 3" ${PN}
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "To play the game run:"
-	elog " descent3"
-	echo
-}
--- a/games-action/phobiaii/phobiaii-1.1.ebuild
+++ b/games-action/phobiaii/phobiaii-1.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/phobiaii/phobiaii-1.1.ebuild,v 1.18 2014/09/07 09:43:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/phobiaii/phobiaii-1.1.ebuild,v 1.19 2014/09/07 17:38:32 ulm Exp $

 inherit eutils games

@ -16,8 +16,7 @@ IUSE=""

 RDEPEND="media-libs/sdl-mixer
 	media-libs/libsdl
-	x86? ( sys-libs/lib-compat )
-	amd64? ( app-emulation/emul-linux-x86-compat )"
+	sys-libs/lib-compat"

 S=${WORKDIR}/${MY_P}

--- a/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild
+++ b/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild,v 1.6 2013/01/22 07:04:56 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild,v 1.7 2014/09/07 15:29:26 ulm Exp $

 EAPI=2

@ -23,8 +23,7 @@ LICENSE="freedist"
 KEYWORDS="amd64 x86"
 IUSE="dedicated opengl"

-RDEPEND="x86? ( =virtual/libstdc++-3.3 )
-	amd64? ( app-emulation/emul-linux-x86-compat )"
+RDEPEND="~virtual/libstdc++-3.3"

 QA_PREBUILT="${INS_DIR:1}/${MOD_DIR}/*.so"

--- a/games-fps/rtcw/rtcw-1.41b.ebuild
+++ b/games-fps/rtcw/rtcw-1.41b.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/rtcw-1.41b.ebuild,v 1.18 2014/09/07 09:48:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcw/rtcw-1.41b.ebuild,v 1.19 2014/09/07 17:41:03 ulm Exp $

 EAPI=2
 inherit eutils unpacker games
@ -26,11 +26,10 @@ UIDEPEND="virtual/opengl
 	)
 	amd64? ( app-emulation/emul-linux-x86-xlibs )"
 RDEPEND="sys-libs/glibc
+	sys-libs/lib-compat
 	dedicated? ( app-misc/screen )
 	!dedicated? ( ${UIDEPEND} )
-	opengl? ( ${UIDEPEND} )
-	x86? ( sys-libs/lib-compat )
-	amd64? ( app-emulation/emul-linux-x86-compat )"
+	opengl? ( ${UIDEPEND} )"

 S=${WORKDIR}

--- a/games-fps/ut2003/Manifest
+++ b/games-fps/ut2003/Manifest
@ -1 +1 @@
-DIST ut2003lnx_patch2225.tar.tar 10039316 RMD160 618592b6ccf51c0eccf55e8c58dde5e5cc8071fd SHA1 05411c54f4cd72861cb8983cde5465b2831d9d5c SHA256 0c2d851e39b4491698f6fb3aefb9bf83340de85085f3b670d93a8cba29aefec3
+DIST ut2003lnx_patch2225.tar.tar 10039316 SHA256 0c2d851e39b4491698f6fb3aefb9bf83340de85085f3b670d93a8cba29aefec3 SHA512 3c44b6254b2b778bf2aca826c710f51db4ec0687c21f1c98e1070f3a9ad7e1a809e741a5b94e20a44c56c60a8b1e4a049788ff5f2a4d581c4eedf3dbbc0da86d WHIRLPOOL dcdd705e9a69612d4672b38a00080063fca7a80123f7152fee8490018c080e0dbdbf7a74acf316f194d182acda2e6f092d1edcab56f4bc073df1f99e9b4832b0
--- a/games-fps/ut2003/ut2003-2225-r4.ebuild
+++ b/games-fps/ut2003/ut2003-2225-r4.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ut2003-2225-r4.ebuild,v 1.15 2010/12/16 19:20:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ut2003-2225-r4.ebuild,v 1.16 2014/09/07 19:42:41 ulm Exp $

 inherit eutils games

@ -17,8 +17,7 @@ RESTRICT="strip"
 RDEPEND="dedicated? ( games-server/ut2003-ded )
 	!dedicated? ( virtual/opengl )
 	games-fps/ut2003-data
-	amd64? ( app-emulation/emul-linux-x86-compat
-		app-emulation/emul-linux-x86-xlibs )"
+	amd64? ( app-emulation/emul-linux-x86-xlibs )"

 S=${WORKDIR}

--- a/games-puzzle/drod-bin/drod-bin-1.6.7.ebuild
+++ b/games-puzzle/drod-bin/drod-bin-1.6.7.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/drod-bin/drod-bin-1.6.7.ebuild,v 1.5 2013/11/14 22:02:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/drod-bin/drod-bin-1.6.7.ebuild,v 1.6 2014/09/07 15:32:25 ulm Exp $

 EAPI=2

@ -18,18 +18,16 @@ IUSE=""
 RESTRICT="strip"

 DEPEND=""
-RDEPEND="
+RDEPEND="virtual/libstdc++:3.3
 	x86? (
 		x11-libs/libX11
 		media-libs/freetype
 		media-libs/libsdl
 		media-libs/sdl-ttf
-		sys-libs/libstdc++-v3
 	)
 	amd64? (
 		app-emulation/emul-linux-x86-xlibs
 		app-emulation/emul-linux-x86-sdl
-		app-emulation/emul-linux-x86-compat
 	)"

 GDIR=${GAMES_PREFIX_OPT}/drod
--- a/games-server/mtavc/mtavc-0.5.ebuild
+++ b/games-server/mtavc/mtavc-0.5.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/mtavc/mtavc-0.5.ebuild,v 1.3 2013/04/21 10:22:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/mtavc/mtavc-0.5.ebuild,v 1.4 2014/09/07 11:31:57 ulm Exp $

 inherit eutils games

@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="-* ~x86"
 IUSE=""

-DEPEND="sys-libs/lib-compat"
+RDEPEND="virtual/libstdc++"

 S=${WORKDIR}

--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST discomatic-0.3.tar.bz2 99480 SHA256 fdbcebdb8a00713f869446cfb694f02a00ffce09c728733e5bcf0b10de9fa378 SHA512 10db8471b61ec4ee53aeef99a7e6b5398d4dba668798bfd263056c6dd113ec716a72780650416fd7ee55888558d3b2c7d981c291e5318aaf4caa7cb898a7fd18 WHIRLPOOL 5712fb53b1f8d3e790c1571e000ea72d6377084d751ebf40fab53f209912b7f9d22f3462bdc939c69e8eeb5584f7116561f46d99f7ff63607a38fe986ccf634e`
				`@ -1 +0,0 @@`
				`DIST Bcryptor-1.2.2.tar.gz 111291 SHA256 5eebe432ab30bd706e9456184a908ce8754de6921d416d9e61b258573d14b6b3 SHA512 896a2f887717e1d80c5ab3d42e7c77d4b1d8965f2bce03086a2deacd5942598d0855df3db83b7e4980213af28df9ce5e6325e2d6f3479eaf94cef47aa5ed641a WHIRLPOOL 55987839935473f85b2184712200c08c385caf653c4638dc6d07931491c10c5c85d43ddc02f5909692cd2df31f548b51e5649cc96483ff1437006521da147f5e`
				`@ -1 +0,0 @@`
				`DIST Yamlog-0.9.tar.gz 6406 SHA256 56d9688a3cf25cb9e52023d26cc446e3cf5aece5f455a217b15da89dc86e7cbe SHA512 6743d4db7cff8ffe2f4a8585508267a653639f514630f0ba2184c5ec1c33d59d59ffc26bf22a5e86bd729bf98874d17db4d0c8ec484d7d74d4276da99c703af0 WHIRLPOOL 5d15ad2cd3e1641e66c30b733deab81bb52ba0845617dc6fd6011f62c3e6a731e27ef6954361bfb50404bc1fdf15f1413a2cfab0e15b4935adf04e39421b7e1f`
				`@ -1 +0,0 @@`
				`DIST Amara-2.0.0.tar.gz 1430858 SHA256 59e4d3faba60508025ec8036f69b9c5ff513940aa4ddfb929605c93a3d959138 SHA512 9be0f4171bd9cab7d6d27df1b872485c2a5abb72900205c6540c9979e625352f2606750a1f5a1b3a3ac90430386608a6608226bc3f2f95cfcdbe0b2fe4cb1112 WHIRLPOOL 6e32704475c50387ac5e431f1435b22e5713774cf7edfe58e55d2f05fb13d05bc5c72a4690d659702e97666203f5bb0361355dc90ac04b883fc8dd5bb1bbb068`
				`@ -1 +0,0 @@`
				`DIST GnuPGInterface-0.3.2.tar.gz 19875 SHA256 0ea672251e2e3f71b62fef0c01539519d500f6b338f803af6b57e67a73cca8e6 SHA512 46c91f2391a1efd472fe08bc6abd71ec17a45dc9e051999d91ccc73da86b64094ef7d0fe3df12b2f58d714146f77fc2183944efa3aa604d8cff05a348ec19386 WHIRLPOOL 9884d3eaafca5b71d601ec713e512fa81a7443655d697a08e2fa0e5ff3dccbb7ef32fbf15280a83e7261093e0ea0f09c295012c78634f4695d4513cf222fdcc6`