Added patch for custom flags vs default hard coded, thanks to cla there :). Removed past 2.1 beta version.

Package-Manager: portage-2.1.3.17

8 files changed, 291 insertions, 28 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 392670231129..4369a9ed2ad8 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.77 2007/11/06 02:15:33 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.78 2007/11/06 04:49:39 wltjr Exp $
+
+*firebird-2.1.0.16780_beta2-r1 (06 Nov 2007)
+*firebird-2.0.3.12981.0-r3 (06 Nov 2007)
+
+  06 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/firebird-2.0.3.12981.0-flags.patch,
+  +files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch,
+  -files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch,
+  +firebird-2.0.3.12981.0-r3.ebuild, -firebird-2.1.0.16780_beta2.ebuild,
+  +firebird-2.1.0.16780_beta2-r1.ebuild:
+  Added patch for custom flags vs default hard coded, thanks to cla there :).
+  Removed past 2.1 beta version.
 
   06 Nov 2007; Dawid Węgliński <cla@gentoo.org>
   firebird-2.0.3.12981.0-r2.ebuild:
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 67c90e230c55..ad7378a29bf5 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70firebird 50 RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 SHA1 71b414835ed7c66f94b2908b7793da817d3c4438 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03
 MD5 d3278f869be37481ddde143f5ee98c4a files/70firebird 50
 RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 files/70firebird 50
@@ -9,6 +6,10 @@ AUX firebird-2.0.3.12981.0-external-libs.patch 1891 RMD160 6450f96348d1736ff1101
 MD5 e10b40f875eb2d8f32b8547efb176ec0 files/firebird-2.0.3.12981.0-external-libs.patch 1891
 RMD160 6450f96348d1736ff1101d6bafe7b1057d221175 files/firebird-2.0.3.12981.0-external-libs.patch 1891
 SHA256 75697d2d0cdc4e1fa48a6714f1e8e47563e2d2ea7765ae8a56f533a3c7b865da files/firebird-2.0.3.12981.0-external-libs.patch 1891
+AUX firebird-2.0.3.12981.0-flags.patch 960 RMD160 9c75259b1fcd281a7c1e272bd209920cb434940a SHA1 250dcbc322a88b3c8c741ea6e58c637ddf44d066 SHA256 b3ad7f330fd22bcd3dd2189b91c0eb56af0215f2cfbc592e13d9596e9e841045
+MD5 ac0250065d867138cfcc31f14da4d622 files/firebird-2.0.3.12981.0-flags.patch 960
+RMD160 9c75259b1fcd281a7c1e272bd209920cb434940a files/firebird-2.0.3.12981.0-flags.patch 960
+SHA256 b3ad7f330fd22bcd3dd2189b91c0eb56af0215f2cfbc592e13d9596e9e841045 files/firebird-2.0.3.12981.0-flags.patch 960
 AUX firebird-2.0.3.12981.0-make-deps.patch 1369 RMD160 843f3fdf1469ca31ccbf14b0d90f10d240ade63b SHA1 05d6e9c3b3dd0ac8f0093307cc5e3a1313f4dcb8 SHA256 826f6d70b71ec8630a9520dacfade245cff14cd9c766ba5be0eeda204f4bc9fb
 MD5 e0ff4a56391f46b0ee3f8ab2faaafe6a files/firebird-2.0.3.12981.0-make-deps.patch 1369
 RMD160 843f3fdf1469ca31ccbf14b0d90f10d240ade63b files/firebird-2.0.3.12981.0-make-deps.patch 1369
@@ -17,10 +18,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-2.1.0.16780_beta2-deps-flags-libs-paths.patch 17962 RMD160 28d046de85e52928da6161732c6a001d29071a34 SHA1 0974f9f245a79dfed5b3aa188a24aeacca576bc8 SHA256 8816b5f8ca4589300f2ede5b3e60b56aa637632fc0b3c5cbfadbd9339519e4da
+MD5 f4755ea906b3af04402de78a6bc3981a files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch 17962
+RMD160 28d046de85e52928da6161732c6a001d29071a34 files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch 17962
+SHA256 8816b5f8ca4589300f2ede5b3e60b56aa637632fc0b3c5cbfadbd9339519e4da files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch 17962
 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
