Bump to 2.1.2, mostly fixes #264955. Thanks to Vladimir, John W. Higgins and all the testers in the bug.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 425 insertions, 2 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index c9c3df228b7d..2327696c64a1 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/firebird
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.98 2009/08/13 17:38:10 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.99 2009/09/17 19:55:01 patrick Exp $
+
+*firebird-2.1.2.18118.0 (17 Sep 2009)
+
+  17 Sep 2009; Patrick Lauer <patrick@gentoo.org>
+  +firebird-2.1.2.18118.0.ebuild,
+  +files/firebird-2.1.2.18118.0-deps-flags-libs.patch,
+  +files/firebird-2.1.2.18118.0-gcc-icu-declare.patch:
+  Bump to 2.1.2, mostly fixes #264955. Thanks to Vladimir, John W. Higgins
+  and all the testers in the bug.
 
   13 Aug 2009; Víctor Ostorga <vostorga@gentoo.org>
   firebird-2.1.1.17910.0.ebuild,
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 0936d532295e..2f4ce15cb5c2 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -7,6 +7,8 @@ AUX firebird-2.0.3.12981.0-make-deps.patch 1369 RMD160 843f3fdf1469ca31ccbf14b0d
 AUX firebird-2.0.4.13130.1-deps-flags-libs.patch 4203 RMD160 161ab78880b17e2275c2efa76c656522eec8ae48 SHA1 8958d7ca6f394e18eef284e7676de3e6e977ad4d SHA256 3bb39901e22dff3350451c2e7953c71c988c7ec6be1e12386c410ca66644a499
 AUX firebird-2.1.1.17910.0-deps-flags-libs.patch 5002 RMD160 fdb35777355c4f438669d53263d431699f6fccf5 SHA1 270fd5991d10e8c61f08d2b1b92688ac6a88f6d3 SHA256 604a7274b38baa48a8e74b7a267ae61d858bf2b8047028432c8936f44c76014a
 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.conf.d 73 RMD160 3ed3f866ee37d8e99b5dd32132ae78889ddeef66 SHA1 a5f9ef1b7c1186feecdf7574cacca6b589c8029f SHA256 7c430ddf7aa8fdf6b68ef88e44ad0d7d546469f6fdc156bdc340fffefa85408c
 AUX firebird.conf.d.2 105 RMD160 a047ffded75ed5f055949993fd794941eee8fe25 SHA1 d10907676a706bdecae27321861ccd0e89bc7993 SHA256 032e26a957572718c3fb9ffbb1a83fac16a00cd41a027732e8cfbbe0f1a2ab61
 AUX firebird.init.d 692 RMD160 fd32d3ca38f149df1c6c46697a9c043b22bf25dd SHA1 379f3dd8e768e958ab3faff203d0d7a502c8f120 SHA256 7602d5030abaa7414cbe10f3223c38861742807bbe92f9af5693d28520398f6e
@@ -14,10 +16,12 @@ AUX firebird.xinetd.2 199 RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 SHA1 1
 DIST Firebird-2.0.3.12981-0.tar.bz2 12623689 RMD160 6a1139b30a77070e6e74bdaebc5d9bdd52e32509 SHA1 8b6134ad1910ae0677e93c84279132f6c67e7862 SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e
 DIST Firebird-2.0.4.13130-1.tar.bz2 12679867 RMD160 997fcbd5d76ed11ce4f4ac9c1597bc72568ff5c6 SHA1 27af200f5c040ec084495693489d4ac71136c595 SHA256 e2e3bcdcc62f6dbdf0faecd4dd0d43ef41e94d731d485a9c4f0957f631b99bfa
 DIST Firebird-2.1.1.17910-0.tar.bz2 13457410 RMD160 ff4225438983a0c24da3a6b4df54de2cc40aac3f SHA1 122493f35b733b24047163f83724a6a271d4beb7 SHA256 6581286f57eba1494599cfb09a18e56970a45f03f2cd490a947e96874a57b645
