Major changes, Firebird is no longer installed in opt :). Added paths patch. Took over as sole maintainer since I am doing all the work anyway ;)

(Portage version: 2.1.3.9)

13 files changed, 363 insertions, 427 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index ac998f6ff817..71186b737c38 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,18 @@
 # 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.72 2007/09/16 14:17:21 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.73 2007/09/21 02:15:03 wltjr Exp $
+
+*firebird-2.0.3.12981.0-r1 (21 Sep 2007)
+
+  21 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -files/firebird-2.0.1.12855.0-external-libs.patch,
+  -files/firebird-2.0.1.12855.0-make-deps.patch,
+  +files/firebird-2.0.3.12981.0-paths.patch, +files/firebird.conf.d.2,
+  +files/firebird.init.d.2, +files/firebird.xinetd.2, metadata.xml,
+  -firebird-2.0.1.12855.0-r4.ebuild, -firebird-2.0.1.12855.0-r5.ebuild,
+  +firebird-2.0.3.12981.0-r1.ebuild:
+  Major changes, Firebird is no longer installed in opt :). Added paths patch.
+  Took over as sole maintainer since I am doing all the work anyway ;)
 
   16 Sep 2007; Christoph Mende <angelos@gentoo.org>
   firebird-2.0.3.12981.0.ebuild:
