Clean up. Version bump.

Package-Manager: portage-2.1.2.7

9 files changed, 92 insertions, 513 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 57bbef578f0b..31e318d83215 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,12 @@
 # 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.51 2007/04/07 20:23:57 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.52 2007/05/09 16:13:04 carlo Exp $
+
+*firebird-1.5.4 (09 May 2007)
+
+  09 May 2007; Carsten Lohrke <carlo@gentoo.org> -firebird-1.5.1.ebuild,
+  -firebird-1.5.2.ebuild, -firebird-1.5.3.ebuild, +firebird-1.5.4.ebuild:
+  Clean up. Version bump.
 
   07 Apr 2007; Ryan Hill <dirtyepic@gentoo.org>
   +files/firebird-1.5.3-gcc412.patch, firebird-1.5.3-r1.ebuild:
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 21344a295f2b..a83129476943 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
@@ -39,50 +36,29 @@ RMD160 982a38df26c870ba634576f6188683478d2a69da files/firebird.xinetd 206
 SHA256 b129b0653cacd81968986b5514ba78829deeab19972cec18271a6b354247e494 files/firebird.xinetd 206
 DIST Firebird-1.5-QuickStart.pdf 193637 RMD160 c3d541701950a9b8ac0b353e5360af9235a3cf3f SHA1 fc64d475222257b269378451a69167ea53852ece SHA256 3b6cbf86d9ee7deaeeae101edf6c124c694ca423c9f4d09da035eed9e2bb70fe
 DIST firebird-1.5-gcc4.patch.bz2 21974 RMD160 c7a348dd1fbd08813eebb9487716f4d1a5390576 SHA1 7588ee5db8325bc5330cbc244b7ceabaf85811cc SHA256 f48e1fbccae15b9367c432e46f06ea9a4b4059de5192386375733764c028776c
-DIST firebird-1.5.1.4481.tar.bz2 4528253 RMD160 b1c8201838b90b8c4d395c883f9128db490ef15c SHA1 aeeae9eb12efb1fa073999f4f53a6cfeb16619d6 SHA256 b3c42debfb0781a411ed449b90da4c143bd420fbdbe73fe1e15c7d727826fad3
-DIST firebird-1.5.2.4731.tar.bz2 4764015 RMD160 fd82dc9dbc5ada51847011cec4f0f9d6f510bc53 SHA1 e82b5bde94c760a5922eedeac2b7b1de1b57fb94 SHA256 a04a52746a4f8ffd4d98ae2f15fc4b4ed7d55b9ddaa8937108c29d37a6c117e9
 DIST firebird-1.5.3.4870.tar.bz2 5055973 RMD160 3833574f8c2d996bfb06b346a5d22a88d9923425 SHA1 6be1e2e46be6ebd16e5b9b10ad2b4f5aeb15f3d4 SHA256 16880405d6e321a70e80c6e6fb4ed8429a692c43b8a7b59a676cf7d2162d2023
