Old version and files cleanup. Installing upgrade sql script, and misc files now. Preparation for automated security.fdb -> security2.fdb via pkg_config

Package-Manager: portage-2.1.3_rc6

9 files changed, 289 insertions, 328 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 951f51fea654..7f385dabd2ac 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,15 @@
 # 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.65 2007/06/25 18:54:12 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.66 2007/07/01 19:05:23 wltjr Exp $
+
+*firebird-2.0.1.12855.0-r5 (01 Jul 2007)
+
+  01 Jul 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -files/firebird-1.5.0.xinetd, files/firebird.xinetd,
+  -firebird-1.5.4-r2.ebuild, firebird-1.5.4-r3.ebuild,
+  +firebird-2.0.1.12855.0-r5.ebuild:
+  Old version and files cleanup. Installing upgrade sql script, and misc files
+  now. Preparation for automated security.fdb -> security2.fdb via pkg_config
 
   25 Jun 2007; Christoph Mende <angelos@gentoo.org>
   firebird-2.0.1.12855.0-r4.ebuild:
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 89103d91837e..1c4be15626f9 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,14 +1,7 @@
------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
 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03 files/70firebird 50
-AUX firebird-1.5.0.xinetd 425 RMD160 df129f2e031ecd5ab885cb9a0c65a6c8d459a5f2 SHA1 c82ee25d92f89d0c2899a469cdda43851cafdddd SHA256 a8d918c64837a52d6a94650e9b39bc2279662adbad1e830767e5171a15efe6ce
-MD5 5b28cc81eff2c59fbee652dc2c6ed483 files/firebird-1.5.0.xinetd 425
-RMD160 df129f2e031ecd5ab885cb9a0c65a6c8d459a5f2 files/firebird-1.5.0.xinetd 425
-SHA256 a8d918c64837a52d6a94650e9b39bc2279662adbad1e830767e5171a15efe6ce files/firebird-1.5.0.xinetd 425
 AUX firebird-2.0.1.12855.0-external-libs.patch 1891 RMD160 6450f96348d1736ff1101d6bafe7b1057d221175 SHA1 b1ad1e60a538acd88cb9f7dcdea10e90459ed782 SHA256 75697d2d0cdc4e1fa48a6714f1e8e47563e2d2ea7765ae8a56f533a3c7b865da
 MD5 e10b40f875eb2d8f32b8547efb176ec0 files/firebird-2.0.1.12855.0-external-libs.patch 1891
 RMD160 6450f96348d1736ff1101d6bafe7b1057d221175 files/firebird-2.0.1.12855.0-external-libs.patch 1891
@@ -25,48 +18,41 @@ AUX firebird.init.d 697 RMD160 eb18c898dcb7d5e86906c7ad78f4ea9210b13b89 SHA1 f26
 MD5 19238be258dea758cf3f082df5ae813a files/firebird.init.d 697
 RMD160 eb18c898dcb7d5e86906c7ad78f4ea9210b13b89 files/firebird.init.d 697
 SHA256 6585f1fba391fa49157975cf81ac7922648fc2749e326eac3b9ed571f6c43c83 files/firebird.init.d 697
