Bump, lots of improvements and features added thanks to wltjr

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

10 files changed, 528 insertions, 3 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index d62e0e240f5c..0e51d7e81465 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/firebird
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.103 2010/07/20 18:21:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.104 2010/11/18 20:01:23 patrick Exp $
+
+*firebird-2.5.0.26074.0 (18 Nov 2010)
+
+  18 Nov 2010; Patrick Lauer <patrick@gentoo.org>
+  +firebird-2.5.0.26074.0.ebuild, +files/firebird-2.5.0.26074.0-client.patch,
+  +files/firebird-2.5.0.26074.0-deps-flags-libs.patch,
+  +files/firebird.conf.d.2.5, +files/firebird.init.d.2.5,
+  +files/firebird.logrotate, +files/xinetd.2, metadata.xml:
+  Bump, lots of improvements and features added thanks to wltjr
 
   20 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
   -firebird-2.0.3.12981.0-r7.ebuild, -firebird-2.0.4.13130.1.ebuild,
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index d4e19041b48d..539fdb78bece 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -9,15 +9,23 @@ AUX firebird-2.1.1.17910.0-deps-flags-libs.patch 5002 RMD160 fdb35777355c4f43866
 AUX firebird-2.1.1.17910.0-gcc-icu-declare.patch 537 RMD160 2464b9328098ec7db82a4a84aa31cf0fe1e6e521 SHA1 604dc760fcd056c8376548233d1043f8229b11bb SHA256 877d3a5eeb5a98d0ca06de5ca39fac892abd3eae8296bdbc88b15eb8a42fd339
 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-deps-flags-libs.patch 6260 RMD160 948495b47615f57dc7664dd065159ae03f38336f SHA1 630dd88d96d5b57b1e453951b4a81dd25666d186 SHA256 1d64faf6d47291dbbc0d28f9d569b7b33a8737ab94ed6cd16230936bb1f97c31
 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
+AUX firebird.conf.d.2.5 270 RMD160 73f0bfd7d98828cf91d8c7937e627bf537f997a6 SHA1 1bf31f9192ec4baf194e54f9620a1f3194a77055 SHA256 c95575949a2509f61dfdad0b311319c15bc4fcf98397dbf86849a208e8e49cea
 AUX firebird.init.d 692 RMD160 fd32d3ca38f149df1c6c46697a9c043b22bf25dd SHA1 379f3dd8e768e958ab3faff203d0d7a502c8f120 SHA256 7602d5030abaa7414cbe10f3223c38861742807bbe92f9af5693d28520398f6e
+AUX firebird.init.d.2.5 569 RMD160 296058573c76212642d5b9d0688f6e149931dd0f SHA1 cb92fd4521e17ad9754bcb5d02744fe78bbb87ac SHA256 7f42ab0f98d8f5a026aa8191633ae4515363e41902643005a0db20e9cc6177ee
+AUX firebird.logrotate 169 RMD160 5d4486e41421d03d27c337bd982eb89b3ddc8cd8 SHA1 7883786b79aad6098a91641e2781a8a320125826 SHA256 462a7273c4881b66d31fe44349aae45d1f7085ff4db848eebc5e50b2bcb7f6da
 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
 DIST Firebird-2.1.3.18185-0.tar.bz2 13770360 RMD160 af9ae88f8a8152ffeb7d128f009436b06e28c07f SHA1 1504e4a579d9020bd47470ae54c67490ad13f032 SHA256 8047cbd4bdc79928be7369bf0cdfde74873f1de29c0ac74e7241826c02f0fd28
+DIST Firebird-2.5.0.26074-0.tar.bz2 13579819 RMD160 b64a2bad70664dc438a03490b91f3a5a08b2dfa6 SHA1 d7afea3a87c8298fd39ad76cc9580ef9f4100421 SHA256 b9f1982c3c9a0571508d177f1ad7459a6e2d598fc07f0985bce491b93d497053
 DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d
 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