+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.1.ebuild 6420 RMD160 400fc73ebecce1711070cbbc12f17bd95f61a5f9 SHA1 5f742b9299937db19e832eebceb350c1965baf9f SHA256 caf91aab0c1afec0e7c9742b55870e53be65cca56257b44c9d7ccc418fc93dde
-MD5 759335f082894ebf6a8f8dfc4898a35e firebird-1.5.1.ebuild 6420
-RMD160 400fc73ebecce1711070cbbc12f17bd95f61a5f9 firebird-1.5.1.ebuild 6420
-SHA256 caf91aab0c1afec0e7c9742b55870e53be65cca56257b44c9d7ccc418fc93dde firebird-1.5.1.ebuild 6420
-EBUILD firebird-1.5.2.ebuild 6427 RMD160 125a9ea88a15fd7231ef63c0b09d2fad85312cc7 SHA1 8ee25343e2110a865908f9a8f2bdfce191234189 SHA256 a875989ca2f93c3a727d409beef8619a7f96499aaf54815a1fbb09bd20fbff8b
-MD5 7416d7cb7f9397e7ed33bef1265af218 firebird-1.5.2.ebuild 6427
-RMD160 125a9ea88a15fd7231ef63c0b09d2fad85312cc7 firebird-1.5.2.ebuild 6427
-SHA256 a875989ca2f93c3a727d409beef8619a7f96499aaf54815a1fbb09bd20fbff8b firebird-1.5.2.ebuild 6427
 EBUILD firebird-1.5.3-r1.ebuild 7111 RMD160 20f6ff1747c7b9df8a5b48f5bf56905f112217d1 SHA1 8b59e79b05d62459824ffa36ee14dc2b776e0ca9 SHA256 52b9b501c866e4e13516107f806cb8638b1d8ddbd50ac3ef2d22040110aa2e59
 MD5 cbaa96e95b8bece978184bb6ccac03f6 firebird-1.5.3-r1.ebuild 7111
 RMD160 20f6ff1747c7b9df8a5b48f5bf56905f112217d1 firebird-1.5.3-r1.ebuild 7111
 SHA256 52b9b501c866e4e13516107f806cb8638b1d8ddbd50ac3ef2d22040110aa2e59 firebird-1.5.3-r1.ebuild 7111
-EBUILD firebird-1.5.3.ebuild 6424 RMD160 a730f5bb47d89b70178a0a2e4c8a0057848227fb SHA1 23ea71fb0500677db4918fb4493b4cf9421b0bf7 SHA256 05dab9ceaf8b565af8fe8b04464e15b16c1326b5aafdc1705d8808c7bb149f82
-MD5 69a56bbfc34a61f44b6b65545cfdab1c firebird-1.5.3.ebuild 6424
-RMD160 a730f5bb47d89b70178a0a2e4c8a0057848227fb firebird-1.5.3.ebuild 6424
-SHA256 05dab9ceaf8b565af8fe8b04464e15b16c1326b5aafdc1705d8808c7bb149f82 firebird-1.5.3.ebuild 6424
-MISC ChangeLog 7837 RMD160 dd05c21e844189afd2bb5d725bb1e8be366899d4 SHA1 50051832713a7516c8cf782410e93413a835179f SHA256 8429ae3ecb3f6ad0822630f020037b949756b9ce4ecb21a0cf013dc522a1697a
-MD5 8de94cda4722a307d84b5192891b75c3 ChangeLog 7837
-RMD160 dd05c21e844189afd2bb5d725bb1e8be366899d4 ChangeLog 7837
-SHA256 8429ae3ecb3f6ad0822630f020037b949756b9ce4ecb21a0cf013dc522a1697a ChangeLog 7837
+EBUILD firebird-1.5.4.ebuild 7593 RMD160 47858f2a2eb70c3f8e511ea1acd9deb55a7b608e SHA1 233fc7806a945ff4ae6a2da41d0608c6ac089c3e SHA256 c1a08be23a00c063c9e82ec87531b69e856ff2c28a647efefed376c68d1e4ff9
+MD5 7b47d1938133456d0ab4420a04567b61 firebird-1.5.4.ebuild 7593
+RMD160 47858f2a2eb70c3f8e511ea1acd9deb55a7b608e firebird-1.5.4.ebuild 7593
+SHA256 c1a08be23a00c063c9e82ec87531b69e856ff2c28a647efefed376c68d1e4ff9 firebird-1.5.4.ebuild 7593
+MISC ChangeLog 8038 RMD160 3cbd84ce230c098f2177eb1924b2d3b63ed8ce75 SHA1 1905452f7cea3ee9d4641108eec16880a74e38fd SHA256 4f1b3643b534a9ac761d49754d99b8b199d8a62f9a977bf9fa268503fe3bd523
+MD5 cf75399821f892000a14aa6837c39f09 ChangeLog 8038
+RMD160 3cbd84ce230c098f2177eb1924b2d3b63ed8ce75 ChangeLog 8038
+SHA256 4f1b3643b534a9ac761d49754d99b8b199d8a62f9a977bf9fa268503fe3bd523 ChangeLog 8038
 MISC metadata.xml 225 RMD160 7c157805d934c18e77b4ed4ebd28870843ec0b81 SHA1 edf45c54d43d4c80b949c49355fc530b4271338e SHA256 d16e8c5dfbf984681d500dad1063583ba0a21e0b73da359178bb87c09d951c9c
 MD5 70eaf71c2018b87fe06aed9df3799509 metadata.xml 225
 RMD160 7c157805d934c18e77b4ed4ebd28870843ec0b81 metadata.xml 225
 SHA256 d16e8c5dfbf984681d500dad1063583ba0a21e0b73da359178bb87c09d951c9c metadata.xml 225
