Bump for #385137

Package-Manager: portage-2.2.0_alpha62/cvs/Linux x86_64

10 files changed, 716 insertions, 22 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index a8c0b7680e96..22fa5123bc04 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-db/firebird
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.106 2011/05/12 18:42:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.107 2011/10/06 09:03:08 patrick Exp $
+
+*firebird-2.5.0.26074.0-r2 (06 Oct 2011)
+
+  06 Oct 2011; Patrick Lauer <patrick@gentoo.org>
+  +firebird-2.5.0.26074.0-r2.ebuild,
+  +files/firebird-2.5.0.26074.0-Makefile.in.static.createdb,
+  +files/firebird-2.5.0.26074.0-build.patch,
+  files/firebird-2.5.0.26074.0-client.patch,
+  +files/firebird-2.5.0.26074.0-deps-flags.patch,
+  +files/firebird-2.5.0.26074.0-superclassic.patch, +files/firebird.xinetd:
+  Bump for #385137
 
 *firebird-2.5.0.26074.0-r1 (12 May 2011)
 
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 3528f6d3dbe7..01a85ebae01c 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 70firebird 50 RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 SHA1 71b414835ed7c66f94b2908b7793da817d3c4438 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03
 AUX firebird-2.0.3.12981.0-CVE-2008-0387.patch 3279 RMD160 462a32e8bc64c2ede4852901a9ff7036a7c3b52a SHA1 7c87e7f41e8c408b190d84e80f7c6aa1a5c0753c SHA256 62dd30ec1a785578a4686ba37e82fedbc0b00d0e95735b4aab9b056b5b82ad4b
 AUX firebird-2.0.3.12981.0-CVE-2008-0467.patch 16005 RMD160 2bfd332b7d551402a1c9bed8b4706fc57cc80ec0 SHA1 38bc58cec68a4b9b12315846c3eb5f8c967e83e3 SHA256 f4de4b4b988669378b09fcbba59dac96b22a3b4cfeb6bdf7db45c4a16f81fd05
@@ -9,8 +6,12 @@ AUX firebird-2.0.3.12981.0-flags.patch 960 RMD160 9c75259b1fcd281a7c1e272bd20992
 AUX firebird-2.0.3.12981.0-make-deps.patch 1369 RMD160 843f3fdf1469ca31ccbf14b0d90f10d240ade63b SHA1 05d6e9c3b3dd0ac8f0093307cc5e3a1313f4dcb8 SHA256 826f6d70b71ec8630a9520dacfade245cff14cd9c766ba5be0eeda204f4bc9fb
 AUX firebird-2.1.2.18118.0-deps-flags-libs.patch 4508 RMD160 d936cfa5bcfdf195a0278327ec0c51fb106b5d56 SHA1 a04aed09a40775c072fb8a2ac8a941a5aaf99f81 SHA256 730189d644dc2a41e3f54839535ad3b84f4af9d02ee6064226175b5ee6aecdb9
 AUX firebird-2.1.2.18118.0-gcc-icu-declare.patch 537 RMD160 2464b9328098ec7db82a4a84aa31cf0fe1e6e521 SHA1 604dc760fcd056c8376548233d1043f8229b11bb SHA256 877d3a5eeb5a98d0ca06de5ca39fac892abd3eae8296bdbc88b15eb8a42fd339
-AUX firebird-2.5.0.26074.0-client.patch 646 RMD160 de9d438c97aa2b4dc5c0a9ae061b37f87fd2abc5 SHA1 42b490a52ed4974f9e1906b96310e1e75866cb34 SHA256 444776a49e5155fb311c487b5e7f22ff3422858191d249a90f261fb6e9cdd0b5
+AUX firebird-2.5.0.26074.0-Makefile.in.static.createdb 2034 RMD160 c27815607f4a61c752a38b684b0111cddcd46ead SHA1 2dc1491352c1ad0c933d2536449ece252e23a5d9 SHA256 9bfd82823c46be6e213cd8bbad97e05c933640b6023b957fdf5d813b7cd5dd14
+AUX firebird-2.5.0.26074.0-build.patch 9533 RMD160 915a8b3a8a9a88679081818a7c0e648e72cb360a SHA1 0a5baee0fd0dbc5f5725d157c6772b155de1509f SHA256 b1bf5562ea1bfa2b8f157d4e7166a032e3a0c1a180a50195cdf649d9d247ec0c
+AUX firebird-2.5.0.26074.0-client.patch 554 RMD160 4a3daa00c7004372eba9ce840e79cd86056ab9ce SHA1 6c19f00722992607265d0b170a5f5f29d8494f87 SHA256 afc61661c47dbedaac6b4d2582990712c8fbfe907340359c4eae12c4a66d1408
 AUX firebird-2.5.0.26074.0-deps-flags-libs.patch 6260 RMD160 948495b47615f57dc7664dd065159ae03f38336f SHA1 630dd88d96d5b57b1e453951b4a81dd25666d186 SHA256 1d64faf6d47291dbbc0d28f9d569b7b33a8737ab94ed6cd16230936bb1f97c31