-MISC ChangeLog 22841 RMD160 52bad5f2bf2cc2531febfc3b0dbfe5b03c0858d5 SHA1 76b3e141700bdd5771b18a5c46f07e0a5556638a SHA256 7d55dd9c7fda4aa85e55755d8a37f0334d500eec8082dd7324c4efb560ec9ea8
-MISC metadata.xml 619 RMD160 098761b0ad299b3c7bf0d3b59b9ebe2cf01cc145 SHA1 ef2a0fbd0a8b21692ae1a2a12e8b0ce7222fff9f SHA256 6b01dc565960c0345d81dafc9775196f4bc719eb925ea94c6b0a0c20e195e9e8
+EBUILD firebird-2.5.0.26074.0.ebuild 8550 RMD160 6d66d90f790154eac14f7fd2016a3324fcf5f2f1 SHA1 e33d41e8689ebe5cb18993093ad2c38257442d96 SHA256 3027f080cf0e00a407b67cfe746874e2691628c8ac867cd57fda57d315b41d1c
+MISC ChangeLog 23244 RMD160 eb312281bf14ec3b0f5d5dd2250f78cdcb08a5b6 SHA1 a5126490697bdbed2ffdf8df588a75ec4bc4f129 SHA256 9631afc91b0117b3b34b2bd19fdd0d8187749f276e0e409856a0a7123366b4ed
+MISC metadata.xml 813 RMD160 8b53b8cd6708adba4d58d1f3f74995c27ba75c54 SHA1 e8bb87ce727a001c7fa55979d0ed18275e8a6058 SHA256 465ceb3f7c3932611ec0a9ceda264b32a9f5aa3c96ca581273d266898c82ec58
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
new file mode 100644
index 000000000000..7648711363d0
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.5.0.26074.0-client.patch
@@ -0,0 +1,12 @@
+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
+@@ -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
+ 
+ 
diff --git 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
new file mode 100644
index 000000000000..3c40461c7e2b
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags-libs.patch
@@ -0,0 +1,155 @@
+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
diff --git a/dev-db/firebird/files/firebird.conf.d.2.5 b/dev-db/firebird/files/firebird.conf.d.2.5
new file mode 100644
index 000000000000..625963d0c13b
--- /dev/null
+++ b/dev-db/firebird/files/firebird.conf.d.2.5
@@ -0,0 +1,7 @@
+FBUSER=firebird
+FBGROUP=firebird
+FIREBIRD=/usr/lib/firebird
+FBGUARD=/usr/sbin/fbguard
+PIDFILE=/var/run/firebird/firebird.pid
+FB_OPTS="-forever -daemon -pidfile $PIDFILE"
+LD_LIBRARY_PATH=/usr/lib/:/usr/lib/firebird/intl/:/usr/lib/firebird/plugins/:/usr/lib/firebird/UDF/
diff --git a/dev-db/firebird/files/firebird.init.d.2.5 b/dev-db/firebird/files/firebird.init.d.2.5
new file mode 100644
index 000000000000..1a6d6d497a43
--- /dev/null
+++ b/dev-db/firebird/files/firebird.init.d.2.5
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/files/firebird.init.d.2.5,v 1.1 2010/11/18 20:01:23 patrick Exp $
+
+depend() {
+	need net
+}
+
+start(){
+	ebegin "Starting Firebird server"
+	start-stop-daemon --start --pidfile $pidfile --user $FBUSER --group $FBGROUP --exec $FBGUARD -- $FB_OPTS
+	eend $?
+}
+
+stop(){
+	ebegin "Stopping Firebird server"
+	start-stop-daemon --stop --name fbguard
+	eend $?
+}
+
+restart(){
+	svc_stop
+	sleep 1
+	svc_start
+}
+
diff --git a/dev-db/firebird/files/firebird.logrotate b/dev-db/firebird/files/firebird.logrotate
new file mode 100644
index 000000000000..c87cd43f30f8
--- /dev/null
+++ b/dev-db/firebird/files/firebird.logrotate
@@ -0,0 +1,10 @@
+/var/log/firebird/firebird.log {
+     compress
+     weekly
+     missingok
+     rotate 52
+     size=+1024k
+     delaycompress
+     notifempty
+     create 644 firebird
+ }
diff --git a/dev-db/firebird/files/xinetd.2 b/dev-db/firebird/files/xinetd.2
new file mode 100644
index 000000000000..01fc102ee3a8
--- /dev/null
+++ b/dev-db/firebird/files/xinetd.2
@@ -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.ebuild b/dev-db/firebird/firebird-2.5.0.26074.0.ebuild
new file mode 100644
index 000000000000..11b5121bf54d
--- /dev/null
+++ b/dev-db/firebird/firebird-2.5.0.26074.0.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2010 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.ebuild,v 1.1 2010/11/18 20:01:23 patrick Exp $
+
+inherit flag-o-matic eutils autotools multilib versionator
+
+MY_P=Firebird-$(replace_version_separator 4 -)
+#MY_P=Firebird-${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
+	doc? ( app-arch/unzip )"
+RDEPEND="${RDEPEND}
+	xinetd? ( virtual/inetd )
+	!sys-cluster/ganglia"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	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
+	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}"
+
+	# 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-libs.patch"
+	use client && epatch "${FILESDIR}/${P}-client.patch"
+
+	# 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/{editline,icu}
+
+	eautoreconf
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+	filter-mfpmath sse
+
+	econf --prefix=/usr/$(get_libdir)/firebird \
+		$(use_enable superserver superserver) \
+		$(use_enable debug) \
+		--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 \
+		${myconf} || die "econf failed"
+	emake -j1 || die "error during make"
+}
+
+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
+
+	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}
+	fi
+
+	exeinto /usr/bin/${PN}
+	exeopts -m0755
+	doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
+
+	insinto /usr/$(get_libdir)/${PN}
+	doins *.msg
+
+	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.so
+	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.2" ${PN} || die "newins xinetd file failed"
+	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 8718328bb08d..9de480abf5d9 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -12,4 +12,9 @@
 	language support for stored procedures and triggers. It has been used
 	in production systems, under a variety of names, since 1981.
 	</longdescription>
+	<use>
+		<flag name='client'>Install client library and header files only</flag>
+		<flag name='superserver'>Install SuperServer</flag>
+		<flag name='xinetd'>Install ClassicServer</flag>
+	</use>
 </pkgmetadata>