-MD5 e18bc91e1f3b77fe9d5282d96b72fdb2 files/digest-firebird-1.5.1 265
-RMD160 bb1fcdec56a6f0e259073aa6953b7269b76546df files/digest-firebird-1.5.1 265
-SHA256 75a5c17b925df1558515b1a5f3aa4d5d090e895ec01576239994c2e0af96049d files/digest-firebird-1.5.1 265
-MD5 3a4554c3ceab739b405d646a55046885 files/digest-firebird-1.5.2 265
-RMD160 c6d05314db4b3533f49f9e798bb8031873146881 files/digest-firebird-1.5.2 265
-SHA256 0ecffd70d8661b0740d1efef5c072abbdb323e56c57f3a331f82c0e8cc3a54d1 files/digest-firebird-1.5.2 265
-MD5 fb23d7c22e124f7bf16d2468d001a728 files/digest-firebird-1.5.3 265
-RMD160 e5148fe85121b2bf338958aaa8845861b9e0ff06 files/digest-firebird-1.5.3 265
-SHA256 c1f762c686652cb067fd1dbe20db0fda782c713a961b1f30da5e25ae37e9317c files/digest-firebird-1.5.3 265
 MD5 a52e967cf2d04fbbf7c6a8a2fc988105 files/digest-firebird-1.5.3-r1 1015
 RMD160 e71a88ad45cd1b43c6c69417a9d7b9e24bb9a1e6 files/digest-firebird-1.5.3-r1 1015
 SHA256 fce6d7adc88cb5cb9a444b74dc328c86dc9f6edfebfad4a9cd9f60eacaad225d files/digest-firebird-1.5.3-r1 1015
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGM8ORV3J2n04EauwRAgckAJ44y7PJnOKCS/0eP3AKXjEdjxKKKACgzTrA
-gMfJBj8Um7gEdYEpHwA76l8=
-=Hak3
------END PGP SIGNATURE-----
+MD5 20a106c4128997b0c01898ae2431188d files/digest-firebird-1.5.4 1048
+RMD160 380abfa848b17114c93549605983bb62325fa2ef files/digest-firebird-1.5.4 1048
+SHA256 a9f424580b7adc46492d408d0219e04ca70854ee5c0553ba8419f289164a72d9 files/digest-firebird-1.5.4 1048
diff --git a/dev-db/firebird/files/digest-firebird-1.5.1 b/dev-db/firebird/files/digest-firebird-1.5.1
deleted file mode 100644
index 17974844614d..000000000000
--- a/dev-db/firebird/files/digest-firebird-1.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b638ddc71661d63c69a3758d00310010 firebird-1.5.1.4481.tar.bz2 4528253
-RMD160 b1c8201838b90b8c4d395c883f9128db490ef15c firebird-1.5.1.4481.tar.bz2 4528253
-SHA256 b3c42debfb0781a411ed449b90da4c143bd420fbdbe73fe1e15c7d727826fad3 firebird-1.5.1.4481.tar.bz2 4528253
diff --git a/dev-db/firebird/files/digest-firebird-1.5.2 b/dev-db/firebird/files/digest-firebird-1.5.2
deleted file mode 100644
index 9d954dd0216c..000000000000
--- a/dev-db/firebird/files/digest-firebird-1.5.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fea53ed5213cff4bd96513fb1a6c0ca2 firebird-1.5.2.4731.tar.bz2 4764015
-RMD160 fd82dc9dbc5ada51847011cec4f0f9d6f510bc53 firebird-1.5.2.4731.tar.bz2 4764015
-SHA256 a04a52746a4f8ffd4d98ae2f15fc4b4ed7d55b9ddaa8937108c29d37a6c117e9 firebird-1.5.2.4731.tar.bz2 4764015
diff --git a/dev-db/firebird/files/digest-firebird-1.5.3 b/dev-db/firebird/files/digest-firebird-1.5.3
deleted file mode 100644
index 2173af24e405..000000000000
--- a/dev-db/firebird/files/digest-firebird-1.5.3
+++ /dev/null
@@ -1,3 +0,0 @@
-RMD160 3833574f8c2d996bfb06b346a5d22a88d9923425 firebird-1.5.3.4870.tar.bz2 5055973
-SHA256 16880405d6e321a70e80c6e6fb4ed8429a692c43b8a7b59a676cf7d2162d2023 firebird-1.5.3.4870.tar.bz2 5055973
-MD5 559d005ab6622274f9448687f930393c firebird-1.5.3.4870.tar.bz2 5055973
diff --git a/dev-db/firebird/files/digest-firebird-1.5.4 b/dev-db/firebird/files/digest-firebird-1.5.4
new file mode 100644
index 000000000000..b3e31cc48311
--- /dev/null
+++ b/dev-db/firebird/files/digest-firebird-1.5.4
@@ -0,0 +1,12 @@
+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/firebird-1.5.1.ebuild b/dev-db/firebird/firebird-1.5.1.ebuild
deleted file mode 100644
index e456890a9352..000000000000
--- a/dev-db/firebird/firebird-1.5.1.ebuild
+++ /dev/null
@@ -1,223 +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.1.ebuild,v 1.19 2007/04/28 21:58:33 tove Exp $
-
-inherit flag-o-matic eutils
-
-extra_ver="4481"
-DESCRIPTION="A relational database offering many ANSI SQL-99 features"
-HOMEPAGE="http://firebird.sourceforge.net/"
-SRC_URI="mirror://sourceforge/firebird/${P}.${extra_ver}.tar.bz2"
-
-LICENSE="Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 -ia64 sparc x86"
-IUSE="xinetd"
-RESTRICT="nouserpriv"
-
-DEPEND="virtual/libc
-	xinetd? ( virtual/inetd )"
-
-S=${WORKDIR}/${P}.${extra_ver}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-gcc34.patch
-}
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /opt/firebird firebird
-}
-
-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
-		newinitd ${FILESDIR}/${PN}.init.d firebird
-		newconfd ${FILESDIR}/firebird.conf.d firebird
-		fperms 640 /etc/conf.d/firebird
-	fi
-	newenvd ${FILESDIR}/70${PN} 70firebird
-
-	# Following is adapted from postinstall.sh
-
-	# 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
-	chmod a=rx qli
-
-	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}
-
-	# create links for back compatibility
-	dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so
-	dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so.0
-	dosym /opt/firebird/lib/libfbclient.so /opt/firebird/lib/libgds.so
-	dosym /opt/firebird/lib/libfbclient.so /opt/firebird/lib/libgds.so.0
-
-	# 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
-}
-
-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.3.ebuild b/dev-db/firebird/firebird-1.5.3.ebuild
deleted file mode 100644
index 386e9f96d943..000000000000
--- a/dev-db/firebird/firebird-1.5.3.ebuild
+++ /dev/null
@@ -1,223 +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.3.ebuild,v 1.9 2007/04/28 21:58:33 tove Exp $
-
-inherit flag-o-matic eutils
-
-extra_ver="4870"
-DESCRIPTION="A relational database offering many ANSI SQL-99 features"
-HOMEPAGE="http://firebird.sourceforge.net/"
-SRC_URI="mirror://sourceforge/firebird/${P}.${extra_ver}.tar.bz2"
-
-LICENSE="Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 -ia64 sparc x86"
-IUSE="xinetd"
-RESTRICT="nouserpriv"
-
-DEPEND="virtual/libc
-	xinetd? ( virtual/inetd )"
-
-S=${WORKDIR}/${P}.${extra_ver}
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /opt/firebird firebird
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-1.5-build.patch
-}
-
-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
-		newinitd ${FILESDIR}/${PN}.init.d firebird
-		newconfd ${FILESDIR}/firebird.conf.d firebird
-		fperms 640 /etc/conf.d/firebird
-	fi
-	newenvd ${FILESDIR}/70${PN} 70firebird
-
-	# Following is adapted from postinstall.sh
-
-	# 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
-	chmod a=rx qli
-
-	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}
-
-	# create links for back compatibility
-	dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so
-	dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so.0
-	dosym /opt/firebird/lib/libfbclient.so /opt/firebird/lib/libgds.so
-	dosym /opt/firebird/lib/libfbclient.so /opt/firebird/lib/libgds.so.0
-
-	# 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
-}
-
-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.2.ebuild b/dev-db/firebird/firebird-1.5.4.ebuild
index 111b6beb9f65..0472c595b8c2 100644
--- a/dev-db/firebird/firebird-1.5.2.ebuild
+++ b/dev-db/firebird/firebird-1.5.4.ebuild
@@ -1,24 +1,30 @@
 # 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.2.ebuild,v 1.13 2007/04/28 21:58:33 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.4.ebuild,v 1.1 2007/05/09 16:13:04 carlo Exp $
 
 inherit flag-o-matic eutils
 