+DIST Firebird-2.1.2.18118-0.tar.bz2 13485341 RMD160 37a35600092758715b4d1f82d728fa2e87f8c2de SHA1 1f2528af1804eb09f06f8cfa1d97b9643af181ef SHA256 91cb30a744c6d1e05a259ca97acc1f24d20e478ac37b7130e0675f209b3ec6e3
 DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d
 EBUILD firebird-2.0.3.12981.0-r6.ebuild 10003 RMD160 4858fcdca62966f8296c45710b2b70f3bf339428 SHA1 4fbcddb11d63ff3cf2779faf735530a216ed9159 SHA256 ca4c33a6577fa781b3f7c6ac6fb66874436d7ea85670f7d5fb8d9acaf932c8fd
 EBUILD firebird-2.0.3.12981.0-r7.ebuild 9973 RMD160 1fa0f590c57bdf79ae27c02203f10642b33cfae9 SHA1 b23a6f29d7df3a4299cf9dfe14cbaa4d4ca57212 SHA256 9b8a27a5590a141a1add117db155082cd4acad51b98600447850a92ab7e2c621
 EBUILD firebird-2.0.4.13130.1.ebuild 9796 RMD160 c326d22650d17fe8eb7415993dd591b2bfec8471 SHA1 887bcfdd22ac4ba7c21472a96b825df83c472173 SHA256 65f1c3398ee83f6bb134c9cad68a2f430bf0567360535835090ca0b41554ed17
 EBUILD firebird-2.1.1.17910.0.ebuild 10121 RMD160 56152a9d2b5160858ddf9d63fff172a30461eda5 SHA1 900683375ab92f08e4d9acc648732a52a1b86c39 SHA256 c5d463df2873b128997b938de31815c52bf519dc596c1b5a0d9d72817f782b61
-MISC ChangeLog 21475 RMD160 45b1ec1210137e5d8f22274505e7f000cc750843 SHA1 bf950c65bc1607bbd2f4e839994490aef58eb557 SHA256 7163f9f95e7a3557c900f0d5cc4f9de62fe02178b6e5ac1f68687d64cc73b5f2
+EBUILD firebird-2.1.2.18118.0.ebuild 10129 RMD160 0592b65219284dd19ce9d3820bb711c784cdeb0e SHA1 4fd0e247ee14b7408d2d634de85b8cd46fae48b7 SHA256 d1ab0c5bf4571dd657b4277eb447fcf4bfc03e054ffc4f926e860f325a25e2c2
+MISC ChangeLog 21817 RMD160 ad5d2927770d1eedf0ce9d8aa58a20907db2a8c6 SHA1 4637ba0417e9f842e255999343ea0bcba7fee52a SHA256 b5bbb5657bbe2d2cbfb84e54428bf8bd3f4c7d40aead51b36cbfafa87337793d
 MISC metadata.xml 619 RMD160 098761b0ad299b3c7bf0d3b59b9ebe2cf01cc145 SHA1 ef2a0fbd0a8b21692ae1a2a12e8b0ce7222fff9f SHA256 6b01dc565960c0345d81dafc9775196f4bc719eb925ea94c6b0a0c20e195e9e8