diff --git a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r4 b/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r4
deleted file mode 100644
index 04a90efef089..000000000000
--- a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9f16b202478eb3b287f70c87f9482308 Firebird-2.0.1.12855-0.tar.bz2 12582690
-RMD160 abe8a59795c59f6fdccfe2fe6612b81b8373493f Firebird-2.0.1.12855-0.tar.bz2 12582690
-SHA256 4346471f7c302b5ecdb8440b3c329e3d1fd78483b948e9e7b94ef284c37cb86e Firebird-2.0.1.12855-0.tar.bz2 12582690
-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.0.1.12855.0-r5 b/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r5
deleted file mode 100644
index 04a90efef089..000000000000
--- a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9f16b202478eb3b287f70c87f9482308 Firebird-2.0.1.12855-0.tar.bz2 12582690
-RMD160 abe8a59795c59f6fdccfe2fe6612b81b8373493f Firebird-2.0.1.12855-0.tar.bz2 12582690
-SHA256 4346471f7c302b5ecdb8440b3c329e3d1fd78483b948e9e7b94ef284c37cb86e Firebird-2.0.1.12855-0.tar.bz2 12582690
-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.0.3.12981.0-r1 b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r1
new file mode 100644
index 000000000000..9d8d28d4fe6b
--- /dev/null
+++ b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r1
@@ -0,0 +1,6 @@
+MD5 9a28587a596a149eb01f006be1cb2ddb Firebird-2.0.3.12981-0.tar.bz2 12623689
+RMD160 6a1139b30a77070e6e74bdaebc5d9bdd52e32509 Firebird-2.0.3.12981-0.tar.bz2 12623689
+SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e Firebird-2.0.3.12981-0.tar.bz2 12623689
+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.0.1.12855.0-external-libs.patch b/dev-db/firebird/files/firebird-2.0.1.12855.0-external-libs.patch
deleted file mode 100644
index 3de90c0bc40d..000000000000
--- a/dev-db/firebird/files/firebird-2.0.1.12855.0-external-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: firebird-2.0.0.12748/builds/posix/Makefile.in.firebird
-===================================================================
---- firebird-2.0.0.12748.orig/builds/posix/Makefile.in.firebird
-+++ firebird-2.0.0.12748/builds/posix/Makefile.in.firebird
-@@ -186,10 +186,10 @@ $(GEN_ROOT)/Make.Version : $(SRC_ROOT)/m
- # 
- 
- external_libraries:
--	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
--ifeq ($(EDITLINE_FLG),Y)
--	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
--endif
-+#	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
-+#ifeq ($(EDITLINE_FLG),Y)
-+#	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
-+#endif
- 
- #---------------------------------------------------------------------------
- # Phase1: make a gpre_static from scratch so we can parse .e and .epp files
-Index: firebird-2.0.0.12748/configure.in
-===================================================================
---- firebird-2.0.0.12748.orig/configure.in
-+++ firebird-2.0.0.12748/configure.in
-@@ -445,7 +445,7 @@
-			AC_CHECK_LIB(termcap, tgetent, , \
-				AC_CHECK_LIB(tinfo, tgetent, , \
-					AC_MSG_ERROR(termcap support not found)))))  
--	AC_SUBST(EDITLINE_A, -leditline)
-+	AC_SUBST(EDITLINE_A, -ledit)
- fi
- AC_CHECK_LIB(stdc++, main,,, $LIBS)
- 
-Index: firebird-2.0.0.12748/builds/posix/make.rules
-===================================================================
---- firebird-2.0.0.12748.orig/builds/posix/make.rules
-+++ firebird-2.0.0.12748/builds/posix/make.rules
-@@ -33,7 +33,7 @@
- 
- 
- # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
--CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n -DNAMESPACE=Vulcan
-+CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
- 
- ifeq ($(IsProdTypeBuild),Y)
-   CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
diff --git a/dev-db/firebird/files/firebird-2.0.1.12855.0-make-deps.patch b/dev-db/firebird/files/firebird-2.0.1.12855.0-make-deps.patch
deleted file mode 100644
index 6369727aa0a7..000000000000
--- a/dev-db/firebird/files/firebird-2.0.1.12855.0-make-deps.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: firebird-2.0.0.12748/builds/posix/make.shared.targets
-===================================================================
---- firebird-2.0.0.12748.orig/builds/posix/make.shared.targets
-+++ firebird-2.0.0.12748/builds/posix/make.shared.targets
-@@ -57,7 +57,7 @@ $(SRC_ROOT)/dsql/parse.cpp: $(SRC_ROOT)/
- 
- # gpre_meta needs a special boot build since there is no database.
- 
--$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
-+$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
- 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
- 
- 
-Index: firebird-2.0.0.12748/builds/posix/make.rules
-===================================================================
---- firebird-2.0.0.12748.orig/builds/posix/make.rules
-+++ firebird-2.0.0.12748/builds/posix/make.rules
-@@ -103,19 +103,19 @@ DSQL_GPRE_FLAGS =  -lang_internal -r -m 
- 
- .SUFFIXES: .c .e .epp .cpp
- 
--.e.c:
-+.e.c: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
--.epp.cpp:
-+.epp.cpp: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
--$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp 
-+$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp  $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
- 
- 
--$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp 
-+$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp  $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(DSQL_GPRE_FLAGS) $< $@
- 
- 
diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-paths.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-paths.patch
new file mode 100644
index 000000000000..1e8624b1108b
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.0.3.12981.0-paths.patch
@@ -0,0 +1,230 @@
+diff -Naur Firebird-2.0.3.12981-0_orig/src/jrd/db_alias.cpp Firebird-2.0.3.12981-0/src/jrd/db_alias.cpp
+--- Firebird-2.0.3.12981-0_orig/src/jrd/db_alias.cpp	2007-09-19 21:00:33.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/jrd/db_alias.cpp	2007-09-20 19:26:44.000000000 -0400
+@@ -29,7 +29,7 @@
+ 
+ typedef Firebird::PathName string;
+ 
+-const char* ALIAS_FILE = "aliases.conf";
++const char* ALIAS_FILE = "../../../etc/firebird/aliases.conf";
+ 
+ bool ResolveDatabaseAlias(const string& alias, string& database)
+ {
+diff -Naur Firebird-2.0.3.12981-0_orig/src/jrd/file_params.h Firebird-2.0.3.12981-0/src/jrd/file_params.h
+--- Firebird-2.0.3.12981-0_orig/src/jrd/file_params.h	2007-09-19 21:00:33.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/jrd/file_params.h	2007-09-20 18:48:00.000000000 -0400
+@@ -38,17 +38,17 @@
+ 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* LOCK_HEADER	= "isc_config";
+-static const char* INIT_FILE	= "isc_init1";
+-static const char* GUARD_FILE	= "isc_guard1";
++static const char* EVENT_FILE	= "../../../var/run/firebird/isc_event1";
++static const char* LOCK_FILE	= "../../../var/run/firebird/isc_lock1.gbl";
++static const char* LOCK_HEADER	= "../../../var/run/firebird/isc_config";
++static const char* INIT_FILE	= "../../../var/run/firebird/isc_init1";
++static const char* GUARD_FILE	= "../../../var/run/firebird/isc_guard1";
+ #elif defined(SMALL_FILE_NAMES)
+-static const char* EVENT_FILE	= "isce1.%s";
+-static const char* LOCK_FILE	= "iscl1.%s";
+-static const char* LOCK_HEADER	= "isc_config";
+-static const char* INIT_FILE	= "isci1.%s";
+-static const char* GUARD_FILE	= "iscg1.%s";
++static const char* EVENT_FILE	= "../../../var/run/firebird/isce1.%s";
++static const char* LOCK_FILE	= "../../../var/run/firebird/iscl1.%s";
++static const char* LOCK_HEADER	= "../../../var/run/firebird/isc_config";
++static const char* INIT_FILE	= "../../../var/run/firebird/isci1.%s";
++static const char* GUARD_FILE	= "../../../var/run/firebird/iscg1.%s";
+ #elif defined(VMS)
+ static const char* EVENT_FILE	= "[000000]isc_event1.%s";
+ static const char* LOCK_FILE	= "[000000]isc_lock1.%s";
+@@ -62,11 +62,11 @@
+ static const char* INIT_FILE	= "%s.int";
+ static const char* GUARD_FILE	= "%s.grd";
+ #else
+-static const char* EVENT_FILE	= "isc_event1.%s";
+-static const char* LOCK_FILE	= "isc_lock1.%s";
+-static const char* LOCK_HEADER	= "isc_config";
+-static const char* INIT_FILE	= "isc_init1.%s";
+-static const char* GUARD_FILE	= "isc_guard1.%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* LOCK_HEADER	= "../../../var/run/firebird/isc_config";
++static const char* INIT_FILE	= "../../../var/run/firebird/isc_init1.%s";
++static const char* GUARD_FILE	= "../../../var/run/firebird/isc_guard1.%s";
+ #endif
+ 
+ #ifdef sun
+@@ -97,7 +97,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";
+ #define TEMP_PATTERN	"_XXXXXX"
+ #elif defined(WIN_NT)
+ static const char* WORKFILE		= "c:\\temp\\";
+@@ -139,7 +139,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";
+ #define TEMP_PATTERN	"_XXXXXX"
+ #endif
+ 
+diff -Naur Firebird-2.0.3.12981-0_orig/src/jrd/jrd_pwd.h Firebird-2.0.3.12981-0/src/jrd/jrd_pwd.h
+--- Firebird-2.0.3.12981-0_orig/src/jrd/jrd_pwd.h	2007-09-19 21:00:33.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/jrd/jrd_pwd.h	2007-09-20 18:48:18.000000000 -0400
+@@ -58,7 +58,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.0.3.12981-0_orig/src/jrd/os/config_root.h Firebird-2.0.3.12981-0/src/jrd/os/config_root.h
+--- Firebird-2.0.3.12981-0_orig/src/jrd/os/config_root.h	2007-09-19 21:00:33.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/jrd/os/config_root.h	2007-09-20 18:48:36.000000000 -0400
+@@ -32,7 +32,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.0.3.12981-0_orig/src/jrd/svc.cpp Firebird-2.0.3.12981-0/src/jrd/svc.cpp
+--- Firebird-2.0.3.12981-0_orig/src/jrd/svc.cpp	2007-09-19 21:00:33.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/jrd/svc.cpp	2007-09-20 19:34:33.000000000 -0400
+@@ -366,38 +366,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.0.3.12981-0_orig/src/utilities/fbcpl/fbdialog.cpp Firebird-2.0.3.12981-0/src/utilities/fbcpl/fbdialog.cpp
+--- Firebird-2.0.3.12981-0_orig/src/utilities/fbcpl/fbdialog.cpp	2007-09-19 21:00:33.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/utilities/fbcpl/fbdialog.cpp	2007-09-20 18:49:23.000000000 -0400
+@@ -1335,7 +1335,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.0.3.12981-0_orig/src/utilities/gsec/security.epp Firebird-2.0.3.12981-0/src/utilities/gsec/security.epp
+--- Firebird-2.0.3.12981-0_orig/src/utilities/gsec/security.epp	2007-09-19 21:00:34.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/utilities/gsec/security.epp	2007-09-20 18:49:55.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.0.3.12981-0_orig/src/utilities/guard/guard.cpp Firebird-2.0.3.12981-0/src/utilities/guard/guard.cpp
+--- Firebird-2.0.3.12981-0_orig/src/utilities/guard/guard.cpp	2007-09-19 21:00:34.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/utilities/guard/guard.cpp	2007-09-20 19:33:31.000000000 -0400
+@@ -51,7 +51,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.0.3.12981-0_orig/src/utilities/ibmgr/ibmgr.h Firebird-2.0.3.12981-0/src/utilities/ibmgr/ibmgr.h
+--- Firebird-2.0.3.12981-0_orig/src/utilities/ibmgr/ibmgr.h	2007-09-19 21:00:34.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/utilities/ibmgr/ibmgr.h	2007-09-20 19:33:06.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.0.3.12981-0_orig/src/utilities/ibmgr/srvrmgr.cpp Firebird-2.0.3.12981-0/src/utilities/ibmgr/srvrmgr.cpp
+--- Firebird-2.0.3.12981-0_orig/src/utilities/ibmgr/srvrmgr.cpp	2007-09-19 21:00:34.000000000 -0400
++++ Firebird-2.0.3.12981-0/src/utilities/ibmgr/srvrmgr.cpp	2007-09-19 21:29:15.000000000 -0400
+@@ -271,7 +271,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/files/firebird.conf.d.2 b/dev-db/firebird/files/firebird.conf.d.2
new file mode 100644
index 000000000000..b386f60bd8aa
--- /dev/null
+++ b/dev-db/firebird/files/firebird.conf.d.2
@@ -0,0 +1,4 @@
+ISC_USER=SYSDBA
+ISC_PASSWORD=masterke
+FIREBIRD=/usr/share/firebird
+FBRunUser=firebird
diff --git a/dev-db/firebird/files/firebird.init.d.2 b/dev-db/firebird/files/firebird.init.d.2
new file mode 100644
index 000000000000..0bedf82511c1
--- /dev/null
+++ b/dev-db/firebird/files/firebird.init.d.2
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+# Copyright 1999-2004 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,v 1.1 2007/09/21 02:15:04 wltjr Exp $
+
+ 
+#  NOTE: make sure you have localhost in your hosts.equiv file see next 2 
+#  lines for example of hosts.equiv contents
+#localhost.localdomain
+#localhost
+
+
+export FIREBIRD
+export ISC_USER
+export ISC_PASSWORD
+export FBRunUser
+MANAGER=/usr/bin/fbmgr.bin
+
+depend() {
+	need net
+}
+
+start(){
+	ebegin "Starting Firebird server"
+	su $FBRunUser -c "${MANAGER} -start -forever"
+	eend $?
+}
+
+stop(){
+	ebegin "Stopping Firebird server"
+	$MANAGER -shut
+	eend $?
+}
diff --git a/dev-db/firebird/files/firebird.xinetd.2 b/dev-db/firebird/files/firebird.xinetd.2
new file mode 100644
index 000000000000..01fc102ee3a8
--- /dev/null
+++ b/dev-db/firebird/files/firebird.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.0.1.12855.0-r4.ebuild b/dev-db/firebird/firebird-2.0.1.12855.0-r4.ebuild
deleted file mode 100644
index c05c10554caa..000000000000
--- a/dev-db/firebird/firebird-2.0.1.12855.0-r4.ebuild
+++ /dev/null
@@ -1,248 +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-2.0.1.12855.0-r4.ebuild,v 1.4 2007/07/13 06:38:59 mr_bones_ Exp $
-
-inherit flag-o-matic eutils autotools versionator
-
-MY_P=Firebird-$(replace_version_separator 4 -)
-
-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 /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"
-
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-external-libs.patch"
-	epatch "${FILESDIR}/${P}-make-deps.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=/opt/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"
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*
-	fi
-
-	into /opt/firebird
-	dobin bin/*
-	dolib.so lib/*.so*
-	dolib.a lib/*.a*
-
-	insinto /opt/firebird
-	doins *.msg
-
-	rm -rf "${D}"/opt/firebird/bin/*.sh
-	dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-
-	insinto /opt/firebird/include
-	doins include/*
-
-	insinto /opt/firebird/help
-	doins help/help.fdb
-
-	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 /opt/firebird/UDF
-	doexe UDF/*.so
-	exeinto /opt/firebird/intl
-	doexe intl/*.so
-	newexe intl/libfbintl.so fbintl
-
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/firebird
-	dodir /var/run/firebird
-	keepdir /var/log/firebird
-	keepdir /var/run/firebird
-
-	touch "${D}"/var/log/firebird/firebird.log
-	chown firebird:firebird "${D}"/var/log/firebird/firebird.log
-
-	# create links for split config & log file
-	dosym /etc/firebird/aliases.conf /opt/firebird/aliases.conf
-	dosym /etc/firebird/security2.fdb /opt/firebird/security2.fdb
-	dosym /etc/firebird/firebird.conf /opt/firebird/firebird.conf
-	dosym /etc/firebird/fbintl.conf /opt/firebird/intl/fbintl.conf
-	dosym /var/log/firebird/firebird.log /opt/firebird/firebird.log
-
-	local my_lib=$(get_libdir)
-
-	# firebird has a problem with lib64 dir name, bug?
-	if [ ${my_lib} == "lib64" ] ; then
-		dosym ./lib64 /opt/firebird/lib
-	fi
-
-	# create links for backwards compatibility dosym puts link in / :(
-	cd "${D}/opt/firebird/${my_lib}/"
-	ln -s libfbclient.so libgds.so
-	ln -s libfbclient.so libgds.so.0
-	ln -s libfbclient.so libfbclient.so.1
-
-	# create system links for ld
-	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 ../../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.2 /usr/${my_lib}/libfbclient.so.2
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${S}/gen/install/misc/${PN}.xinetd" "${PN}" || die "newins xinetd file failed"
-	else
-		newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-		newconfd "${FILESDIR}/firebird.conf.d" ${PN}
-		fperms 640 /etc/conf.d/firebird
-	fi
-	doenvd "${FILESDIR}/70${PN}"
-
-	# Install docs
-	use doc && dodoc "${WORKDIR}"/manuals/*
-}
-
-pkg_postinst() {
-	# Hack to fix ownership/perms
-	chown -fR firebird:firebird /etc/firebird /opt/firebird
-	chmod 750 /etc/firebird
-
-	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
-
-	# if found /etc/security.gdb from previous install, backup, and restore as
-	# /etc/security2.fdb
-	if [ -f /etc/firebird/security.gdb ]
-	then
-		# if we have scurity2.fdb already, back it 1st
-		if [ -f /etc/firebird/security2.fdb ]
-		then
-			cp /etc/firebird/security2.fdb /etc/firebird/security2.fdb.old
-		fi
-		gbak -B /etc/firebird/security.gdb /etc/firebird/security.gbk
-		gbak -R /etc/firebird/security.gbk /etc/firebird/security2.fdb
-		mv /etc/firebird/security.gdb /etc/firebird/security.gdb.old
-		rm /etc/firebird/security.gbk
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird /etc/firebird/{security.*,security2.*}
-		chmod 660 /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 /etc/firebird)."
-		einfo
-	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
-
-	# add 'localhost.localdomain' to the hosts.equiv file...
-	if grep -q 'localhost.localdomain$' /etc/hosts.equiv 2>/dev/null; then
-		echo "localhost.localdomain" >> /etc/hosts.equiv
-		einfo "Added localhost.localdomain to /etc/hosts.equiv"
-	fi
-
-	# add 'localhost' to the hosts.equiv file...
-	if grep -q 'localhost$' /etc/hosts.equiv 2>/dev/null; then
-		echo "localhost" >> /etc/hosts.equiv
-		einfo "Added localhost to /etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if grep -q ${HS_NAME} /etc/hosts.equiv 2>/dev/null; then
-		echo "${HS_NAME}" >> /etc/hosts.equiv
-		einfo "Added ${HS_NAME} to /etc/hosts.equiv"
-	fi
-
-	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /opt/firebird/UDF"
-}
diff --git a/dev-db/firebird/firebird-2.0.1.12855.0-r5.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r1.ebuild
index c47d48fca522..8b7ce35bebc7 100644
--- a/dev-db/firebird/firebird-2.0.1.12855.0-r5.ebuild
+++ b/dev-db/firebird/firebird-2.0.3.12981.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.0.1.12855.0-r5.ebuild,v 1.2 2007/07/13 06:38:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r1.ebuild,v 1.1 2007/09/21 02:15:03 wltjr Exp $
 
 inherit flag-o-matic eutils autotools versionator
 
@@ -8,8 +8,9 @@ MY_P=Firebird-$(replace_version_separator 4 -)
 
 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 )"
+#SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
+SRC_URI="http://www.firebirdsql.org/download/prerelease/source/${MY_P}.tar.bz2
+	 doc? (	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
 
 LICENSE="Interbase-1.0"
 SLOT="0"
@@ -28,7 +29,7 @@ S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /opt/firebird firebird
+	enewuser firebird 450 /bin/bash /usr/share/firebird firebird
 }
 
 src_unpack() {
@@ -42,13 +43,23 @@ src_unpack() {
 
 	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}-external-libs.patch"
 	epatch "${FILESDIR}/${P}-make-deps.patch"
+	epatch "${FILESDIR}/${P}-paths.patch"
+
 	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
 	rm -rf "${S}"/extern/{editline,icu}
 
+
 	eautoreconf
 }
 
@@ -57,7 +68,7 @@ src_compile() {
 	filter-mfpmath sse
 
 	econf \
-		--prefix=/opt/firebird --with-editline \
+		--prefix=/usr/share/firebird --with-editline \
 		$(use_enable !xinetd superserver) \
 		$(use_enable debug) \
 		${myconf} || die "econf failed"
@@ -72,24 +83,28 @@ src_install() {
 		dodoc examples/*
 	fi
 
-	into /opt/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 /opt/firebird
+	insinto /usr/share/firebird
 	doins *.msg
 
-	rm -rf "${D}"/opt/firebird/bin/*.sh
-	dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-
-	insinto /opt/firebird/include
-	doins include/*
-
-	insinto /opt/firebird/help
+	insinto /usr/share/firebird/help
 	doins help/help.fdb
 
-	insinto /opt/firebird/upgrade
+	insinto /usr/share/firebird/upgrade
 	doins "${S}"/src/misc/upgrade/v2/*
 
 	insinto /etc/firebird
@@ -99,9 +114,10 @@ src_install() {
 	insopts -m0660 -o firebird -g firebird
 	doins security2.fdb
 
-	exeinto /opt/firebird/UDF
+	exeinto /usr/share/firebird/UDF
 	doexe UDF/*.so
-	exeinto /opt/firebird/intl
+
+	exeinto /usr/share/firebird/intl
 	doexe intl/*.so
 	newexe intl/libfbintl.so fbintl
 
@@ -111,42 +127,18 @@ src_install() {
 	keepdir /var/log/firebird
 	keepdir /var/run/firebird
 
-	touch "${D}"/var/log/firebird/firebird.log
-	chown firebird:firebird "${D}"/var/log/firebird/firebird.log
-
-	# create links for split config & log file
-	dosym /etc/firebird/aliases.conf /opt/firebird/aliases.conf
-	dosym /etc/firebird/security2.fdb /opt/firebird/security2.fdb
-	dosym /etc/firebird/firebird.conf /opt/firebird/firebird.conf
-	dosym /etc/firebird/fbintl.conf /opt/firebird/intl/fbintl.conf
-	dosym /var/log/firebird/firebird.log /opt/firebird/firebird.log
-
-	local my_lib=$(get_libdir)
-
-	# firebird has a problem with lib64 dir name, bug?
-	if [ ${my_lib} == "lib64" ] ; then
-		dosym ./lib64 /opt/firebird/lib
-	fi
-
-	# create links for backwards compatibility dosym puts link in / :(
-	cd "${D}/opt/firebird/${my_lib}/"
+	# 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
 
-	# create system links for ld
-	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 ../../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.2 /usr/${my_lib}/libfbclient.so.2
-
 	if use xinetd ; then
 		insinto /etc/xinetd.d
-		newins "${S}/gen/install/misc/${PN}.xinetd" "${PN}" || die "newins xinetd file failed"
+		newins "${S}/gen/install/misc/${PN}.xinetd.2" "${PN}" || die "newins xinetd file failed"
 	else
-		newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-		newconfd "${FILESDIR}/firebird.conf.d" ${PN}
+		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}"
@@ -157,43 +149,41 @@ src_install() {
 
 pkg_postinst() {
 	# Hack to fix ownership/perms
-	chown -fR firebird:firebird /etc/firebird /opt/firebird
+	chown -fR firebird:firebird /etc/firebird /usr/share/firebird
 	chmod 750 /etc/firebird
 
 	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 "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
 
-	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
+#	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
+	cd /usr/share/firebird
 
 	# if found /etc/security.gdb from previous install, backup, and restore as
 	# /etc/security2.fdb
@@ -245,5 +235,5 @@ pkg_config() {
 	fi
 
 	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /opt/firebird/UDF"
+	einfo "to /usr/share/firebird/UDF"
 }
diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index 6398955923bd..29bc6a792b7b 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -5,10 +5,6 @@
 	<herd>no-herd</herd>
 
 	<maintainer>
-		<email>drizzt@gentoo.org</email>
-	</maintainer>
-
-	<maintainer>
 		<email>wltjr@gentoo.org</email>
 	</maintainer>