-extra_ver="4731"
-DESCRIPTION="A relational database offering many ANSI SQL-99 features"
+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/firebird/${P}.${extra_ver}.tar.bz2"
+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"
+IUSE="xinetd doc"
 RESTRICT="nouserpriv"
 
-DEPEND="virtual/libc
-	xinetd? ( virtual/inetd )"
+RDEPEND="xinetd? ( virtual/inetd )"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )"
 
-S=${WORKDIR}/${P}.${extra_ver}
+
+S="${WORKDIR}"/${MY_P}
 
 pkg_setup() {
 	enewgroup firebird 450
@@ -26,10 +32,24 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A}
+	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}
 
-	epatch ${FILESDIR}/${PN}-1.5-build.patch
+	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() {
@@ -44,8 +64,11 @@ src_compile() {
 	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"
 }
@@ -68,14 +91,17 @@ src_install() {
 	if use xinetd ; then
 		insinto /etc/xinetd.d ; newins ${FILESDIR}/${PN}-1.5.0.xinetd firebird
 	else
-		newinitd ${FILESDIR}/${PN}.init.d firebird
-		newconfd ${FILESDIR}/firebird.conf.d firebird
+		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
-	newenvd ${FILESDIR}/70${PN} 70firebird
+	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
 
@@ -99,17 +125,31 @@ src_install() {
 	chmod ug=rx,o= ${D}/opt/firebird/{intl/fbintl,UDF/fbudf.so,UDF/ib_udf.so}
 
 	# create links for back compatibility
-	dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so
-	dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so.0
-	dosym /opt/firebird/lib/libfbclient.so /opt/firebird/lib/libgds.so
-	dosym /opt/firebird/lib/libfbclient.so /opt/firebird/lib/libgds.so.0
+	dosym ../../opt/firebird/lib/libfbclient.so /usr/lib/libgds.so
+	dosym ../../opt/firebird/lib/libfbclient.so /usr/lib/libgds.so.0
+	dosym ./libfbclient.so /opt/firebird/lib/libgds.so
+	dosym ./libfbclient.so /opt/firebird/lib/libgds.so.0
+
+	# we want relative symlinks...
+	rm /usr/lib/libfbclient.so
+	rm /usr/lib/libfbclient.so.1
+	rm /usr/lib/libfbclient.so.1.5.4
+	dosym ../../opt/firebird/lib/libfbclient.so /usr/lib/libfbclient.so
+	dosym ../../opt/firebird/lib/libfbclient.so.1 /usr/lib/libfbclient.so.1
+	dosym ../../opt/firebird/lib/libfbclient.so.1.5.4 /usr/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
+	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() {