-AUX firebird.xinetd 206 RMD160 982a38df26c870ba634576f6188683478d2a69da SHA1 c495d0f88e46dd3b9cc42f030bc1ab42b138e8fd SHA256 b129b0653cacd81968986b5514ba78829deeab19972cec18271a6b354247e494
-MD5 b0d6de21d0e14d41983d440d5675e9d5 files/firebird.xinetd 206
-RMD160 982a38df26c870ba634576f6188683478d2a69da files/firebird.xinetd 206
-SHA256 b129b0653cacd81968986b5514ba78829deeab19972cec18271a6b354247e494 files/firebird.xinetd 206
+AUX firebird.xinetd 208 RMD160 c9b6f61321861ce86c14c3fec0f13909865e6344 SHA1 ca1cd79282a9f1daedbbe3b053efcba0f79a989d SHA256 802738bd350a19c3abbd99be0bcf3d52b3c4cdc09211f2de2b89d25c54fb5a6c
+MD5 a0c95b227bd9ebd0cb1a57a46e59141a files/firebird.xinetd 208
+RMD160 c9b6f61321861ce86c14c3fec0f13909865e6344 files/firebird.xinetd 208
+SHA256 802738bd350a19c3abbd99be0bcf3d52b3c4cdc09211f2de2b89d25c54fb5a6c files/firebird.xinetd 208
 DIST Firebird-1.5-QuickStart.pdf 193637 RMD160 c3d541701950a9b8ac0b353e5360af9235a3cf3f SHA1 fc64d475222257b269378451a69167ea53852ece SHA256 3b6cbf86d9ee7deaeeae101edf6c124c694ca423c9f4d09da035eed9e2bb70fe
 DIST Firebird-2.0.1.12855-0.tar.bz2 12582690 RMD160 abe8a59795c59f6fdccfe2fe6612b81b8373493f SHA1 a364548028e411919a94b5be4263b9914b696bda SHA256 4346471f7c302b5ecdb8440b3c329e3d1fd78483b948e9e7b94ef284c37cb86e
 DIST firebird-1.5.4-debian-patchset.tar.bz2 22696 RMD160 e4fec480f4480fc2dbc460c5dffab6c0127867f1 SHA1 e925f90d18ece6eb5c8a2645f7e2f559e5e7b153 SHA256 c88345bad9064c552f4231d1ce82e3fb89d2cdfde8bf0965a966b426d9aaefea
 DIST firebird-1.5.4.4910.tar.bz2 5087076 RMD160 00480f290b8e82f9965387a903ae392e8b71c3f1 SHA1 684860f6b1b77f5068ea175d3e08a7c839bb92a5 SHA256 c4464b1b89fde0676562de2b82c971d4f791133dcc2967760dc2f3a5cfd52556
 DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d
-EBUILD firebird-1.5.4-r2.ebuild 7596 RMD160 d490b95d2b41ecaa6ea1008aef20b81b8ed1059a SHA1 c8af383eddebdd4c947a1c0c7e4b9654b62f502b SHA256 3e686424549d91eb771b796e90f0c96edf645f025366d399de2df70b732f4c15
-MD5 8fd8968d47fcbd5ba7a52c5ceea97657 firebird-1.5.4-r2.ebuild 7596
-RMD160 d490b95d2b41ecaa6ea1008aef20b81b8ed1059a firebird-1.5.4-r2.ebuild 7596
-SHA256 3e686424549d91eb771b796e90f0c96edf645f025366d399de2df70b732f4c15 firebird-1.5.4-r2.ebuild 7596
-EBUILD firebird-1.5.4-r3.ebuild 7908 RMD160 f79efd366ee875dad9807c25339918605edd30bc SHA1 69de1d0dc773e390edd352a890d851ab1990e243 SHA256 5ea957c5a079d81935dd8e3969bde6967ad1e3caa4276e2a14c10d105a3b1464
-MD5 272b5b03f768ffb4ab38ac92d80a40b5 firebird-1.5.4-r3.ebuild 7908
-RMD160 f79efd366ee875dad9807c25339918605edd30bc firebird-1.5.4-r3.ebuild 7908
-SHA256 5ea957c5a079d81935dd8e3969bde6967ad1e3caa4276e2a14c10d105a3b1464 firebird-1.5.4-r3.ebuild 7908
+EBUILD firebird-1.5.4-r3.ebuild 7902 RMD160 787deeb1774930a4d90193155ad1623aee94be9f SHA1 bf6fff401c40de492df10acc0de88af0abd28cb4 SHA256 6b3ab01d9f358aa5c29ae1a386f090df6c361f73abb9997a496790411eb86a47
+MD5 2e2ac9cf160463a745c6a6c85dca5fb3 firebird-1.5.4-r3.ebuild 7902
+RMD160 787deeb1774930a4d90193155ad1623aee94be9f firebird-1.5.4-r3.ebuild 7902
+SHA256 6b3ab01d9f358aa5c29ae1a386f090df6c361f73abb9997a496790411eb86a47 firebird-1.5.4-r3.ebuild 7902
 EBUILD firebird-2.0.1.12855.0-r4.ebuild 6980 RMD160 6a725fbf05f516e4e2dca00558930a0d947e30da SHA1 9833b4e8c1e3cd461a82ab644ce1fde3fc6a118a SHA256 b3b7cf93d02ccc64571dcd50127bc0d23613e92241b8c5f2f86040064eec5b84
 MD5 cb94c373a2a3276c92a584b5ec69084d firebird-2.0.1.12855.0-r4.ebuild 6980
 RMD160 6a725fbf05f516e4e2dca00558930a0d947e30da firebird-2.0.1.12855.0-r4.ebuild 6980
 SHA256 b3b7cf93d02ccc64571dcd50127bc0d23613e92241b8c5f2f86040064eec5b84 firebird-2.0.1.12855.0-r4.ebuild 6980