+AUX firebird-2.5.0.26074.0-deps-flags.patch 3025 RMD160 bf8257e5b3bf3eb35b6d98cabf66470aee9ab73d SHA1 ef6bd309e4e2287e5ec84af041ed095d2d1a486c SHA256 ff6d2c832b9b1705e14ba8f083a65a774742375c9d4588c3a921cb5806d72be2
+AUX firebird-2.5.0.26074.0-superclassic.patch 713 RMD160 5aadf310d565c8487a0335f69228206cd33710d4 SHA1 f2edf3cac8b07b6a8795c9340b8ab2581e6eb859 SHA256 dbf9b28a50772ec5c158ab8dfc6a06da5c72b179117ef5b6c6e1645d796f13bf
 AUX firebird-update-valgrind.patch 507 RMD160 e66b9a46c74e5c5259bca5ca53090d25f549b556 SHA1 7b807d9f588f44d7f3fefe17d1c8af2f66caf7b2 SHA256 cc1f64d8263ed6ff32f441e4cc5a80654e59b8768ef218ec09cbda079e3a2a0f
 AUX firebird.conf.d 73 RMD160 3ed3f866ee37d8e99b5dd32132ae78889ddeef66 SHA1 a5f9ef1b7c1186feecdf7574cacca6b589c8029f SHA256 7c430ddf7aa8fdf6b68ef88e44ad0d7d546469f6fdc156bdc340fffefa85408c
 AUX firebird.conf.d.2 105 RMD160 a047ffded75ed5f055949993fd794941eee8fe25 SHA1 d10907676a706bdecae27321861ccd0e89bc7993 SHA256 032e26a957572718c3fb9ffbb1a83fac16a00cd41a027732e8cfbbe0f1a2ab61
@@ -18,6 +19,7 @@ AUX firebird.conf.d.2.5 270 RMD160 73f0bfd7d98828cf91d8c7937e627bf537f997a6 SHA1
 AUX firebird.init.d 692 RMD160 fd32d3ca38f149df1c6c46697a9c043b22bf25dd SHA1 379f3dd8e768e958ab3faff203d0d7a502c8f120 SHA256 7602d5030abaa7414cbe10f3223c38861742807bbe92f9af5693d28520398f6e
 AUX firebird.init.d.2.5 565 RMD160 3164b8866296ae399a9041e382f0775098a1ded9 SHA1 2a70cb7e4c91dfe01d46b4c2de1a8ec88832bf32 SHA256 916b9bfe93d76c0a9a6a3fd8e83bd6a10e8324159de51e8888e0e3dd307a6121
 AUX firebird.logrotate 169 RMD160 5d4486e41421d03d27c337bd982eb89b3ddc8cd8 SHA1 7883786b79aad6098a91641e2781a8a320125826 SHA256 462a7273c4881b66d31fe44349aae45d1f7085ff4db848eebc5e50b2bcb7f6da
+AUX firebird.xinetd 199 RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 SHA1 1186bbc61ecd17adeb598442d78abfaa3ac54194 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48
 AUX firebird.xinetd.2 199 RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 SHA1 1186bbc61ecd17adeb598442d78abfaa3ac54194 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48
 AUX xinetd.2 199 RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 SHA1 1186bbc61ecd17adeb598442d78abfaa3ac54194 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48
 DIST Firebird-2.0.3.12981-0.tar.bz2 12623689 RMD160 6a1139b30a77070e6e74bdaebc5d9bdd52e32509 SHA1 8b6134ad1910ae0677e93c84279132f6c67e7862 SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e
