Bumped to latest beta, remade and unified patches to patch. Removed old version.

Package-Manager: portage-2.1.3.13

7 files changed, 581 insertions, 296 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 9fcfb02a198b..5e9c7c649220 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/firebird
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.75 2007/10/01 15:08:58 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.76 2007/10/19 18:09:27 wltjr Exp $
+
+*firebird-2.1.0.16780_beta2 (19 Oct 2007)
+
+  19 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch,
+  -firebird-1.5.4-r3.ebuild, +firebird-2.1.0.16780_beta2.ebuild:
+  Bumped to latest beta, remade and unified patches to patch. Removed old
+  version.
 
   01 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   -firebird-2.0.3.12981.0-r1.ebuild, firebird-2.0.3.12981.0-r2.ebuild:
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 3aa2c48efb5a..f10f96e7118a 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -14,6 +14,10 @@ AUX firebird-2.0.3.12981.0-paths.patch 12954 RMD160 acac734477715e2bcf5833b7fba1
 MD5 ecf89f096f817130287b8f42967d0b6e files/firebird-2.0.3.12981.0-paths.patch 12954
 RMD160 acac734477715e2bcf5833b7fba11be2d07455dd files/firebird-2.0.3.12981.0-paths.patch 12954
 SHA256 f3d1c896094961d824cb179a6c527470953f9727501a4b8d3ab2b58250113dc7 files/firebird-2.0.3.12981.0-paths.patch 12954
+AUX firebird-2.1.0.16780_beta2-deps-libs-paths.patch 16935 RMD160 18e12db607693c15f26cce18c668c41fe6596647 SHA1 1459acf322e10b8f9e800c08f954f5e3eae070f9 SHA256 66d245a14efbb1c4069ee9138071e281559fab049ae7821a5209613de0777a3f
+MD5 a8bf4aad907846da45879a978e94cdfa files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch 16935
+RMD160 18e12db607693c15f26cce18c668c41fe6596647 files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch 16935
+SHA256 66d245a14efbb1c4069ee9138071e281559fab049ae7821a5209613de0777a3f files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch 16935
 AUX firebird.conf.d 80 RMD160 bcee53ba9cde8822f3c4f980e274bc4958a6fc30 SHA1 9442726f3e59887ecc40333c0214045cd8f78d50 SHA256 ad4590c1fc81006759ae801086aa73567f82799bad8275c91d7ddb97c26f7f2f
 MD5 c5f5e6bae2cae891269931331e69f1ca files/firebird.conf.d 80
 RMD160 bcee53ba9cde8822f3c4f980e274bc4958a6fc30 files/firebird.conf.d 80
@@ -38,15 +42,9 @@ AUX firebird.xinetd.2 199 RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 SHA1 1
 MD5 30b9dcbf549f3b99040b24914b085acf files/firebird.xinetd.2 199
 RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 files/firebird.xinetd.2 199
 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 files/firebird.xinetd.2 199
-DIST Firebird-1.5-QuickStart.pdf 193637 RMD160 c3d541701950a9b8ac0b353e5360af9235a3cf3f SHA1 fc64d475222257b269378451a69167ea53852ece SHA256 3b6cbf86d9ee7deaeeae101edf6c124c694ca423c9f4d09da035eed9e2bb70fe
 DIST Firebird-2.0.3.12981-0.tar.bz2 12623689 RMD160 6a1139b30a77070e6e74bdaebc5d9bdd52e32509 SHA1 8b6134ad1910ae0677e93c84279132f6c67e7862 SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e
-DIST firebird-1.5.4-debian-patchset.tar.bz2 22696 RMD160 e4fec480f4480fc2dbc460c5dffab6c0127867f1 SHA1 e925f90d18ece6eb5c8a2645f7e2f559e5e7b153 SHA256 c88345bad9064c552f4231d1ce82e3fb89d2cdfde8bf0965a966b426d9aaefea
-DIST firebird-1.5.4.4910.tar.bz2 5087076 RMD160 00480f290b8e82f9965387a903ae392e8b71c3f1 SHA1 684860f6b1b77f5068ea175d3e08a7c839bb92a5 SHA256 c4464b1b89fde0676562de2b82c971d4f791133dcc2967760dc2f3a5cfd52556
+DIST Firebird-2.1.0.16780-Beta2.tar.bz2 13507524 RMD160 960ebaa83773020c0406a89a1b20982ea5eb669b SHA1 6b5369fd8a652e385621e0c9bf46e2ac1078bcc4 SHA256 7aaf8bbb0eb8af63f4e751f9ebcc9cc57a5c5e788bcc01f003b60771ffdf690a
 DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d
-EBUILD firebird-1.5.4-r3.ebuild 7903 RMD160 6969baf1bd750a604aba25891c7e2f499f9bd134 SHA1 33f256c967143d504001eb2cf3747e528bd4af67 SHA256 b5143ec87334beeeb7af09be5d080eb7bdaae01f9856b0c2e25d0f1ff7aaf62a
-MD5 555395205f844182a65cfee61aaf0d49 firebird-1.5.4-r3.ebuild 7903
-RMD160 6969baf1bd750a604aba25891c7e2f499f9bd134 firebird-1.5.4-r3.ebuild 7903
-SHA256 b5143ec87334beeeb7af09be5d080eb7bdaae01f9856b0c2e25d0f1ff7aaf62a firebird-1.5.4-r3.ebuild 7903
 EBUILD firebird-2.0.3.12981.0-r2.ebuild 6097 RMD160 340a3a7d444d54b74d75bd77ee4541344b94f001 SHA1 abbc60acf20d5693bfe4d735828a38ae59c7f985 SHA256 23e5f7fef96a65c8a378ecac3ad0ec3996a86fbd01726cbfec0d824b4ad6ce7a
 MD5 7e499193e5f42a0d372d70353c3e84ad firebird-2.0.3.12981.0-r2.ebuild 6097
 RMD160 340a3a7d444d54b74d75bd77ee4541344b94f001 firebird-2.0.3.12981.0-r2.ebuild 6097