-MISC ChangeLog 11053 RMD160 68020589510caf30433c746f44dc09d68348e319 SHA1 ca44a6315351eef0212aa72f90884c981f32bd5a SHA256 56233c1aae004499a2b0711b627b15a96a4847bc1cd2cd70e0a690bace77bf5f
-MD5 dcc237e3fcd6916a4f6ba1a3add4b37c ChangeLog 11053
-RMD160 68020589510caf30433c746f44dc09d68348e319 ChangeLog 11053
-SHA256 56233c1aae004499a2b0711b627b15a96a4847bc1cd2cd70e0a690bace77bf5f ChangeLog 11053
+EBUILD firebird-2.0.1.12855.0-r5.ebuild 7049 RMD160 4a028fa77f85ce24ef381ca94aa88cded2abe7a0 SHA1 544875f87345cebe14ccd3c93f604b23aa39e701 SHA256 92d97fd9e859578b37c8cc273650706362b7e0dfabe143f47aa2fe67e3674b60
+MD5 9a3c7d54898c87ccf9b549966130aea4 firebird-2.0.1.12855.0-r5.ebuild 7049
+RMD160 4a028fa77f85ce24ef381ca94aa88cded2abe7a0 firebird-2.0.1.12855.0-r5.ebuild 7049
+SHA256 92d97fd9e859578b37c8cc273650706362b7e0dfabe143f47aa2fe67e3674b60 firebird-2.0.1.12855.0-r5.ebuild 7049
+MISC ChangeLog 11455 RMD160 47b9d08bfde748c192bf5af45a3f135dd0bfb8eb SHA1 db3f87d017b1829fc4bf20f13bec49cb8e305979 SHA256 d284ff46f218aa87676158866fa444e260476f9e9732d30ccbf24037981d94fc
+MD5 1c7be435bdb13a816bc0f675fea571f0 ChangeLog 11455
+RMD160 47b9d08bfde748c192bf5af45a3f135dd0bfb8eb ChangeLog 11455
+SHA256 d284ff46f218aa87676158866fa444e260476f9e9732d30ccbf24037981d94fc ChangeLog 11455
 MISC metadata.xml 676 RMD160 cbec5ef0857aae880afdbc60f370c1b76d36ccf8 SHA1 c4a3ff2cb0dca7f10616bcb6380478fc9b030cf5 SHA256 8b013a783e48791968505c98397ff8777960cdd69f7818b3cff689fa1b2373a8
 MD5 d6677dccf2b721741683d19348632bd6 metadata.xml 676
 RMD160 cbec5ef0857aae880afdbc60f370c1b76d36ccf8 metadata.xml 676
 SHA256 8b013a783e48791968505c98397ff8777960cdd69f7818b3cff689fa1b2373a8 metadata.xml 676