diff --git a/dev-db/firebird/files/firebird-2.1.2.18118.0-deps-flags-libs.patch b/dev-db/firebird/files/firebird-2.1.2.18118.0-deps-flags-libs.patch
new file mode 100644
index 000000000000..d324bd7c5c55
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.1.2.18118.0-deps-flags-libs.patch
@@ -0,0 +1,107 @@
+diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/Makefile.in.firebird Firebird-2.1.2.18118-0/builds/posix/Makefile.in.firebird
+--- Firebird-2.1.2.18118-0_orig/builds/posix/Makefile.in.firebird	2008-12-10 17:22:15.000000000 +0200
++++ Firebird-2.1.2.18118-0/builds/posix/Makefile.in.firebird	2009-05-20 15:13:47.673202327 +0300
+@@ -185,14 +185,7 @@
+ # 
+ 
+ external_libraries:
+-ifeq ($(STD_ICU),false)
+-	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
+-endif
+-ifeq ($(STD_EDITLINE),false)
+-ifeq ($(EDITLINE_FLG),Y)
+-	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
+-endif
+-endif
++
+ 
+ btyacc_binary: $(BTYACC)
+ 
+diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.defaults Firebird-2.1.2.18118-0/builds/posix/make.defaults
+--- Firebird-2.1.2.18118-0_orig/builds/posix/make.defaults	2008-09-04 14:47:18.000000000 +0300
++++ Firebird-2.1.2.18118-0/builds/posix/make.defaults	2009-05-20 15:15:31.088202976 +0300
+@@ -232,11 +232,7 @@
+ LIBFBSTATIC_A = $(LIB)/libfbstatic.a
+ 
+ ifeq ($(EDITLINE_FLG),Y)
+-  ifeq ($(STD_EDITLINE), true)
+-	LIBEDITLINE := -leditline
+-  else
+-	LIBEDITLINE := $(LIB)/libeditline.a
+-  endif
++  LIBEDITLINE := -ledit
+ endif
+ 
+ LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \
+diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.rules Firebird-2.1.2.18118-0/builds/posix/make.rules
+--- Firebird-2.1.2.18118-0_orig/builds/posix/make.rules	2008-12-10 03:03:31.000000000 +0200
++++ Firebird-2.1.2.18118-0/builds/posix/make.rules	2009-05-20 15:21:04.114225351 +0300
+@@ -33,9 +33,6 @@
+ 
+ # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
+ CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
+-ifeq ($(STD_ICU),false)
+-  CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
+-endif
+ 
+ ifeq ($(IsProdTypeBuild),Y)
+   CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
+@@ -69,7 +66,7 @@
+ 
+ .SUFFIXES: .c .e .epp .cpp
+ 
+-.e.c:
++.e.c: $(GPRE_CURRENT)
+ 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
+ 
+ 
+diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.shared.targets Firebird-2.1.2.18118-0/builds/posix/make.shared.targets
+--- Firebird-2.1.2.18118-0_orig/builds/posix/make.shared.targets	2008-12-10 03:03:31.000000000 +0200
++++ Firebird-2.1.2.18118-0/builds/posix/make.shared.targets	2009-05-20 15:21:59.299203496 +0300
+@@ -49,7 +49,7 @@
+ 
+ # gpre_meta needs a special boot build since there is no database.
+ 
+-$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
++$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
+ 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
+ 
+ 
+diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/prefix.linux Firebird-2.1.2.18118-0/builds/posix/prefix.linux
+--- Firebird-2.1.2.18118-0_orig/builds/posix/prefix.linux	2007-05-03 14:24:50.000000000 +0300
++++ Firebird-2.1.2.18118-0/builds/posix/prefix.linux	2009-05-20 15:23:17.286523276 +0300
+@@ -20,12 +20,10 @@
+ 
+ # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
+ # you may remove it if engine is getting compiled with any other GCC version
+-
+-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
+-OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin
++COMMON_FLAGS=-ggdb -DLINUX -pipe -MMD -fPIC
+ WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
+ 
+-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS)
+ DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
+ #DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
+ 
+diff -Naur Firebird-2.1.2.18118-0_orig/configure Firebird-2.1.2.18118-0/configure
+--- Firebird-2.1.2.18118-0_orig/configure	2009-03-30 09:42:44.000000000 +0300
++++ Firebird-2.1.2.18118-0/configure	2009-05-20 15:26:30.856202564 +0300
+@@ -4027,13 +4027,13 @@
+ # not need editline in default libs, but need to test for its presence
+ saveLIBS=$LIBS
+ if test "$STD_EDITLINE" = "true"; then
+-  { echo "$as_me:$LINENO: checking for readline in -leditline" >&5
+-echo $ECHO_N "checking for readline in -leditline... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: checking for readline in -ledit" >&5
++echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_editline_readline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-leditline  $LIBS"
++LIBS="-ledit  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/dev-db/firebird/files/firebird-2.1.2.18118.0-gcc-icu-declare.patch b/dev-db/firebird/files/firebird-2.1.2.18118.0-gcc-icu-declare.patch
new file mode 100644
index 000000000000..1e0fc093668e
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.1.2.18118.0-gcc-icu-declare.patch
@@ -0,0 +1,27 @@
+--- src/common/classes/alloc.h.old	2009-07-09 13:04:14.000000000 +0200
++++ src/common/classes/alloc.h	2009-07-09 13:05:37.000000000 +0200
+@@ -48,6 +48,8 @@
+ 					   stdlib.h (EKU) */
+ #endif
+ 
++#include <new>
++
+ #ifdef _MSC_VER
+ #define THROW_BAD_ALLOC
+ #else
+@@ -448,15 +450,6 @@
+ 	);
+ }
+ 
+-inline void* operator new(size_t, void* ptr) throw() 
+-{
+-	return ptr;
+-}
+-inline void* operator new[](size_t, void* ptr) throw() 
+-{
+-	return ptr;
+-}
+-
+ inline void operator delete(void* mem) throw()
+ {
+ 	Firebird::MemoryPool::globalFree(mem);
diff --git a/dev-db/firebird/firebird-2.1.2.18118.0.ebuild b/dev-db/firebird/firebird-2.1.2.18118.0.ebuild
new file mode 100644
index 000000000000..0aa34d82a43a
--- /dev/null
+++ b/dev-db/firebird/firebird-2.1.2.18118.0.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.2.18118.0.ebuild,v 1.1 2009/09/17 19:55:01 patrick Exp $
+
+inherit flag-o-matic eutils autotools versionator
+
+MY_P=Firebird-$(replace_version_separator 4 -)
+#MY_P=Firebird-${PV/_rc/-ReleaseCandidate}
+
+DESCRIPTION="A relational database offering many ANSI SQL-99 features"
+HOMEPAGE="http://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="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 -ia64 ~x86"
+IUSE="doc xinetd examples debug"
+RESTRICT="userpriv"
+
+RDEPEND="dev-libs/libedit
+	dev-libs/icu"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )"
+RDEPEND="${RDEPEND}
+	xinetd? ( virtual/inetd )
+	!sys-cluster/ganglia"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup firebird 450
+	enewuser firebird 450 /bin/bash /usr/lib/firebird firebird
+}
+
+function check_sed() {
+	MSG="sed of $3, required $2 lines modified $1"
+	einfo "${MSG}"
+	[[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+	if use doc; then
+		# Unpack docs
+		mkdir "${WORKDIR}/manuals"
+		cd "${WORKDIR}/manuals"
+		unpack ib_b60_doc.zip
+		cd "${WORKDIR}"
+	fi
+
+	unpack "${MY_P}.tar.bz2"
+
+	# compile time relative path hacks, ew :(
+	mkdir -p "${WORKDIR}/../etc" \
+		"${WORKDIR}/usr" \
+		"${WORKDIR}/var/log/firebird" \
+		"${WORKDIR}/var/run/firebird"
+	cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin"
+	cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird
+
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-deps-flags-libs.patch"
+
+	einfo "Split up Firebird via relative path hacks"
+	# sed vs patch for portability and addtional location changes
+	# based on FIREBIRD=/usr/lib/firebird
+	check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \
+		src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line
+	check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \
+		-e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \
+		-e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \
+		-e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \
+		-e 's:"isc_monitor1:"../../../var/run/firebird/isc_monitor1:w /dev/stdout' \
+		-e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \
+		-e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
+		src/jrd/file_params.h | wc -l)" "12" "src/jrd/file_params.h" # 12 lines
+	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
+		src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line
+	check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
+		src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line
+	check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \
+		-e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \
+		-e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \
+		-e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \
+		-e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \
+		-e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \
+		-e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \
+		-e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \
+		-e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \
+		src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines
+	check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \
+		src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line
+	check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
+		src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line
+	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
+		src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line
+	check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \
+		src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line
+	check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \
+		src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line
+	check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \
+		src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line
+
+	# Rename references to isql to fbsql
+	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+		src/msgs/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines
+	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
+	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+		-e 's:ISQL :FBSQL :w /dev/stdout' \
+		src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.sql" # 4 lines
+	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+		-e 's:isql :fbsql :w /dev/stdout' \
+		-e 's:ISQL :FBSQL :w /dev/stdout' \
+		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
+
+    find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
+    rm -rf "${S}"/extern/{editline,icu}
+
+    epatch "${FILESDIR}/${P}-gcc-icu-declare.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+	filter-mfpmath sse
+
+	econf --prefix=/usr/lib/firebird --with-editline \
+		$(use_enable !xinetd superserver) \
+		$(use_enable debug) \
+		${myconf} || die "econf failed"
+	emake -j1 || die "error during make"
+}
+
+src_install() {
+	cd "${S}/gen/firebird"
+
+# Seems to be ignored?
+	insinto /usr/share/firebird/bin
+	dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
+	rm bin/*.sh || die "Could not remove *sh files"
+
+	einfo "Renaming isql -> fbsql"
+	mv bin/isql bin/fbsql
+
+	insinto /usr/bin
+	dobin bin/*
+
+	insinto /usr/include
+	doins include/*
+
+	insinto /usr/lib
+	dolib.so lib/*.so*
+	dolib.a lib/*.a*
+
+	insinto /usr/lib/firebird
+	doins *.msg
+
+	insinto /usr/lib/firebird/help
+	doins help/help.fdb
+
+	insinto /usr/share/firebird/upgrade
+	doins "${S}"/src/misc/upgrade/v2/*
+
+	insinto /etc/firebird
+	insopts -m0644 -o firebird -g firebird
+	doins misc/*
+	doins ../install/misc/aliases.conf
+	insopts -m0660 -o firebird -g firebird
+	doins security2.fdb
+
+	exeinto /usr/lib/firebird/UDF
+	doexe UDF/*.so
+
+	exeinto /usr/lib/firebird/intl
+	newexe intl/libfbintl.so fbintl.so
+
+	insinto /usr/lib/firebird/intl
+	doins ../install/misc/fbintl.conf
+
+	diropts -m 755 -o firebird -g firebird
+	dodir /var/log/firebird
+	dodir /var/run/firebird
+	keepdir /var/log/firebird
+	keepdir /var/run/firebird
+
+	# create links for backwards compatibility
+	cd "${D}/usr/lib"
+	ln -s libfbclient.so libgds.so
+	ln -s libfbclient.so libgds.so.0
+	ln -s libfbclient.so libfbclient.so.1
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
+	else
+		newinitd "${FILESDIR}/${PN}.init.d" ${PN}
+		newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
+		fperms 640 /etc/conf.d/${PN}
+	fi
+
+	# Install docs
+	use doc && dodoc "${WORKDIR}"/manuals/*
+	use examples && docinto examples
+}
+
+pkg_postinst() {
+	# Hack to fix ownership/perms
+	chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/lib/firebird"
+	chmod 750 "${ROOT}/etc/firebird"
+
+	elog
+	elog "Firebird is no longer installed in /opt. Binaries are in"
+	elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
+	elog "are in /var/log/firebird, and lock files in /var/run/firebird"
+	elog "The command line tool isql has been renamed to fbsql."
+	elog "Please report any problems or issues to bugs.gentoo.org."
+	elog
+}
+
+pkg_config() {
+	# if found /etc/security.gdb from previous install, backup, and restore as
+	# /etc/security2.fdb
+	if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
+		# if we have scurity2.fdb already, back it 1st
+		if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
+			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
+		fi
+		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
+		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
+		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
+		rm "${ROOT}/etc/firebird/security.gbk"
+
+		# make sure they are readable only to firebird
+		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
+		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
+
+		einfo
+		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
+		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
+		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
+		einfo
+	fi
+
+	# we need to enable local access to the server
+	if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
+		touch "${ROOT}/etc/hosts.equiv"
+		chown root:0 "${ROOT}/etc/hosts.equiv"
+		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
+	fi
+
+	# add 'localhost.localdomain' to the hosts.equiv file...
+	if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
+		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
+		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
+	fi
+
+	# add 'localhost' to the hosts.equiv file...
+	if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
+		echo "localhost" >> "${ROOT}/etc/hosts.equiv"
+		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
+	fi
+
+	HS_NAME=`hostname`
+	if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
+		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
+		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
+	fi
+
+	einfo "If you're using UDFs, please remember to move them"
+	einfo "to /usr/lib/firebird/UDF"
+}