@@ -52,18 +53,22 @@ EBUILD firebird-2.0.3.12981.0-r2.ebuild 6094 RMD160 4d3664eee5752494a32f5f7b35b2
 MD5 644333a80857450b0d750d8ed84bda42 firebird-2.0.3.12981.0-r2.ebuild 6094
 RMD160 4d3664eee5752494a32f5f7b35b20f6c2b252995 firebird-2.0.3.12981.0-r2.ebuild 6094
 SHA256 5bf1913e54788727db1adccbe0b812477c6e1fefeb44bdfe497c7583db6ffb86 firebird-2.0.3.12981.0-r2.ebuild 6094
+EBUILD firebird-2.0.3.12981.0-r3.ebuild 6136 RMD160 7217a27f0364917589a48fad64d64f718a904f8e SHA1 d51b9b3d6942954fab5c4f51159e4e389047efd9 SHA256 97915c5217d10ee8d4ad8b336680e5c812e805efb5149cbda21a1eff4c22b0f1
+MD5 3be4e89f8d5e0f09ba83935337839cf2 firebird-2.0.3.12981.0-r3.ebuild 6136
+RMD160 7217a27f0364917589a48fad64d64f718a904f8e firebird-2.0.3.12981.0-r3.ebuild 6136
+SHA256 97915c5217d10ee8d4ad8b336680e5c812e805efb5149cbda21a1eff4c22b0f1 firebird-2.0.3.12981.0-r3.ebuild 6136
 EBUILD firebird-2.0.3.12981.0.ebuild 7124 RMD160 1bdc2d6ac6d0cfe52e6b0f84325b1b6a6876880c SHA1 56323977522ceae064b4ad5e375e0571cfae441d SHA256 9dbccfc1d0cb64efccf1cb6d308fba01c4fdf973816bb961b873f5b0f3115684
 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
-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 14260 RMD160 016339708da8be4f03f525d551f3758fe60dfbff SHA1 c048d29e62ea255f80b083b0642a87ab420b7246 SHA256 baa6b7de44a82d569935ba59660f91f3d2b122f5253c1c71510830eac1c3098d
-MD5 409583c7fe5d066b4767172d88c4d870 ChangeLog 14260
-RMD160 016339708da8be4f03f525d551f3758fe60dfbff ChangeLog 14260
-SHA256 baa6b7de44a82d569935ba59660f91f3d2b122f5253c1c71510830eac1c3098d ChangeLog 14260
+EBUILD firebird-2.1.0.16780_beta2-r1.ebuild 6054 RMD160 029c8709cc50b603b4c07072aefc53007bfba12d SHA1 61b38bdafec94456e8975a53061aba8822168964 SHA256 af52ec4375efe7a6d0c31c9294914a85b0561c56709b01e916ba3051d0325433
+MD5 60c9f877954eccb3868ef9d8c6dff0ed firebird-2.1.0.16780_beta2-r1.ebuild 6054
+RMD160 029c8709cc50b603b4c07072aefc53007bfba12d firebird-2.1.0.16780_beta2-r1.ebuild 6054
+SHA256 af52ec4375efe7a6d0c31c9294914a85b0561c56709b01e916ba3051d0325433 firebird-2.1.0.16780_beta2-r1.ebuild 6054
+MISC ChangeLog 14801 RMD160 908e72b1f864913895c9ccc1c9c07bdc99a77bfb SHA1 f914ee7f0a524e8ab3602291e597e6ac54437cc4 SHA256 a6230d5ba9b0e5ba9f620695969522a1b1f54f59700f4aca316b7cc51fad1865
+MD5 60805745e3f788d6339a47b9659de66b ChangeLog 14801
+RMD160 908e72b1f864913895c9ccc1c9c07bdc99a77bfb ChangeLog 14801
+SHA256 a6230d5ba9b0e5ba9f620695969522a1b1f54f59700f4aca316b7cc51fad1865 ChangeLog 14801
 MISC metadata.xml 611 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 SHA1 ce284a4db1ea6aa20a3824fb0c5730385659f84c SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63
 MD5 bf38ebc9198cc6b2bfc486bc9328c943 metadata.xml 611
 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 metadata.xml 611