-MD5 20a106c4128997b0c01898ae2431188d files/digest-firebird-1.5.4-r2 1048
-RMD160 380abfa848b17114c93549605983bb62325fa2ef files/digest-firebird-1.5.4-r2 1048
-SHA256 a9f424580b7adc46492d408d0219e04ca70854ee5c0553ba8419f289164a72d9 files/digest-firebird-1.5.4-r2 1048
 MD5 20a106c4128997b0c01898ae2431188d files/digest-firebird-1.5.4-r3 1048
 RMD160 380abfa848b17114c93549605983bb62325fa2ef files/digest-firebird-1.5.4-r3 1048
 SHA256 a9f424580b7adc46492d408d0219e04ca70854ee5c0553ba8419f289164a72d9 files/digest-firebird-1.5.4-r3 1048
 MD5 5c0b5264d4f1c9edec1c5bdf3cb765e3 files/digest-firebird-2.0.1.12855.0-r4 506
 RMD160 3a785de7489e80937c79ebc588010b4f3d1f8055 files/digest-firebird-2.0.1.12855.0-r4 506
 SHA256 f32bfbce159f18706c7b98be298dc2fbefbd3feb6d08ce4b521063db4e19d735 files/digest-firebird-2.0.1.12855.0-r4 506
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGgA9TKhnDs22gwa8RAlVeAJ9mrV+mCgaH2aHdLxkzWGvCZ0BPNwCguwsb
-9gcJVjPJGWQzOfA9ysuNrmg=
-=Sblv
------END PGP SIGNATURE-----
+MD5 5c0b5264d4f1c9edec1c5bdf3cb765e3 files/digest-firebird-2.0.1.12855.0-r5 506
+RMD160 3a785de7489e80937c79ebc588010b4f3d1f8055 files/digest-firebird-2.0.1.12855.0-r5 506
+SHA256 f32bfbce159f18706c7b98be298dc2fbefbd3feb6d08ce4b521063db4e19d735 files/digest-firebird-2.0.1.12855.0-r5 506
diff --git a/dev-db/firebird/files/digest-firebird-1.5.4-r2 b/dev-db/firebird/files/digest-firebird-1.5.4-r2
deleted file mode 100644
index b3e31cc48311..000000000000
--- a/dev-db/firebird/files/digest-firebird-1.5.4-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 3690d389b3b69883f4bbc258b6c81851 Firebird-1.5-QuickStart.pdf 193637
-RMD160 c3d541701950a9b8ac0b353e5360af9235a3cf3f Firebird-1.5-QuickStart.pdf 193637
-SHA256 3b6cbf86d9ee7deaeeae101edf6c124c694ca423c9f4d09da035eed9e2bb70fe Firebird-1.5-QuickStart.pdf 193637
-MD5 b3530a500074ab5b2a276e37ecd10ccf firebird-1.5.4-debian-patchset.tar.bz2 22696
-RMD160 e4fec480f4480fc2dbc460c5dffab6c0127867f1 firebird-1.5.4-debian-patchset.tar.bz2 22696
-SHA256 c88345bad9064c552f4231d1ce82e3fb89d2cdfde8bf0965a966b426d9aaefea firebird-1.5.4-debian-patchset.tar.bz2 22696
-MD5 6655190f760217845623a75001b6ddd4 firebird-1.5.4.4910.tar.bz2 5087076
-RMD160 00480f290b8e82f9965387a903ae392e8b71c3f1 firebird-1.5.4.4910.tar.bz2 5087076
-SHA256 c4464b1b89fde0676562de2b82c971d4f791133dcc2967760dc2f3a5cfd52556 firebird-1.5.4.4910.tar.bz2 5087076
-MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848
-RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848
-SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848
diff --git a/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r5 b/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r5
new file mode 100644
index 000000000000..04a90efef089
--- /dev/null
+++ b/dev-db/firebird/files/digest-firebird-2.0.1.12855.0-r5
@@ -0,0 +1,6 @@
+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/firebird-1.5.0.xinetd b/dev-db/firebird/files/firebird-1.5.0.xinetd
deleted file mode 100644
index 6c5584dd0906..000000000000
--- a/dev-db/firebird/files/firebird-1.5.0.xinetd
+++ /dev/null
@@ -1,17 +0,0 @@
-# description: FirebirdSQL server
-#
-# Be careful when commenting out entries in this file.
-# Active entry should be first as some scripts 
-# (CSchangeRunUser.sh in particular) use sed scripting 
-# to modify it.
-service gds_db
-{
-	flags			= REUSE
-	socket_type		= stream
-	wait			= no
-	user			= firebird
-	log_on_success		+= USERID
-	log_on_failure 		+= USERID
-	server			= /opt/firebird/bin/fb_inet_server
-	disable         = yes
-}
diff --git a/dev-db/firebird/files/firebird.xinetd b/dev-db/firebird/files/firebird.xinetd
index 842fc3ec3301..8ffc12273e21 100644
--- a/dev-db/firebird/files/firebird.xinetd
+++ b/dev-db/firebird/files/firebird.xinetd
@@ -3,9 +3,9 @@ service gds_db
 	flags			= REUSE
 	socket_type		= stream
 	wait			= no
