Bumped to latest releases, removed past version. Lastest 2.1.x version seems to have resolved the infamous bug #197664

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r4 x86_64

6 files changed, 378 insertions, 6 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 24076ba724cc..5c4ef64f6b69 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-db/firebird
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.94 2008/06/06 02:43:42 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.95 2008/07/23 22:29:18 wltjr Exp $
+
+*firebird-2.1.1.17910.0 (23 Jul 2008)
+*firebird-2.0.4.13130.1 (23 Jul 2008)
+
+  23 Jul 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/firebird-2.0.4.13130.1-deps-flags-libs.patch,
+  -files/firebird-2.1.0.17798.0-deps-flags-libs.patch,
+  +files/firebird-2.1.1.17910.0-deps-flags-libs.patch,
+  +firebird-2.0.4.13130.1.ebuild, -firebird-2.1.0.17798.0-r1.ebuild,
+  +firebird-2.1.1.17910.0.ebuild:
+  Bumped to latest releases, removed past version. Lastest 2.1.x version
+  seems to have resolved the infamous bug #197664
 
 *firebird-2.1.0.17798.0-r1 (06 Jun 2008)
 *firebird-2.0.3.12981.0-r7 (06 Jun 2008)
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 6d2491cbab77..06a2db3e744d 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -4,16 +4,19 @@ AUX firebird-2.0.3.12981.0-CVE-2008-0467.patch 16005 RMD160 2bfd332b7d551402a1c9
 AUX firebird-2.0.3.12981.0-external-libs.patch 1891 RMD160 6450f96348d1736ff1101d6bafe7b1057d221175 SHA1 b1ad1e60a538acd88cb9f7dcdea10e90459ed782 SHA256 75697d2d0cdc4e1fa48a6714f1e8e47563e2d2ea7765ae8a56f533a3c7b865da
 AUX firebird-2.0.3.12981.0-flags.patch 960 RMD160 9c75259b1fcd281a7c1e272bd209920cb434940a SHA1 250dcbc322a88b3c8c741ea6e58c637ddf44d066 SHA256 b3ad7f330fd22bcd3dd2189b91c0eb56af0215f2cfbc592e13d9596e9e841045
 AUX firebird-2.0.3.12981.0-make-deps.patch 1369 RMD160 843f3fdf1469ca31ccbf14b0d90f10d240ade63b SHA1 05d6e9c3b3dd0ac8f0093307cc5e3a1313f4dcb8 SHA256 826f6d70b71ec8630a9520dacfade245cff14cd9c766ba5be0eeda204f4bc9fb
-AUX firebird-2.1.0.17798.0-deps-flags-libs.patch 5002 RMD160 fdb35777355c4f438669d53263d431699f6fccf5 SHA1 270fd5991d10e8c61f08d2b1b92688ac6a88f6d3 SHA256 604a7274b38baa48a8e74b7a267ae61d858bf2b8047028432c8936f44c76014a
+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.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
 AUX firebird.xinetd.2 199 RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 SHA1 1186bbc61ecd17adeb598442d78abfaa3ac54194 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48
 DIST Firebird-2.0.3.12981-0.tar.bz2 12623689 RMD160 6a1139b30a77070e6e74bdaebc5d9bdd52e32509 SHA1 8b6134ad1910ae0677e93c84279132f6c67e7862 SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e
-DIST Firebird-2.1.0.17798-0.tar.bz2 13362044 RMD160 2900fc0d9d23f8d545eeb616638dcae9def0a2a5 SHA1 800263f90d81d59f4b6d3fc1ecc98d7976b52981 SHA256 eca35209fad317efae5e7048f82c4e4d12c7361182bb49657d60818beeb15e9e
+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 ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d
 EBUILD firebird-2.0.3.12981.0-r6.ebuild 9977 RMD160 8c673604232281e9e7f2b16d6fc2e54271d71df7 SHA1 e188059d197c157bec258a5d7c788703fb83cb92 SHA256 3364ef83eb54924e574d14e5e564062d3e441b80f549e35874827aedfb2c8b8d
 EBUILD firebird-2.0.3.12981.0-r7.ebuild 9947 RMD160 c025731ce46704b37376c7f510e00f7c06a6eb02 SHA1 b9c5e219573f50b6c1d8917432f9ab1c6ba144c1 SHA256 d6a500eca79f7a069e3d43ed410b09efed0e32a6fd2bca9da286074a34b1996c