@@ -55,20 +53,24 @@ EBUILD firebird-2.0.3.12981.0.ebuild 7124 RMD160 1bdc2d6ac6d0cfe52e6b0f84325b1b6
 MD5 ec533a35b8eadb0b72fea0b55e2400a5 firebird-2.0.3.12981.0.ebuild 7124
 RMD160 1bdc2d6ac6d0cfe52e6b0f84325b1b6a6876880c firebird-2.0.3.12981.0.ebuild 7124
 SHA256 9dbccfc1d0cb64efccf1cb6d308fba01c4fdf973816bb961b873f5b0f3115684 firebird-2.0.3.12981.0.ebuild 7124
-MISC ChangeLog 13835 RMD160 19aeeea71121343ae142f491e4e316b2865135a9 SHA1 e12cdc9c0bdba1f140df0a4b58671fdf72644211 SHA256 7446d0c203b42ad98a5e9138a9cfc389e85b655bfde480deee2d287f5f619bb2
-MD5 a48073e8bb8e9738bcf6ecb2f7eb4c75 ChangeLog 13835
-RMD160 19aeeea71121343ae142f491e4e316b2865135a9 ChangeLog 13835
-SHA256 7446d0c203b42ad98a5e9138a9cfc389e85b655bfde480deee2d287f5f619bb2 ChangeLog 13835
+EBUILD firebird-2.1.0.16780_beta2.ebuild 6045 RMD160 13977338574d6acd0a2400bd119877b80f6b628f SHA1 49ba3688fe2028f012728210d8afdfc82e9070cb SHA256 5dd49dea7a52bba8bf32057b614650913a07440a951a55abb8bf0b7e5213cb05
+MD5 1d7b69cf3cd3b1a44d1d8943bbd15299 firebird-2.1.0.16780_beta2.ebuild 6045
+RMD160 13977338574d6acd0a2400bd119877b80f6b628f firebird-2.1.0.16780_beta2.ebuild 6045
+SHA256 5dd49dea7a52bba8bf32057b614650913a07440a951a55abb8bf0b7e5213cb05 firebird-2.1.0.16780_beta2.ebuild 6045
+MISC ChangeLog 14145 RMD160 9eca3c190ecc7039180d92e585f3b9f1973c83a2 SHA1 ecaf96f7abf0ffc721dc1bd2131e5260deb0e93f SHA256 81d5ad8cd4359d40c1f99c8c14876c8a7d1a88948866ca4bf944831de85cf61b
+MD5 9ac1031e59a4e97e18915c45555eb597 ChangeLog 14145
+RMD160 9eca3c190ecc7039180d92e585f3b9f1973c83a2 ChangeLog 14145
+SHA256 81d5ad8cd4359d40c1f99c8c14876c8a7d1a88948866ca4bf944831de85cf61b ChangeLog 14145
 MISC metadata.xml 611 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 SHA1 ce284a4db1ea6aa20a3824fb0c5730385659f84c SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63
 MD5 bf38ebc9198cc6b2bfc486bc9328c943 metadata.xml 611
 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 metadata.xml 611
 SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63 metadata.xml 611
-MD5 20a106c4128997b0c01898ae2431188d files/digest-firebird-1.5.4-r3 1048
-RMD160 380abfa848b17114c93549605983bb62325fa2ef files/digest-firebird-1.5.4-r3 1048
-SHA256 a9f424580b7adc46492d408d0219e04ca70854ee5c0553ba8419f289164a72d9 files/digest-firebird-1.5.4-r3 1048
 MD5 693fad7757fc0c2e66f358e8703ef309 files/digest-firebird-2.0.3.12981.0 506
 RMD160 b0ba0f24dd612555f7ce7b7858fc6456448dbe78 files/digest-firebird-2.0.3.12981.0 506
 SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/digest-firebird-2.0.3.12981.0 506
 MD5 693fad7757fc0c2e66f358e8703ef309 files/digest-firebird-2.0.3.12981.0-r2 506
 RMD160 b0ba0f24dd612555f7ce7b7858fc6456448dbe78 files/digest-firebird-2.0.3.12981.0-r2 506
 SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/digest-firebird-2.0.3.12981.0-r2 506