-	user			= root
+	user			= firebird
 	log_on_success		+= USERID
 	log_on_failure 		+= USERID
-	server			= /opt/interbase/bin/gds_inet_server
+	server			= /opt/firebird/bin/fb_inet_server
 	disable			= yes
 }
diff --git a/dev-db/firebird/firebird-1.5.4-r2.ebuild b/dev-db/firebird/firebird-1.5.4-r2.ebuild
deleted file mode 100644
index dc914d8f69e1..000000000000
--- a/dev-db/firebird/firebird-1.5.4-r2.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.4-r2.ebuild,v 1.5 2007/06/21 05:37:23 wltjr Exp $
-
-inherit flag-o-matic eutils
-
-extra_ver="4910"
-MY_P=${P}.${extra_ver}
-DESCRIPTION="A relational database offering many ANSI SQL-99 features."
-HOMEPAGE="http://firebird.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	 mirror://gentoo/firebird-1.5.4-debian-patchset.tar.bz2
-		doc? (	http://firebird.sourceforge.net/pdfmanual/Firebird-1.5-QuickStart.pdf
-				ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="Interbase-1.0"
-SLOT="0"
-KEYWORDS="amd64 -ia64 -sparc x86"
-IUSE="xinetd doc"
-RESTRICT="nouserpriv"
-
-RDEPEND="xinetd? ( virtual/inetd )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )"
-
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /opt/firebird firebird
-}
-
-src_unpack() {
-	if use doc; then
-	    # Unpack docs
-	    mkdir ${WORKDIR}/manuals
-	    cd ${WORKDIR}/manuals
-	    unpack ib_b60_doc.zip
-	    cd ${WORKDIR}
-	fi
-
-	unpack ${MY_P}.tar.bz2
-	unpack firebird-1.5.4-debian-patchset.tar.bz2
-	cd ${S}
-
-	for p in $(ls ${WORKDIR}/patches) ; do
-		epatch ${WORKDIR}/patches/${p} || die "Patch did not apply."
-	done
-
-	# This file must be regenerated during build
-	rm ${S}/src/dsql/parse.cpp
-}
-
-src_compile() {
-	# fix bug #33584
-	#strip-flags -funroll-loops
-	# but Meir intended "filter-flags -funroll-loops"; awaiting bug reports...
-
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	local myconf="--prefix=/opt/firebird --with-editline"
-	use xinetd || myconf="${myconf} --enable-superserver"
-
-	NOCONFIGURE=1
-
-	./autogen.sh ${myconf} || die "couldn't run autogen.sh"
-
-	find . -type f -exec sed -i -e "s/-lcurses/-lncurses/g" {} \;
-
-	econf ${myconf} || die "./configure failed"
-	emake -j 1 || die "error during make"
-}
-
-src_install() {
-	cd ${S}/gen
-	make -f Makefile.install tarfile || die "Can't create buildroot tar file"
-	cd ${D}
-	tar zxpf ${S}/gen/Firebird?S-*/buildroot.tar.gz
-
-	dodoc ${D}/opt/firebird/{README,WhatsNew,doc/*}
-	docinto examples
-	dodoc ${D}/opt/firebird/examples/*
-	docinto sql.extensions
-	dodoc ${D}/opt/firebird/doc/sql.extensions/*
-
-	rm -r ${D}/opt/firebird/{README,WhatsNew,doc,misc}
-	rm -r ${D}/opt/firebird/examples
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d ; newins ${FILESDIR}/${PN}-1.5.0.xinetd firebird
-	else
-		exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}.init.d firebird
-		insinto /etc/conf.d ; newins ${FILESDIR}/firebird.conf.d firebird
-		fperms 640 /etc/conf.d/firebird
-	fi
-	insinto /etc/env.d ; newins ${FILESDIR}/70${PN} 70firebird
-
-	# Following is adapted from postinstall.sh
-
-	dodir /opt/firebird/run
-	keepdir /opt/firebird/run
-
-	# make sure everything is owned by firebird
-	chown -R firebird:firebird ${D}/opt/firebird
-
-	# make sure permissions are set
-	chmod -R o= ${D}/opt/firebird
-
-	# fix directories
-	find ${D}/opt/firebird -print -type d | xargs chmod o=rx
-
-	# set permissions for /bin
-	cd ${D}/opt/firebird/bin
-	chmod ug=rx,o= *
-	chmod a=rx isql qli gpre
-
-	use xinetd && chmod ug=rxs,o= ${D}/opt/firebird/bin/{fb_lock_mgr,gds_drop,fb_inet_server}
-	chmod u=rw,go=r ${D}/opt/firebird/{aliases.conf,firebird.conf}
-	chmod ug=rw,o= ${D}/opt/firebird/{security.fdb,help/help.fdb}
-
-	for i in include lib UDF intl; do chmod a=r ${D}/opt/firebird/${i}/*; done
-	chmod ug=rx,o= ${D}/opt/firebird/{intl/fbintl,UDF/fbudf.so,UDF/ib_udf.so}
-
-	local my_lib=$(get_libdir)
-
-	# create links for back compatibility
-	dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so
-	dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libgds.so.0
-	dosym ./libfbclient.so /opt/firebird/${my_lib}/libgds.so
-	dosym ./libfbclient.so /opt/firebird/${my_lib}/libgds.so.0
-
-	# we want relative symlinks...
-	dosym ../../opt/firebird/${my_lib}/libfbclient.so /usr/${my_lib}/libfbclient.so
-	dosym ../../opt/firebird/${my_lib}/libfbclient.so.1 /usr/${my_lib}/libfbclient.so.1
-	dosym ../../opt/firebird/${my_lib}/libfbclient.so.1.5.4 /usr/${my_lib}/libfbclient.so.1.5.4
-
-	# move and link config files to /etc/firebird so they'll be protected
-	dodir /etc/firebird
-	mv ${D}/opt/firebird/{security.fdb,aliases.conf,firebird.conf} ${D}/etc/firebird
-	dosym ../../etc/firebird/security.fdb /opt/firebird/security.fdb
-	dosym ../../etc/firebird/aliases.conf /opt/firebird/aliases.conf
-	dosym ../../etc/firebird/firebird.conf /opt/firebird/firebird.conf
-
-	# Install docs
-	if use doc; then
-	    dodoc ${DISTDIR}/Firebird-1.5-QuickStart.pdf
-	    dodoc ${WORKDIR}/manuals/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "1. If haven't done so already, please run:"
-	elog
-	elog "   \"emerge --config =${PF}\""
-	elog
-	elog "   to create lockfiles, set permissions and more"
-	elog
-	elog "2. Firebird now runs with it's own user. Please remember to"
-	elog "   set permissions to firebird:firebird on databases you "
-	elog "   already have (if any)."
-	elog
-
-	if ! use xinetd
-	then
-		elog "3. You've built the stand alone deamon version,"
-		elog "   SuperServer. If you were using pre 1.5.0 ebuilds"
-		elog "   you're probably have one installed via xinetd. please"
-		elog "   remember to disable it (usually in /etc/xinetd.d/firebird),"
-		elog "   since the current one has it's own init script under"
-		elog "   /etc/init.d"
-	fi
-}
-
-pkg_config() {
-	cd /opt/firebird
-
-	# Create Lock files
-	for i in isc_init1 isc_lock1 isc_event1
-	do
-		FileName=$i.`hostname`
-		touch $FileName
-		chown firebird:firebird $FileName
-		chmod ug=rw,o= $FileName
-	done
-
-	# Create log
-	if [ ! -h firebird.log ]
-	then
-		if [ -f firebird.log ]
-		then
-			mv firebird.log /var/log
-		else
-			touch /var/log/firebird.log
-			chown firebird:firebird /var/log/firebird.log
-			chmod ug=rw,o= /var/log/firebird.log
-		fi
-
-		# symlink the log to /var/log
-		ln -s /var/log/firebird.log firebird.log
-	fi
-
-	# add gds_db to /etc/services
-	if [ -z "`grep gds_db  /etc/services`" ]
-	then
-		echo -e "#\n#Service added for gds_db (firebird)\n#" >> /etc/services
-		echo "gds_db		3050/tcp" >> /etc/services
-		einfo "added gds_db to /etc/services"
-	fi
-
-	# if found /etc/isc4.gdb from previous install, backup, and restore as
-	# /etc/security.fdb
-	if [ -f /etc/firebird/isc4.gdb ]
-	then
-		# if we have scurity.fdb already, back it 1st
-		if [ -f /etc/firebird/security.fdb ]
-		then
-			cp /etc/firebird/security.fdb /etc/firebird/security.fdb.old
-		fi
-		gbak -B /etc/firebird/isc4.gdb /etc/firebird/isc4.gbk
-		gbak -R /etc/firebird/isc4.gbk /etc/firebird/security.fdb
-		mv /etc/firebird/isc4.gdb /etc/firebird/isc4.gdb.old
-		rm /etc/firebird/isc4.gbk
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird /etc/firebird/{isc4.*,security.*}
-		chmod 660 /etc/firebird/{isc4.*,security.*}
-
-		elog
-		elog "Converted old isc4.gdb to security.fdb, isc4.gdb has been "
-		elog "renamed to isc4.gdb.old. if you had previous security.fdb, "
-		elog "it's backed to security.fdb.old (all under /etc/firebird)."
-		elog
-	fi
-
-	# we need to enable local access to the server
-	if [ ! -f /etc/hosts.equiv ]
-	then
-		touch /etc/hosts.equiv
-		chown root:0 /etc/hosts.equiv
-		chmod u=rw,go=r /etc/hosts.equiv
-	fi
-
-	if [ -z "`grep 'localhost$' /etc/hosts.equiv`" ]
-	then
-		echo "localhost" >> /etc/hosts.equiv
-		einfo "Added localhost to /etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if [ -z "`grep ${HS_NAME} /etc/hosts.equiv`" ]
-	then
-		echo "${HS_NAME}" >> /etc/hosts.equiv
-		einfo "Added ${HS_NAME} to /etc/hosts.equiv"
-	fi
-
-	elog "If you're using UDFs, please remember to move them"
-	elog "to /opt/firebird/UDF"
-}
diff --git a/dev-db/firebird/firebird-1.5.4-r3.ebuild b/dev-db/firebird/firebird-1.5.4-r3.ebuild
index 49cfd53bd45a..2a119ffb43f1 100644
--- a/dev-db/firebird/firebird-1.5.4-r3.ebuild
+++ b/dev-db/firebird/firebird-1.5.4-r3.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-1.5.4-r3.ebuild,v 1.2 2007/06/21 05:37:23 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.4-r3.ebuild,v 1.3 2007/07/01 19:05:23 wltjr Exp $
 
 inherit flag-o-matic eutils
 
@@ -89,7 +89,7 @@ src_install() {
 	rm -r ${D}/opt/firebird/examples
 
 	if use xinetd ; then
-		insinto /etc/xinetd.d ; newins ${FILESDIR}/${PN}-1.5.0.xinetd firebird
+		insinto /etc/xinetd.d ; newins ${FILESDIR}/${PN}.xinetd firebird
 	else
 		exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}.init.d firebird
 		insinto /etc/conf.d ; newins ${FILESDIR}/firebird.conf.d firebird
diff --git a/dev-db/firebird/firebird-2.0.1.12855.0-r5.ebuild b/dev-db/firebird/firebird-2.0.1.12855.0-r5.ebuild
new file mode 100644
index 000000000000..21680c82bcdb
--- /dev/null
+++ b/dev-db/firebird/firebird-2.0.1.12855.0-r5.ebuild
@@ -0,0 +1,250 @@
+# 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.1 2007/07/01 19:05:23 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 /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 /opt/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 /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"
+}