-EBUILD firebird-2.1.0.17798.0-r1.ebuild 10049 RMD160 bbda7b31a3017fb50ffee6cbd6100d1662645124 SHA1 bdce1e1bb9062679fd0b25135062a64602dd5d72 SHA256 845ffa6c44745556eaeaa100dbe741c6d28b79a54bd6d3f617e030ab429b2fb7
-MISC ChangeLog 20278 RMD160 e59589d707cf75c3cbc86f51e1c08985cfc0b76f SHA1 52125e966445851ba8b6dc71e0de4f2aa7923bce SHA256 eddfae7a5b6088f61b2c38d0a7ff178b0ea56a915ac9b5210549fa6d9d8d3a2d
+EBUILD firebird-2.0.4.13130.1.ebuild 9770 RMD160 f11fa55a5e8cc11427fef603253faac6fc6f1391 SHA1 a10851c842d5a9e7f6a354958d281f641e03083f SHA256 e1d425c7063332d9d0cc6a3cbe0e28f4f31a23598ca49052fc65f492806b9e86
+EBUILD firebird-2.1.1.17910.0.ebuild 10046 RMD160 31bdc937a86f66a7b0de69da6c4d6fe3d5797650 SHA1 706d8b5d4ff3e1c3e6399902788c3c14b991f08d SHA256 eee1e2c2f4b144393f68042fd832ffc77658f396e6c4e89bc4e2032027540f07
+MISC ChangeLog 20804 RMD160 8b67886a505651883ef57e9a2063d1bc77a7e56f SHA1 3cbac1136fe56401cdbfd0c3f6fa591e56603a12 SHA256 df3d610f3295652f14c88e424185bd47f51fd20335877729bc8583dfcdee144d
 MISC metadata.xml 611 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 SHA1 ce284a4db1ea6aa20a3824fb0c5730385659f84c SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63