+MD5 e0a12cb514870a26e879ca8125320723 files/digest-firebird-2.1.0.16780_beta2 518
+RMD160 921fd99f434236240864e3479fa05aa8b68b21eb files/digest-firebird-2.1.0.16780_beta2 518
+SHA256 0f053ca3649de2329b0046f598693ebad94b81a9bfeff34a190db93778aaf01b files/digest-firebird-2.1.0.16780_beta2 518
diff --git a/dev-db/firebird/files/digest-firebird-1.5.4-r3 b/dev-db/firebird/files/digest-firebird-1.5.4-r3
deleted file mode 100644
index b3e31cc48311..000000000000
--- a/dev-db/firebird/files/digest-firebird-1.5.4-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 3690d389b3b69883f4bbc258b6c81851 Firebird-1.5-QuickStart.pdf 193637
-RMD160 c3d541701950a9b8ac0b353e5360af9235a3cf3f Firebird-1.5-QuickStart.pdf 193637
-SHA256 3b6cbf86d9ee7deaeeae101edf6c124c694ca423c9f4d09da035eed9e2bb70fe Firebird-1.5-QuickStart.pdf 193637
-MD5 b3530a500074ab5b2a276e37ecd10ccf firebird-1.5.4-debian-patchset.tar.bz2 22696
-RMD160 e4fec480f4480fc2dbc460c5dffab6c0127867f1 firebird-1.5.4-debian-patchset.tar.bz2 22696
-SHA256 c88345bad9064c552f4231d1ce82e3fb89d2cdfde8bf0965a966b426d9aaefea firebird-1.5.4-debian-patchset.tar.bz2 22696
-MD5 6655190f760217845623a75001b6ddd4 firebird-1.5.4.4910.tar.bz2 5087076
-RMD160 00480f290b8e82f9965387a903ae392e8b71c3f1 firebird-1.5.4.4910.tar.bz2 5087076
-SHA256 c4464b1b89fde0676562de2b82c971d4f791133dcc2967760dc2f3a5cfd52556 firebird-1.5.4.4910.tar.bz2 5087076
-MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848
-RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848
-SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848
diff --git a/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2 b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2
new file mode 100644
index 000000000000..f63a1165d43f
--- /dev/null
+++ b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2
@@ -0,0 +1,6 @@
+MD5 e25589c8409f4eb2724e39898ec7ccf5 Firebird-2.1.0.16780-Beta2.tar.bz2 13507524
+RMD160 960ebaa83773020c0406a89a1b20982ea5eb669b Firebird-2.1.0.16780-Beta2.tar.bz2 13507524
+SHA256 7aaf8bbb0eb8af63f4e751f9ebcc9cc57a5c5e788bcc01f003b60771ffdf690a Firebird-2.1.0.16780-Beta2.tar.bz2 13507524
+MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848
+RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848
+SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848
diff --git a/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch
new file mode 100644
index 000000000000..62319ecb08be
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch
@@ -0,0 +1,337 @@
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird
+--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird	2007-10-19 11:11:36.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird	2007-10-19 11:20:01.000000000 -0400
+@@ -185,14 +185,14 @@
+ # 
+ 
+ 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
++#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.0.16780-Beta2_orig/builds/posix/make.defaults Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults
+--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults	2007-10-19 11:11:36.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults	2007-10-19 12:31:50.000000000 -0400
+@@ -229,11 +229,11 @@
+ LIBFBSTATIC_A = $(LIB)/libfbstatic.a
+ 
+ ifeq ($(EDITLINE_FLG),Y)
+-  ifeq ($(STD_EDITLINE), true)
+-	LIBEDITLINE := -leditline
+-  else
+-	LIBEDITLINE := $(LIB)/libeditline.a
+-  endif
++#  ifeq ($(STD_EDITLINE), true)
++	LIBEDITLINE := -ledit
++#  else
++#	LIBEDITLINE := $(LIB)/libeditline.a
++#  endif
+ endif
+ 
+ LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules Firebird-2.1.0.16780-Beta2/builds/posix/make.rules
+--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules	2007-10-19 11:11:36.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/builds/posix/make.rules	2007-10-19 11:30:08.000000000 -0400
+@@ -33,9 +33,9 @@
+ 
+ # 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 ($(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,19 +69,19 @@
+ 
+ .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) $< $@
+ 
+ 
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets
+--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets	2007-10-19 11:11:36.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets	2007-10-19 11:28:58.000000000 -0400
+@@ -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.0.16780-Beta2_orig/configure Firebird-2.1.0.16780-Beta2/configure
+--- Firebird-2.1.0.16780-Beta2_orig/configure	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/configure	2007-10-19 11:26:19.000000000 -0400
+@@ -3928,13 +3928,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
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/db_alias.cpp Firebird-2.1.0.16780-Beta2/src/jrd/db_alias.cpp
+--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/db_alias.cpp	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/jrd/db_alias.cpp	2007-10-19 11:31:25.000000000 -0400
+@@ -28,7 +28,7 @@
+ 
+ typedef Firebird::PathName string;
+ 
+-const char* ALIAS_FILE = "aliases.conf";
++const char* ALIAS_FILE = "../../../etc/firebird/aliases.conf";
+ 
+ static void replace_dir_sep(string& s)
+ {
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/file_params.h Firebird-2.1.0.16780-Beta2/src/jrd/file_params.h
+--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/file_params.h	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/jrd/file_params.h	2007-10-19 11:35:32.000000000 -0400
+@@ -38,11 +38,11 @@
+ const int EVENT_SEMAPHORES	= 1;
+ 
+ #ifdef NOHOSTNAME
+-static const char* EVENT_FILE	= "isc_event1";
+-static const char* LOCK_FILE	= "isc_lock1.gbl";
+-static const char* INIT_FILE	= "isc_init1";
+-static const char* GUARD_FILE	= "isc_guard1";
+-static const char* MONITOR_FILE	= "isc_monitor1";
++static const char* EVENT_FILE	= "../../../var/run/firebird/isc_event1";
++static const char* LOCK_FILE	= "../../../var/run/firebird/isc_lock1.gbl";
++static const char* INIT_FILE	= "../../../var/run/firebird/isc_init1";
++static const char* GUARD_FILE	= "../../../var/run/firebird/isc_guard1";
++static const char* MONITOR_FILE	= "../../../var/run/firebird/isc_monitor1";
+ #elif defined(VMS)
+ static const char* EVENT_FILE	= "[000000]isc_event1.%s";
+ static const char* LOCK_FILE	= "[000000]isc_lock1.%s";
+@@ -56,11 +56,11 @@
+ static const char* GUARD_FILE	= "%s.grd";
+ static const char* MONITOR_FILE	= "%s.mon";
+ #else
+-static const char* EVENT_FILE	= "isc_event1.%s";
+-static const char* LOCK_FILE	= "isc_lock1.%s";
+-static const char* INIT_FILE	= "isc_init1.%s";
+-static const char* GUARD_FILE	= "isc_guard1.%s";
+-static const char* MONITOR_FILE	= "isc_monitor1.%s";
++static const char* EVENT_FILE	= "../../../var/run/firebird/isc_event1.%s";
++static const char* LOCK_FILE	= "../../../var/run/firebird/isc_lock1.%s";
++static const char* INIT_FILE	= "../../../var/run/firebird/isc_init1.%s";
++static const char* GUARD_FILE	= "../../../var/run/firebird/isc_guard1.%s";
++static const char* MONITOR_FILE	= "../../../var/run/firebird/isc_monitor1.%s";
+ #endif
+ 
+ #ifdef sun
+@@ -91,7 +91,7 @@
+ static const char* MSG_FILE		= "firebird.msg";
+ static const char MSG_FILE_LANG[]= "intl/%.10s.msg";
+ const int LOCALE_MAX	= 10;
+-static const char* LOGFILE		= "firebird.log";
++static const char* LOGFILE		= "../../../var/log/firebird/firebird.log";
+ #elif defined(WIN_NT)
+ static const char* WORKFILE		= "c:\\temp\\";
+ static const char* MSG_FILE		= "firebird.msg";
+@@ -130,7 +130,7 @@
+ static const char* MSG_FILE		= "firebird.msg";
+ static const char MSG_FILE_LANG[]= "intl/%.10s.msg";
+ const int LOCALE_MAX	= 10;
+-static const char* LOGFILE		= "firebird.log";
++static const char* LOGFILE		= "../../../var/log/firebird/firebird.log";
+ #endif
+ 
+ #endif /* JRD_FILE_PARAMS_H */
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/jrd_pwd.h Firebird-2.1.0.16780-Beta2/src/jrd/jrd_pwd.h
+--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/jrd_pwd.h	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/jrd/jrd_pwd.h	2007-10-19 11:36:14.000000000 -0400
+@@ -57,7 +57,7 @@
+ #ifdef VMS
+ 					"[sysmgr]security2.fdb";
+ #else
+-					"security2.fdb";
++					"../../../etc/firebird/security2.fdb";
+ #endif
+ 
+ 		gds__prefix(path_buffer, USER_INFO_NAME);
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/os/config_root.h Firebird-2.1.0.16780-Beta2/src/jrd/os/config_root.h
+--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/os/config_root.h	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/jrd/os/config_root.h	2007-10-19 11:37:36.000000000 -0400
+@@ -33,7 +33,7 @@
+ #include "../jrd/os/path_utils.h"
+ #include "../common/utils_proto.h"
+ 
+-static const char* CONFIG_FILE	= "firebird.conf";
++static const char* CONFIG_FILE	= "../../../etc/firebird/firebird.conf";
+ 
+ /**
+ 	Since the original (isc.cpp) code wasn't able to provide powerful and
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/jrd/svc.cpp Firebird-2.1.0.16780-Beta2/src/jrd/svc.cpp
+--- Firebird-2.1.0.16780-Beta2_orig/src/jrd/svc.cpp	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/jrd/svc.cpp	2007-10-19 11:44:43.000000000 -0400
+@@ -445,38 +445,38 @@
+ static serv_entry services[] =
+ {
+ 
+-	{ isc_action_max, "print_cache", "-svc", "bin/fb_cache_print", NULL, 0 },
+-	{ isc_action_max, "print_locks", "-svc", "bin/fb_lock_print", NULL, 0 },
+-	{ isc_action_max, "start_cache", "-svc", "bin/fb_cache_manager", NULL, 0 },
+-	{ isc_action_max, "analyze_database", "-svc", "bin/gstat", NULL, 0 },
+-	{ isc_action_max, "backup", "-svc -b", "bin/gbak",	MAIN_GBAK, 0 },
+-	{ isc_action_max, "create", "-svc -c", "bin/gbak",	MAIN_GBAK, 0 },
+-	{ isc_action_max, "restore", "-svc -r", "bin/gbak",	MAIN_GBAK, 0 },
+-	{ isc_action_max, "gdef", "-svc", "bin/gdef", NULL, 0 },
+-	{ isc_action_max, "gsec", "-svc", "bin/gsec", NULL, 0 },
+-	{ isc_action_max, "disable_journal", "-svc -disable", "bin/gjrn", NULL, 0 },
+-	{ isc_action_max, "dump_journal", "-svc -online_dump", "bin/gjrn", NULL, 0 },
+-	{ isc_action_max, "enable_journal", "-svc -enable", "bin/gjrn", NULL, 0 },
+-	{ isc_action_max, "monitor_journal", "-svc -console", "bin/gjrn", NULL, 0 },
++	{ isc_action_max, "print_cache", "-svc", "../../../usr/bin/fb_cache_print", NULL, 0 },
++	{ isc_action_max, "print_locks", "-svc", "../../../usr/bin/fb_lock_print", NULL, 0 },
++	{ isc_action_max, "start_cache", "-svc", "../../../usr/bin/fb_cache_manager", NULL, 0 },
++	{ isc_action_max, "analyze_database", "-svc", "../../../usr/bin/gstat", NULL, 0 },
++	{ isc_action_max, "backup", "-svc -b", "../../../usr/bin/gbak",	MAIN_GBAK, 0 },
++	{ isc_action_max, "create", "-svc -c", "../../../usr/bin/gbak",	MAIN_GBAK, 0 },
++	{ isc_action_max, "restore", "-svc -r", "../../../usr/bin/gbak",	MAIN_GBAK, 0 },
++	{ isc_action_max, "gdef", "-svc", "../../../usr/bin/gdef", NULL, 0 },
++	{ isc_action_max, "gsec", "-svc", "../../../usr/bin/gsec", NULL, 0 },
++	{ isc_action_max, "disable_journal", "-svc -disable", "../../../usr/bin/gjrn", NULL, 0 },
++	{ isc_action_max, "dump_journal", "-svc -online_dump", "../../../usr/bin/gjrn", NULL, 0 },
++	{ isc_action_max, "enable_journal", "-svc -enable", "../../../usr/bin/gjrn", NULL, 0 },
++	{ isc_action_max, "monitor_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 },
+ 	{ isc_action_max, "query_server", NULL, NULL, NULL, 0 },
+-	{ isc_action_max, "start_journal", "-svc -server", "bin/gjrn", NULL, 0 },
+-	{ isc_action_max, "stop_cache", "-svc -shut -cache", "bin/gfix", NULL, 0 },
+-	{ isc_action_max, "stop_journal", "-svc -console", "bin/gjrn", NULL, 0 },
++	{ isc_action_max, "start_journal", "-svc -server", "../../../usr/bin/gjrn", NULL, 0 },
++	{ isc_action_max, "stop_cache", "-svc -shut -cache", "../../../usr/bin/gfix", NULL, 0 },
++	{ isc_action_max, "stop_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 },
+ 	{ isc_action_max, "anonymous", NULL, NULL, NULL, 0 },
+ 
+ /* NEW VERSION 2 calls, the name field MUST be different from those names above
+  */
+ 	{ isc_action_max, "service_mgr", NULL, NULL, NULL, 0 },
+-	{ isc_action_svc_backup, "Backup Database", NULL, "bin/gbak",	MAIN_GBAK, 0 },
+-	{ isc_action_svc_restore, "Restore Database", NULL, "bin/gbak",	MAIN_GBAK, 0 },
+-	{ isc_action_svc_repair, "Repair Database", NULL, "bin/gfix",	MAIN_GFIX, 0 },
+-	{ isc_action_svc_add_user, "Add User", NULL, "bin/gsec",	MAIN_GSEC, 0 },
+-	{ isc_action_svc_delete_user, "Delete User", NULL, "bin/gsec",	MAIN_GSEC, 0 },
+-	{ isc_action_svc_modify_user, "Modify User", NULL, "bin/gsec",	MAIN_GSEC, 0 },
+-	{ isc_action_svc_display_user, "Display User", NULL, "bin/gsec",	MAIN_GSEC, 0 },
+-	{ isc_action_svc_properties, "Database Properties", NULL, "bin/gfix",	MAIN_GFIX, 0 },
+-	{ isc_action_svc_lock_stats, "Lock Stats", NULL, "bin/fb_lock_print",	TEST_THREAD, 0 },
+-	{ isc_action_svc_db_stats, "Database Stats", NULL, "bin/gstat",	MAIN_GSTAT, 0 },
++	{ isc_action_svc_backup, "Backup Database", NULL, "../../../usr/bin/gbak",	MAIN_GBAK, 0 },
++	{ isc_action_svc_restore, "Restore Database", NULL, "../../../usr/bin/gbak",	MAIN_GBAK, 0 },
++	{ isc_action_svc_repair, "Repair Database", NULL, "../../../usr/bin/gfix",	MAIN_GFIX, 0 },
++	{ isc_action_svc_add_user, "Add User", NULL, "../../../usr/bin/gsec",	MAIN_GSEC, 0 },
++	{ isc_action_svc_delete_user, "Delete User", NULL, "../../../usr/bin/gsec",	MAIN_GSEC, 0 },
++	{ isc_action_svc_modify_user, "Modify User", NULL, "../../../usr/bin/gsec",	MAIN_GSEC, 0 },
++	{ isc_action_svc_display_user, "Display User", NULL, "../../../usr/bin/gsec",	MAIN_GSEC, 0 },
++	{ isc_action_svc_properties, "Database Properties", NULL, "../../../usr/bin/gfix",	MAIN_GFIX, 0 },
++	{ isc_action_svc_lock_stats, "Lock Stats", NULL, "../../../usr/bin/fb_lock_print",	TEST_THREAD, 0 },
++	{ isc_action_svc_db_stats, "Database Stats", NULL, "../../../usr/bin/gstat",	MAIN_GSTAT, 0 },
+ 	{ isc_action_svc_get_fb_log, "Get Log File", NULL, NULL,	SVC_read_fb_log, 0 },
+ /* actions with no names are undocumented */
+ 	{ isc_action_svc_set_config, NULL, NULL, NULL,	TEST_THREAD, 0 },
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/fbcpl/fbdialog.cpp Firebird-2.1.0.16780-Beta2/src/utilities/fbcpl/fbdialog.cpp
+--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/fbcpl/fbdialog.cpp	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/utilities/fbcpl/fbdialog.cpp	2007-10-19 11:51:22.000000000 -0400
+@@ -1367,7 +1367,7 @@
+ bool CFBDialog::UpdateFirebirdConf(CString option, CString value)
+ {
+ 	CStdioFile FbConfFile, FbConfFileNew;
+-	CString FirebirdConfFilename = m_Root_Path + "firebird.conf";
++	CString FirebirdConfFilename = "../../../etc/firebird/firebird.conf";
+ 	CString FirebirdConfNewname = FirebirdConfFilename + ".new";
+ 	CString FirebirdConfOldname = FirebirdConfFilename + ".old";
+ 	CString FirebirdConfLine = "";
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/gsec/security.epp Firebird-2.1.0.16780-Beta2/src/utilities/gsec/security.epp
+--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/gsec/security.epp	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/utilities/gsec/security.epp	2007-10-19 11:51:56.000000000 -0400
+@@ -41,7 +41,7 @@
+ #endif
+ #include "../common/utils_proto.h"
+ 
+-DATABASE DB = STATIC FILENAME "security2.fdb";
++DATABASE DB = STATIC FILENAME "../../../etc/firebird/security2.fdb";
+ 
+ static const char* SYSDBA_USER_NAME	= "SYSDBA";
+ 
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/guard/guard.cpp Firebird-2.1.0.16780-Beta2/src/utilities/guard/guard.cpp
+--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/guard/guard.cpp	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/utilities/guard/guard.cpp	2007-10-19 11:52:29.000000000 -0400
+@@ -59,7 +59,7 @@
+ const USHORT IGNORE		= 3;
+ const USHORT NORMAL_EXIT= 0;
+ 
+-const char* SUPER_SERVER_BINARY	= "bin/fbserver";
++const char* SUPER_SERVER_BINARY	= "../../../usr/bin/fbserver";
+ 
+ const char* INTERBASE_USER		= "interbase";
+ const char* FIREBIRD_USER		= "firebird";
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/ibmgr.h Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/ibmgr.h
+--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/ibmgr.h	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/ibmgr.h	2007-10-19 11:52:56.000000000 -0400
+@@ -31,7 +31,7 @@
+ static const char* FIREBIRD_USER_NAME	= "firebird";
+ static const char* INTERBASE_USER_NAME	= "interbase";
+ static const char* INTERBASE_USER_SHORT= "interbas";
+-static const char* SERVER_GUARDIAN	= "bin/fbguard";
++static const char* SERVER_GUARDIAN	= "../../../usr/bin/fbguard";
+ 
+ const USHORT MSG_FAC	= 18;
+ const int MSG_LEN		= 128;
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/srvrmgr.cpp Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/srvrmgr.cpp
+--- Firebird-2.1.0.16780-Beta2_orig/src/utilities/ibmgr/srvrmgr.cpp	2007-10-19 11:11:39.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/src/utilities/ibmgr/srvrmgr.cpp	2007-10-19 11:53:32.000000000 -0400
+@@ -272,7 +272,7 @@
+ 		rs = "can not quit now, use shut -ign";
+ 		break;
+ 	case MSG_STARTERR:
+-		rs = "check $FIREBIRD/firebird.log file for errors";
++		rs = "check /var/log/firebird/firebird.log file for errors";
+ 		break;
+ 	case MSG_STARTFAIL:
+ 		rs = "can not start server";
diff --git a/dev-db/firebird/firebird-1.5.4-r3.ebuild b/dev-db/firebird/firebird-1.5.4-r3.ebuild
deleted file mode 100644
index 220f275578fd..000000000000
--- a/dev-db/firebird/firebird-1.5.4-r3.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.4-r3.ebuild,v 1.5 2007/07/13 06:38:59 mr_bones_ Exp $
-
-inherit flag-o-matic eutils
-
-extra_ver="4910"
-MY_P=${P}.${extra_ver}
-DESCRIPTION="A relational database offering many ANSI SQL-99 features."
-HOMEPAGE="http://firebird.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	 mirror://gentoo/firebird-1.5.4-debian-patchset.tar.bz2
-		doc? (	http://firebird.sourceforge.net/pdfmanual/Firebird-1.5-QuickStart.pdf
-				ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 -ia64 -sparc ~x86"
-IUSE="xinetd doc"
-RESTRICT="userpriv"
-
-RDEPEND="xinetd? ( virtual/inetd )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /opt/firebird firebird
-}
-
-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
-	unpack firebird-1.5.4-debian-patchset.tar.bz2
-	cd ${S}
-
-	for p in $(ls ${WORKDIR}/patches) ; do
-		epatch ${WORKDIR}/patches/${p} || die "Patch did not apply."
-	done
-
-	# This file must be regenerated during build
-	rm ${S}/src/dsql/parse.cpp
-}
-
-src_compile() {
-	# fix bug #33584
-	#strip-flags -funroll-loops
-	# but Meir intended "filter-flags -funroll-loops"; awaiting bug reports...
-
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	local myconf="--prefix=/opt/firebird --with-editline"
-	use xinetd || myconf="${myconf} --enable-superserver"
-
-	NOCONFIGURE=1
-
-	./autogen.sh ${myconf} || die "couldn't run autogen.sh"
-
-	find . -type f -exec sed -i -e "s/-lcurses/-lncurses/g" {} \;
-
-	econf ${myconf} || die "./configure failed"
-	emake -j 1 || die "error during make"
-}
-
-src_install() {
-	cd ${S}/gen
-	make -f Makefile.install tarfile || die "Can't create buildroot tar file"
-	cd ${D}
-	tar zxpf ${S}/gen/Firebird?S-*/buildroot.tar.gz
-
-	dodoc ${D}/opt/firebird/{README,WhatsNew,doc/*}
-	docinto examples
-	dodoc ${D}/opt/firebird/examples/*
-	docinto sql.extensions
-	dodoc ${D}/opt/firebird/doc/sql.extensions/*
-
-	rm -r ${D}/opt/firebird/{README,WhatsNew,doc,misc}
-	rm -r ${D}/opt/firebird/examples
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d ; newins ${FILESDIR}/${PN}.xinetd firebird
-	else
-		exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}.init.d firebird
-		insinto /etc/conf.d ; newins ${FILESDIR}/firebird.conf.d firebird
-		fperms 640 /etc/conf.d/firebird
-	fi
-	insinto /etc/env.d ; newins ${FILESDIR}/70${PN} 70firebird
-
-	# Following is adapted from postinstall.sh
-
-	dodir /opt/firebird/run
-	keepdir /opt/firebird/run
-
-	# make sure everything is owned by firebird
-	chown -R firebird:firebird ${D}/opt/firebird
-
-	# make sure permissions are set
-	chmod -R o= ${D}/opt/firebird
-
-	# fix directories
-	find ${D}/opt/firebird -print -type d | xargs chmod o=rx
-
-	# set permissions for /bin
-	cd ${D}/opt/firebird/bin
-	chmod ug=rx,o= *
-	chmod a=rx isql qli gpre
-
-	use xinetd && chmod ug=rxs,o= ${D}/opt/firebird/bin/{fb_lock_mgr,gds_drop,fb_inet_server}
-	chmod u=rw,go=r ${D}/opt/firebird/{aliases.conf,firebird.conf}
-	chmod ug=rw,o= ${D}/opt/firebird/{security.fdb,help/help.fdb}
-
-	for i in include lib UDF intl; do chmod a=r ${D}/opt/firebird/${i}/*; done
-	chmod ug=rx,o= ${D}/opt/firebird/{intl/fbintl,UDF/fbudf.so,UDF/ib_udf.so}
-
-	local my_lib=$(get_libdir)
-
-	# firebird has a problem with lib64 dir name, bug?
-	if [ ${my_lib} == "lib64" ] ; then
-		# tmp fix since stable arch seems to install in lib, not lib64 as ~arch
-		if [ -d ${D}/opt/firebird/lib ]; then
-			mv ${D}/opt/firebird/lib ${D}/opt/firebird/lib64
-		fi
-		dosym /opt/firebird/lib64 /opt/firebird/lib
-	fi
-
-	# create links for back compatibility
-	dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so
-	dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so.0
-	dosym ./libfbclient.so /opt/firebird/${my_lib}/libgds.so
-	dosym ./libfbclient.so /opt/firebird/${my_lib}/libgds.so.0
-
-	# we want relative symlinks...
-	dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libfbclient.so
-	dosym ../../opt/firebird/${my_lib}/libfbclient.so.1 /usr/${my_lib}/libfbclient.so.1
-	dosym ../../opt/firebird/${my_lib}/libfbclient.so.1.5.4 /usr/${my_lib}/libfbclient.so.1.5.4
-
-	# move and link config files to /etc/firebird so they'll be protected
-	dodir /etc/firebird
-	mv ${D}/opt/firebird/{security.fdb,aliases.conf,firebird.conf} ${D}/etc/firebird
-	dosym ../../etc/firebird/security.fdb /opt/firebird/security.fdb
-	dosym ../../etc/firebird/aliases.conf /opt/firebird/aliases.conf
-	dosym ../../etc/firebird/firebird.conf /opt/firebird/firebird.conf
-
-	# Install docs
-	if use doc; then
-	    dodoc ${DISTDIR}/Firebird-1.5-QuickStart.pdf
-	    dodoc ${WORKDIR}/manuals/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "1. If haven't done so already, please run:"
-	elog
-	elog "   \"emerge --config =${PF}\""
-	elog
-	elog "   to create lockfiles, set permissions and more"
-	elog
-	elog "2. Firebird now runs with it's own user. Please remember to"
-	elog "   set permissions to firebird:firebird on databases you "
-	elog "   already have (if any)."
-	elog
-
-	if ! use xinetd
-	then
-		elog "3. You've built the stand alone deamon version,"
-		elog "   SuperServer. If you were using pre 1.5.0 ebuilds"
-		elog "   you're probably have one installed via xinetd. please"
-		elog "   remember to disable it (usually in /etc/xinetd.d/firebird),"
-		elog "   since the current one has it's own init script under"
-		elog "   /etc/init.d"
-	fi
-}
-
-pkg_config() {
-	cd /opt/firebird
-
-	# Create Lock files
-	for i in isc_init1 isc_lock1 isc_event1
-	do
-		FileName=$i.`hostname`
-		touch $FileName
-		chown firebird:firebird $FileName
-		chmod ug=rw,o= $FileName
-	done
-
-	# Create log
-	if [ ! -h firebird.log ]
-	then
-		if [ -f firebird.log ]
-		then
-			mv firebird.log /var/log
-		else
-			touch /var/log/firebird.log
-			chown firebird:firebird /var/log/firebird.log
-			chmod ug=rw,o= /var/log/firebird.log
-		fi
-
-		# symlink the log to /var/log
-		ln -s /var/log/firebird.log firebird.log
-	fi
-
-	# add gds_db to /etc/services
-	if [ -z "`grep gds_db  /etc/services`" ]
-	then
-		echo -e "#\n#Service added for gds_db (firebird)\n#" >> /etc/services
-		echo "gds_db		3050/tcp" >> /etc/services
-		einfo "added gds_db to /etc/services"
-	fi
-
-	# if found /etc/isc4.gdb from previous install, backup, and restore as
-	# /etc/security.fdb
-	if [ -f /etc/firebird/isc4.gdb ]
-	then
-		# if we have scurity.fdb already, back it 1st
-		if [ -f /etc/firebird/security.fdb ]
-		then
-			cp /etc/firebird/security.fdb /etc/firebird/security.fdb.old
-		fi
-		gbak -B /etc/firebird/isc4.gdb /etc/firebird/isc4.gbk
-		gbak -R /etc/firebird/isc4.gbk /etc/firebird/security.fdb
-		mv /etc/firebird/isc4.gdb /etc/firebird/isc4.gdb.old
-		rm /etc/firebird/isc4.gbk
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird /etc/firebird/{isc4.*,security.*}
-		chmod 660 /etc/firebird/{isc4.*,security.*}
-
-		elog
-		elog "Converted old isc4.gdb to security.fdb, isc4.gdb has been "
-		elog "renamed to isc4.gdb.old. if you had previous security.fdb, "
-		elog "it's backed to security.fdb.old (all under /etc/firebird)."
-		elog
-	fi
-
-	# we need to enable local access to the server
-	if [ ! -f /etc/hosts.equiv ]
-	then
-		touch /etc/hosts.equiv
-		chown root:0 /etc/hosts.equiv
-		chmod u=rw,go=r /etc/hosts.equiv
-	fi
-
-	if [ -z "`grep 'localhost$' /etc/hosts.equiv`" ]
-	then
-		echo "localhost" >> /etc/hosts.equiv
-		einfo "Added localhost to /etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if [ -z "`grep ${HS_NAME} /etc/hosts.equiv`" ]
-	then
-		echo "${HS_NAME}" >> /etc/hosts.equiv
-		einfo "Added ${HS_NAME} to /etc/hosts.equiv"
-	fi
-
-	elog "If you're using UDFs, please remember to move them"
-	elog "to /opt/firebird/UDF"
-}
diff --git a/dev-db/firebird/firebird-2.1.0.16780_beta2.ebuild b/dev-db/firebird/firebird-2.1.0.16780_beta2.ebuild
new file mode 100644
index 000000000000..7492221751f0
--- /dev/null
+++ b/dev-db/firebird/firebird-2.1.0.16780_beta2.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.16780_beta2.ebuild,v 1.1 2007/10/19 18:09:27 wltjr Exp $
+
+inherit flag-o-matic eutils autotools versionator
+
+#MY_P=Firebird-$(replace_version_separator 4 -)
+MY_P=Firebird-${PV/_b/-B}
+
+DESCRIPTION="A relational database offering many ANSI SQL-99 features"
+HOMEPAGE="http://firebird.sourceforge.net/"
+SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
+	 doc? (	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+
+LICENSE="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 )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup firebird 450
+	enewuser firebird 450 /bin/bash /usr/share/firebird firebird
+}
+
+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"
+
+	mkdir -p "${WORKDIR}/../etc" \
+		"${WORKDIR}/usr" \
+		"${WORKDIR}/var/log/firebird" \
+		"${WORKDIR}/var/run/firebird"
+	cd "${WORKDIR}/usr"; ln -s "${WORKDIR}/${MY_P}/gen/firebird/bin"
+	cd "${WORKDIR}/../etc"; ln -s "${WORKDIR}/${MY_P}/gen/firebird" firebird
+
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-deps-libs-paths.patch"
+
+	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/share/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"
+
+	insinto /usr/bin
+	dobin bin/*
+
+	insinto /usr/include
+	doins include/*
+
+	insinto /usr/lib
+	dolib.so lib/*.so*
+	dolib.a lib/*.a*
+
+	insinto /usr/share/firebird
+	doins *.msg
+
+	insinto /usr/share/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/share/firebird/UDF
+	doexe UDF/*.so
+
+	exeinto /usr/share/firebird/intl
+	doexe intl/*.so
+#	newexe intl/libfbintl.so fbintl
+
+	insinto /usr/share/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 "${S}/gen/install/misc/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
+	else
+		newinitd "${FILESDIR}/${PN}.init.d.2" ${PN}
+		newconfd "${FILESDIR}/firebird.conf.d.2" ${PN}
+		fperms 640 /etc/conf.d/firebird
+	fi
+	doenvd "${FILESDIR}/70${PN}"
+
+	# Install docs
+	use doc && dodoc "${WORKDIR}"/manuals/*
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*
+	fi
+}
+
+pkg_postinst() {
+	# Hack to fix ownership/perms
+	chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/share/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/share/firebird. Logs"
+	elog "are in /var/log/firebird, and lock files in /var/run/firebird"
+	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/share/firebird/UDF"
+}