@@ -74,13 +79,9 @@ SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/di
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFHL85eUPEOwClectkRAo4mAJ9HF8t5YVVgkg05ri3p1crGXlyBNwCbBIY/
-2sk4rso3fnpoXgRmIOAODrU=
-=wTOy
------END PGP SIGNATURE-----
+MD5 693fad7757fc0c2e66f358e8703ef309 files/digest-firebird-2.0.3.12981.0-r3 506
+RMD160 b0ba0f24dd612555f7ce7b7858fc6456448dbe78 files/digest-firebird-2.0.3.12981.0-r3 506
+SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/digest-firebird-2.0.3.12981.0-r3 506
+MD5 e0a12cb514870a26e879ca8125320723 files/digest-firebird-2.1.0.16780_beta2-r1 518
+RMD160 921fd99f434236240864e3479fa05aa8b68b21eb files/digest-firebird-2.1.0.16780_beta2-r1 518
+SHA256 0f053ca3649de2329b0046f598693ebad94b81a9bfeff34a190db93778aaf01b files/digest-firebird-2.1.0.16780_beta2-r1 518
diff --git a/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r3 b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r3
new file mode 100644
index 000000000000..9d8d28d4fe6b
--- /dev/null
+++ b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r3
@@ -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/digest-firebird-2.1.0.16780_beta2 b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r1
index f63a1165d43f..f63a1165d43f 100644
--- a/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2
+++ b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r1
diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch
new file mode 100644
index 000000000000..c1cc28edab90
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch
@@ -0,0 +1,12 @@
+diff -Naur Firebird-2.0.3.12981-0_orig/builds/posix/prefix.linux Firebird-2.0.3.12981-0/builds/posix/prefix.linux
+--- Firebird-2.0.3.12981-0_orig/builds/posix/prefix.linux	2007-11-05 21:07:48.000000000 -0500
++++ Firebird-2.0.3.12981-0/builds/posix/prefix.linux	2007-11-05 21:23:36.000000000 -0500
+@@ -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
+ 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 --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-flags-libs-paths.patch
index 62319ecb08be..de9459cc797f 100644
--- 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-flags-libs-paths.patch
@@ -96,6 +96,23 @@ diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets Fire
  	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
  
  
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux
+--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux	2007-10-19 11:11:36.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux	2007-11-05 21:31:20.000000000 -0500
+@@ -21,11 +21,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 -DFB_SEND_FLAGS=MSG_NOSIGNAL -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.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
diff --git a/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild
new file mode 100644
index 000000000000..e3b12ee9b925
--- /dev/null
+++ b/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild
@@ -0,0 +1,215 @@
+# 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.3.12981.0-r3.ebuild,v 1.1 2007/11/06 04:49:39 wltjr 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 /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}-flags.patch"
+	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
+}
+
+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"
+}
diff --git a/dev-db/firebird/firebird-2.1.0.16780_beta2.ebuild b/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild
index 7492221751f0..832fb624ade3 100644
--- a/dev-db/firebird/firebird-2.1.0.16780_beta2.ebuild
+++ b/dev-db/firebird/firebird-2.1.0.16780_beta2-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.1.0.16780_beta2.ebuild,v 1.1 2007/10/19 18:09:27 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild,v 1.1 2007/11/06 04:49:39 wltjr Exp $
 
 inherit flag-o-matic eutils autotools versionator
 
@@ -52,7 +52,7 @@ src_unpack() {
 
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-deps-libs-paths.patch"
+	epatch "${FILESDIR}/${P}-deps-flags-libs-paths.patch"
 
 	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
 	rm -rf "${S}"/extern/{editline,icu}