diff --git a/dev-db/firebird/files/firebird-2.0.4.13130.1-deps-flags-libs.patch b/dev-db/firebird/files/firebird-2.0.4.13130.1-deps-flags-libs.patch
new file mode 100644
index 000000000000..0c774a16c2e8
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.0.4.13130.1-deps-flags-libs.patch
@@ -0,0 +1,90 @@
+diff -Naur Firebird-2.0.4.13130-1_orig/builds/posix/Makefile.in.firebird Firebird-2.0.4.13130-1/builds/posix/Makefile.in.firebird
+--- Firebird-2.0.4.13130-1_orig/builds/posix/Makefile.in.firebird	2008-07-23 17:52:13.000000000 -0400
++++ Firebird-2.0.4.13130-1/builds/posix/Makefile.in.firebird	2008-07-23 17:57:05.000000000 -0400
+@@ -185,10 +185,10 @@
+ # 
+ 
+ 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
+diff -Naur Firebird-2.0.4.13130-1_orig/builds/posix/make.rules Firebird-2.0.4.13130-1/builds/posix/make.rules
+--- Firebird-2.0.4.13130-1_orig/builds/posix/make.rules	2008-07-23 17:52:13.000000000 -0400
++++ Firebird-2.0.4.13130-1/builds/posix/make.rules	2008-07-23 17:59:22.000000000 -0400
+@@ -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
+@@ -88,19 +88,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.0.4.13130-1_orig/builds/posix/make.shared.targets Firebird-2.0.4.13130-1/builds/posix/make.shared.targets
+--- Firebird-2.0.4.13130-1_orig/builds/posix/make.shared.targets	2008-07-23 17:52:13.000000000 -0400
++++ Firebird-2.0.4.13130-1/builds/posix/make.shared.targets	2008-07-23 17:54:26.000000000 -0400
+@@ -57,7 +57,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.0.4.13130-1_orig/builds/posix/prefix.linux Firebird-2.0.4.13130-1/builds/posix/prefix.linux
+--- Firebird-2.0.4.13130-1_orig/builds/posix/prefix.linux	2008-07-23 17:52:13.000000000 -0400
++++ Firebird-2.0.4.13130-1/builds/posix/prefix.linux	2008-07-23 17:53:32.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ # -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
+-PROD_FLAGS=-ggdb -O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin -DNDEBUG -DLINUX -pipe -MMD -fPIC -fmessage-length=0
++PROD_FLAGS=-ggdb -DNDEBUG -DLINUX -pipe -MMD -fPIC -fmessage-length=0
+ DEV_FLAGS=-DUSE_VALGRIND -ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
+ #DEV_FLAGS=-ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
+ 
+diff -Naur Firebird-2.0.4.13130-1_orig/configure.in Firebird-2.0.4.13130-1/configure.in
+--- Firebird-2.0.4.13130-1_orig/configure.in	2008-07-23 17:52:12.000000000 -0400
++++ Firebird-2.0.4.13130-1/configure.in	2008-07-23 17:57:56.000000000 -0400
+@@ -465,7 +465,7 @@
+ 			AC_CHECK_LIB(termcap, tgetent, TERMLIB=termcap, \
+ 				AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
+ 					AC_MSG_ERROR(termcap support not found)))))  
+-	AC_SUBST(EDITLINE_A, -leditline)
++	AC_SUBST(EDITLINE_A, -ledit)
+ 	AC_SUBST(TERMLIB)
+ 	XE_APPEND(-l$TERMLIB, LIBS)
+ fi
diff --git a/dev-db/firebird/files/firebird-2.1.0.17798.0-deps-flags-libs.patch b/dev-db/firebird/files/firebird-2.1.1.17910.0-deps-flags-libs.patch
index 8bcd3ca0dfd4..8bcd3ca0dfd4 100644
--- a/dev-db/firebird/files/firebird-2.1.0.17798.0-deps-flags-libs.patch
+++ b/dev-db/firebird/files/firebird-2.1.1.17910.0-deps-flags-libs.patch
diff --git a/dev-db/firebird/firebird-2.0.4.13130.1.ebuild b/dev-db/firebird/firebird-2.0.4.13130.1.ebuild
new file mode 100644
index 000000000000..d5529085cdde
--- /dev/null
+++ b/dev-db/firebird/firebird-2.0.4.13130.1.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.4.13130.1.ebuild,v 1.1 2008/07/23 22:29:18 wltjr Exp $
+
+inherit flag-o-matic eutils autotools versionator multilib
+
+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="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 )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup firebird 450
+	enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
+}
+
+function check_sed() {
+	MSG="sed of $3, required $2 lines modified $1"
+	einfo "${MSG}"
+	[[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+	if use doc; then
+		# Unpack docs
+		mkdir "${WORKDIR}/manuals"
+		cd "${WORKDIR}/manuals"
+		unpack ib_b60_doc.zip
+		cd "${WORKDIR}"
+	fi
+
+	unpack "${MY_P}.tar.bz2"
+
+	# 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_config:"../../../var/run/firebird/isc_config:w /dev/stdout' \
+		-e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1: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)" "14" "src/jrd/file_params.h" # 14 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' \
+		-e 's:ISQL :FBSQL :w /dev/stdout' \
+		src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.sql" # 4 lines
+
+	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
+	rm -rf "${S}"/extern/{editline,icu}
+
+	eautoreconf
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+	filter-mfpmath sse
+
+	econf --prefix=/usr/$(get_libdir)/firebird --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/$(get_libdir)
+	dolib.so lib/*.so*
+	dolib.a lib/*.a*
+
+	insinto /usr/$(get_libdir)/firebird
+	doins *.msg
+
+	insinto /usr/$(get_libdir)/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/$(get_libdir)/firebird/UDF
+	doexe UDF/*.so
+
+	exeinto /usr/$(get_libdir)/firebird/intl
+	newexe intl/libfbintl.so fbintl.so
+
+	insinto /usr/$(get_libdir)/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/$(get_libdir)"
+	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/$(get_libdir)/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"
+}
diff --git a/dev-db/firebird/firebird-2.1.0.17798.0-r1.ebuild b/dev-db/firebird/firebird-2.1.1.17910.0.ebuild
index 23d212d14797..fc8f90f649c6 100644
--- a/dev-db/firebird/firebird-2.1.0.17798.0-r1.ebuild
+++ b/dev-db/firebird/firebird-2.1.1.17910.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.17798.0-r1.ebuild,v 1.1 2008/06/06 02:43:42 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.1.17910.0.ebuild,v 1.1 2008/07/23 22:29:18 wltjr Exp $
 
 inherit flag-o-matic eutils autotools versionator