@@ -27,14 +29,6 @@ DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA
 EBUILD firebird-2.0.3.12981.0-r6.ebuild 9996 RMD160 45e38ad5115b01a2f90b8a6b2a6871509830d960 SHA1 8dd4b923a93b92d1d61f248f41c3230f0a36adbc SHA256 dc135be695e8f5fff58899c39aa85237891965dc9c77c4281ac86bbbddf28d6c
 EBUILD firebird-2.1.3.18185.0.ebuild 10266 RMD160 a816e0cf73e27aaecd74e1dd4a07f9b0a45252d8 SHA1 88fc465b2dab15bc8de1ddd10522b12c1ae05c7a SHA256 defcca6e5382a1646136a5b7b42d147f365f4a60d0f7e25e7808e21f2b6d7141
 EBUILD firebird-2.5.0.26074.0-r1.ebuild 8549 RMD160 c7835bf09d2637cff6d25c28bc89851005c31de8 SHA1 ca5b298ce242722ce8d30f4c88a385ccfc0cc056 SHA256 d0a47ea795d879d4263e84cfa14a3278475fbdd095aea8f75a3ea36018278894
-MISC ChangeLog 23739 RMD160 89b6c5058bf8a8d3e7d6b4fa8cbe0afff99ae735 SHA1 9f41025a444c157d5983f9a4724de0e940dcdf4f SHA256 65a4c53d1eee9841b58f2070ad548a8a3e0e10e734a870d358ac4a3ffb576065
-MISC metadata.xml 791 RMD160 101e44f9eb7c383b2557724c3baedafe23a68d1a SHA1 446e376c1b97c53a24f4a9ea69aa01dd817c1287 SHA256 b9b3366b2b591d92644852d86bea19594447decdd507925ba8320f47c70e7b0b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59A9MACgkQfXuS5UK5QB1YgAQAm73TS49SaV1++6Zut/O1Fppo
-0bbzB3PkvTJ6QYd8iujY52zQVdEUgCAmOGEGL3S9VKr2XuxEtzUez5fXC5GeFse6
-hnhj+6uZWvlkPqqTv7S2JSBCiNAhx7z3bW9Z9T2B6/QF0/KXsrlajI53mFDtQXsa
-hkIIX6rUmLs77xw5GcU=
-=Hbr4
------END PGP SIGNATURE-----
+EBUILD firebird-2.5.0.26074.0-r2.ebuild 9055 RMD160 0dd9ad63cb13377a680dc45101a72a3e2ea31a4a SHA1 565ec36136abe7d63dec288dc00abde5c45d53ca SHA256 c6fd1ec9a3feb38b958ae698ac7a9fd5217f5503e53974f850825740c122cab1
+MISC ChangeLog 24169 RMD160 c7e81669caa2ebb6b7b3e9042334c5534af3820e SHA1 2897d1c3eb637a2dad5e7c58caf2add70defff80 SHA256 b9249581ec6570c9d2fa591c12af9d9269fce627cb1e2400b661a613a42e025b
+MISC metadata.xml 1056 RMD160 7023f28f0c998149f4ade3727d19f61661ccf85a SHA1 033f8bb8b459f9aa33530c4ac6e65e01b04e1fe7 SHA256 163314e7103f3c4811e3380490088b00f710eeb84659f707291b6d7263f8ac22
diff --git a/dev-db/firebird/files/firebird-2.5.0.26074.0-Makefile.in.static.createdb b/dev-db/firebird/files/firebird-2.5.0.26074.0-Makefile.in.static.createdb
new file mode 100644
index 000000000000..bd5889b488b0
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.5.0.26074.0-Makefile.in.static.createdb
@@ -0,0 +1,66 @@
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# You may obtain a copy of the Licence at
+# http://www.gnu.org/licences/lgpl.html
+# 
+# As a special exception this file can also be included in modules
+# with other source code as long as that source code has been 
+# released under an Open Source Initiative certificed licence.  
+# More information about OSI certification can be found at: 
+# http://www.opensource.org 
+# 
+# This module is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public Licence for more details.
+# 
+# This module was created by members of the firebird development 
+# team.  All individual contributions remain the Copyright (C) of 
+# those individuals and all rights are reserved.  Contributors to 
+# this file are either listed below or can be obtained from a CVS 
+# history command.
+#
+#  Created by:  Mark O'Donohue <mark.odonohue@ludwig.edu.au>
+#
+#  Contributor(s):
+# 
+#
+#
+ROOT=..
+ObjModuleType=boot
+CXXFLAGS+= -DBOOT_BUILD
+
+include     $(ROOT)/gen/make.defaults
+include     $(ROOT)/gen/make.platform
+include     $(ROOT)/gen/make.rules
+include     $(ROOT)/gen/make.shared.variables
+
+
+@SET_MAKE@
+
+
+CREATEDB_Files= create_db.cpp
+CREATEDB_Sources = $(addprefix utilities/, $(CREATEDB_Files))
+CREATEDB_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CREATEDB_Sources))))
+
+
+AllObjects = $(CREATEDB_Object) $(CLUMPLETS_Objects)
+
+Dependencies = $(AllObjects:.o=.d) 
+
+
+.PHONY: all create_db
+
+all: create_db
+
+create_db: $(CREATE_DB)
+
+$(CREATE_DB):	$(CREATEDB_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
+	$(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS)
+
+
+include $(ROOT)/gen/make.shared.targets
+
+-include $(Dependencies)
diff --git 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
new file mode 100644
index 000000000000..1f44fcc97aed
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.5.0.26074.0-build.patch
@@ -0,0 +1,228 @@
+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
+
diff --git 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
index 7648711363d0..8331c8122faf 100644
--- 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,6 +1,6 @@
-diff -Naur Firebird-2.5.0.26074-0_mod//builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0/builds/posix/Makefile.in.firebird
---- Firebird-2.5.0.26074-0_mod//builds/posix/Makefile.in.firebird	2010-11-12 15:46:22.000000000 -0500
-+++ Firebird-2.5.0.26074-0/builds/posix/Makefile.in.firebird	2010-11-12 16:36:22.000000000 -0500
+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)
diff --git 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
new file mode 100644
index 000000000000..8be521cc0fac
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags.patch
@@ -0,0 +1,59 @@
+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)
+ 
diff --git 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
new file mode 100644
index 000000000000..3891cc776fae
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.5.0.26074.0-superclassic.patch
@@ -0,0 +1,12 @@
+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:
diff --git a/dev-db/firebird/files/firebird.xinetd b/dev-db/firebird/files/firebird.xinetd
new file mode 100644
index 000000000000..01fc102ee3a8
--- /dev/null
+++ b/dev-db/firebird/files/firebird.xinetd
@@ -0,0 +1,11 @@
+service gds_db
+{
+	flags			= REUSE
+	socket_type		= stream
+	wait			= no
+	user			= firebird
+	log_on_success		+= USERID
+	log_on_failure 		+= USERID
+	server			= /usr/bin/fb_inet_server
+	disable			= yes
+}
diff --git a/dev-db/firebird/firebird-2.5.0.26074.0-r2.ebuild b/dev-db/firebird/firebird-2.5.0.26074.0-r2.ebuild
new file mode 100644
index 000000000000..e884406629c3
--- /dev/null
+++ b/dev-db/firebird/firebird-2.5.0.26074.0-r2.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.0.26074.0-r2.ebuild,v 1.1 2011/10/06 09:03:08 patrick Exp $
+
+EAPI=4
+
+inherit flag-o-matic eutils autotools multilib 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() {
+	# Fixes bug #347133
+	epatch "${FILESDIR}/${P}-build.patch"
+	cp "${FILESDIR}/${P}-Makefile.in.static.createdb" \
+		"${S}/builds/posix/Makefile.in.static.createdb" \
+		|| die "createdb makefile not found"
+
+	# 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}/${P}-deps-flags.patch"
+
+	use client && epatch "${FILESDIR}/${P}-client.patch"
+	if ! use superserver ; then
+		epatch "${FILESDIR}/${P}-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 docs/*.pdf
+		dodoc "${WORKDIR}"/manuals/*
+	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"
+}
diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index 2200b0564fe7..469c58f3cf58 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -1,9 +1,17 @@
 <?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>
+<herd>proxy-maintainers</herd>
+<maintainer>
+<email>patrick@gentoo.org</email>
+<name>Patrick Lauer</name>
+<description>Proxy maintainer. CC him on bugs</description>
+</maintainer>
+<maintainer>
+<email>wlt@obsidian-studios.com</email>
+<name>William L. Thomson Jr.</name>
+<description>Maintainer. Assign bugs to him</description>
+</maintainer>
 	<longdescription>
 	Firebird is a relational database offering many ANSI SQL standard 
 	features that runs on Linux, Windows, and a variety of Unix platforms.