Changed inetd USE flag to xinetd, bug #121886. Added doc USE flag

(Portage version: 2.1_pre4-r1)

7 files changed, 320 insertions, 26 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 4ab58705afdb..befb00e3a230 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/firebird
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.41 2006/01/31 23:34:55 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.42 2006/02/11 22:10:46 sekretarz Exp $
+
+*firebird-1.5.3-r1 (11 Feb 2006)
+
+  11 Feb 2006; Karol Wojtaszek <sekretarz@gentoo.org> firebird-1.5.1.ebuild,
+  firebird-1.5.2.ebuild, firebird-1.5.3.ebuild, +firebird-1.5.3-r1.ebuild:
+  Changed inetd USE flag to xinetd, bug #121886. Added doc USE flag handling
+  useful docs from firebird website
 
   31 Jan 2006; Carsten Lohrke <carlo@gentoo.org> firebird-1.5.1.ebuild,
   firebird-1.5.2.ebuild, firebird-1.5.3.ebuild:
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index efc7e9d69372..02f57c7c4f71 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,16 +1,54 @@
-MD5 b4fd7c882b0a39438c5fd74a2ee7a232 ChangeLog 6106
+MD5 7e76780b534ce5158bbb723de1302653 ChangeLog 6406
+RMD160 54e0863d620aec2e6570b311020ae74bb1822dce ChangeLog 6406
+SHA256 83c660777a8abaf8b63546af5bde7b10505a704284dc2490ce83b651399baea7 ChangeLog 6406
 MD5 d3278f869be37481ddde143f5ee98c4a files/70firebird 50
+RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 files/70firebird 50
+SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03 files/70firebird 50
 MD5 d3278f869be37481ddde143f5ee98c4a files/70firebird-1.5.0 50
+RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 files/70firebird-1.5.0 50
+SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03 files/70firebird-1.5.0 50
 MD5 606e690fe61535cc02d7314616e263fb files/digest-firebird-1.5.1 73
+RMD160 8a5c47f819c00653f9ee1afcd7918a5647857ae9 files/digest-firebird-1.5.1 73
+SHA256 290694b1e5f471875fd9a9f7c30467c9ff2b2074319ec914f188a9a454964fe1 files/digest-firebird-1.5.1 73
 MD5 9019505bedbd32c5cec6700c075f3872 files/digest-firebird-1.5.2 73
+RMD160 d7ad3637e5a90855c82358b43028ca2615a33137 files/digest-firebird-1.5.2 73
+SHA256 cc8d726347ba54cb5bbc2087f8131c9ba5ddb8f8910c6fa63305ba68ec558028 files/digest-firebird-1.5.2 73
 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 1247986c0efcccfa87c07e7b8837bd8e files/digest-firebird-1.5.3-r1 756
+RMD160 5591ffdc5c49e9fde2a9533d5b36b56e5535892e files/digest-firebird-1.5.3-r1 756
+SHA256 b10cd10eafd1470748c08113d6bf675227398913f8544154153531e89b8b189c files/digest-firebird-1.5.3-r1 756
 MD5 51a8d891eaaaf720cf57d3d1686735f1 files/firebird-1.5-build.patch 2125
+RMD160 8ca946aea594b5aff1c963cc1cf87a88e950d39b files/firebird-1.5-build.patch 2125
+SHA256 d92063ce40ee359df1662dc4fbb079fa59ec30f0c9924a8942a0e0ceb806df11 files/firebird-1.5-build.patch 2125
 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
 MD5 5bc644b4558c11069e2a946e029d70bb files/firebird-1.5.1-gcc34.patch 5906
+RMD160 7249ee6156044a20fd8b93b870b745587ef5b3ea files/firebird-1.5.1-gcc34.patch 5906
+SHA256 b05be878185ae46564994b700477882fd9a2217546a441099edd1016c8b694ac files/firebird-1.5.1-gcc34.patch 5906
 MD5 c5f5e6bae2cae891269931331e69f1ca files/firebird.conf.d 80
+RMD160 bcee53ba9cde8822f3c4f980e274bc4958a6fc30 files/firebird.conf.d 80
+SHA256 ad4590c1fc81006759ae801086aa73567f82799bad8275c91d7ddb97c26f7f2f files/firebird.conf.d 80
 MD5 19238be258dea758cf3f082df5ae813a files/firebird.init.d 697
+RMD160 eb18c898dcb7d5e86906c7ad78f4ea9210b13b89 files/firebird.init.d 697
+SHA256 6585f1fba391fa49157975cf81ac7922648fc2749e326eac3b9ed571f6c43c83 files/firebird.init.d 697
 MD5 b0d6de21d0e14d41983d440d5675e9d5 files/firebird.xinetd 206
-MD5 825809792b383de164493507889d9828 firebird-1.5.1.ebuild 6498
-MD5 89f51ccacd223420921f6c6463694b17 firebird-1.5.2.ebuild 6505
-MD5 81987b7f4e733ca3f5adff07758ce62d firebird-1.5.3.ebuild 6503
+RMD160 982a38df26c870ba634576f6188683478d2a69da files/firebird.xinetd 206
+SHA256 b129b0653cacd81968986b5514ba78829deeab19972cec18271a6b354247e494 files/firebird.xinetd 206
+MD5 1edda721a758b274e5f2baab16100fde firebird-1.5.1.ebuild 6504
+RMD160 5cca7a8c36fa594ed6cfc3a340282bb96196f3ed firebird-1.5.1.ebuild 6504
+SHA256 a5964d9e53540961eb4522b9b97601294320b0ec27fdabdc6cef198c35d2cbab firebird-1.5.1.ebuild 6504
+MD5 b8ae4663a5cde96c21081a3fbfe350e3 firebird-1.5.2.ebuild 6511
+RMD160 ef9579031aadfaf5b711ed8daac59d2000c96567 firebird-1.5.2.ebuild 6511
+SHA256 9159ae9780bfa86c1658d5afaa3bdea3a888124742d344e3166f53315bf34728 firebird-1.5.2.ebuild 6511
+MD5 f3751fab0fca8cbfb82a7cc416661b67 firebird-1.5.3-r1.ebuild 6939
+RMD160 279f9466773a014bcec430b54aa1d8a4abeacb5a firebird-1.5.3-r1.ebuild 6939
+SHA256 bf0a1de5f02e3bd6edbec877fb5b17337761c8764c40db0cab6d6164827ecbce firebird-1.5.3-r1.ebuild 6939
+MD5 dd9cf2bc3b92c27ea920404507e0552e firebird-1.5.3.ebuild 6509
+RMD160 6358c15560ddea9afb9c0410d0f143a8d09ed84b firebird-1.5.3.ebuild 6509
+SHA256 bbab4c471000b6916c2ada472519af075d1f1f611d3ff0dde80324888a8aecd5 firebird-1.5.3.ebuild 6509
 MD5 70eaf71c2018b87fe06aed9df3799509 metadata.xml 225
+RMD160 7c157805d934c18e77b4ed4ebd28870843ec0b81 metadata.xml 225
+SHA256 d16e8c5dfbf984681d500dad1063583ba0a21e0b73da359178bb87c09d951c9c metadata.xml 225
diff --git a/dev-db/firebird/files/digest-firebird-1.5.3-r1 b/dev-db/firebird/files/digest-firebird-1.5.3-r1
new file mode 100644
index 000000000000..3f2503307191
--- /dev/null
+++ b/dev-db/firebird/files/digest-firebird-1.5.3-r1
@@ -0,0 +1,9 @@
+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 559d005ab6622274f9448687f930393c firebird-1.5.3.4870.tar.bz2 5055973
+RMD160 3833574f8c2d996bfb06b346a5d22a88d9923425 firebird-1.5.3.4870.tar.bz2 5055973
+SHA256 16880405d6e321a70e80c6e6fb4ed8429a692c43b8a7b59a676cf7d2162d2023 firebird-1.5.3.4870.tar.bz2 5055973
+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
index 6278f10b0ba6..d81154da5258 100644
--- a/dev-db/firebird/firebird-1.5.1.ebuild
+++ b/dev-db/firebird/firebird-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.15 2006/01/31 23:34:55 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.1.ebuild,v 1.16 2006/02/11 22:10:46 sekretarz Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,11 +12,11 @@ SRC_URI="mirror://sourceforge/firebird/${P}.${extra_ver}.tar.bz2"
 LICENSE="Interbase-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ia64 sparc x86"
-IUSE="inetd"
+IUSE="xinetd"
 RESTRICT="nouserpriv"
 
 DEPEND="virtual/libc
-	inetd? ( virtual/inetd )"
+	xinetd? ( virtual/inetd )"
 
 S=${WORKDIR}/${P}.${extra_ver}
 
@@ -41,7 +41,7 @@ src_compile() {
 	filter-mfpmath sse
 
 	local myconf="--prefix=/opt/firebird --with-editline"
-	use inetd || myconf="${myconf} --enable-superserver"
+	use xinetd || myconf="${myconf} --enable-superserver"
 
 	NOCONFIGURE=1
 	./autogen.sh ${myconf} || die "couldn't run autogen.sh"
@@ -65,7 +65,7 @@ src_install() {
 	rm -r ${D}/opt/firebird/{README,WhatsNew,doc,misc}
 	rm -r ${D}/opt/firebird/examples
 
-	if use inetd ; then
+	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
@@ -91,7 +91,7 @@ src_install() {
 	chmod a=rx isql
 	chmod a=rx qli
 
-	use inetd && chmod ug=rxs,o= ${D}/opt/firebird/bin/{fb_lock_mgr,gds_drop,fb_inet_server}
+	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}
 
@@ -125,7 +125,7 @@ pkg_postinst() {
 	einfo "   already have (if any)."
 	einfo
 
-	if ! use inetd
+	if ! use xinetd
 	then
 		einfo "3. You've built the stand alone deamon version,"
 		einfo "   SuperServer. If you were using pre 1.5.0 ebuilds"
diff --git a/dev-db/firebird/firebird-1.5.2.ebuild b/dev-db/firebird/firebird-1.5.2.ebuild
index 4fe3ebef93af..e52b3fe324eb 100644
--- a/dev-db/firebird/firebird-1.5.2.ebuild
+++ b/dev-db/firebird/firebird-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.9 2006/01/31 23:34:55 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.2.ebuild,v 1.10 2006/02/11 22:10:46 sekretarz Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,11 +12,11 @@ SRC_URI="mirror://sourceforge/firebird/${P}.${extra_ver}.tar.bz2"
 LICENSE="Interbase-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
-IUSE="inetd"
+IUSE="xinetd"
 RESTRICT="nouserpriv"
 
 DEPEND="virtual/libc
-	inetd? ( virtual/inetd )"
+	xinetd? ( virtual/inetd )"
 
 S=${WORKDIR}/${P}.${extra_ver}
 
@@ -41,7 +41,7 @@ src_compile() {
 	filter-mfpmath sse
 
 	local myconf="--prefix=/opt/firebird --with-editline"
-	use inetd || myconf="${myconf} --enable-superserver"
+	use xinetd || myconf="${myconf} --enable-superserver"
 
 	NOCONFIGURE=1
 	./autogen.sh ${myconf} || die "couldn't run autogen.sh"
@@ -65,7 +65,7 @@ src_install() {
 	rm -r ${D}/opt/firebird/{README,WhatsNew,doc,misc}
 	rm -r ${D}/opt/firebird/examples
 
-	if use inetd ; then
+	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
@@ -91,7 +91,7 @@ src_install() {
 	chmod a=rx isql
 	chmod a=rx qli
 
-	use inetd && chmod ug=rxs,o= ${D}/opt/firebird/bin/{fb_lock_mgr,gds_drop,fb_inet_server}
+	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}
 
@@ -125,7 +125,7 @@ pkg_postinst() {
 	einfo "   already have (if any)."
 	einfo
 
-	if ! use inetd
+	if ! use xinetd
 	then
 		einfo "3. You've built the stand alone deamon version,"
 		einfo "   SuperServer. If you were using pre 1.5.0 ebuilds"
diff --git a/dev-db/firebird/firebird-1.5.3-r1.ebuild b/dev-db/firebird/firebird-1.5.3-r1.ebuild
new file mode 100644
index 000000000000..656e1ab3d346
--- /dev/null
+++ b/dev-db/firebird/firebird-1.5.3-r1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/02/11 22:10:46 sekretarz Exp $
+
+inherit flag-o-matic eutils
+
+extra_ver="4870"
+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/${MY_P}.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"
+
+DEPEND="virtual/libc
+	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}/${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
+		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
+
+	# 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
+
+	# Install docs
+	if use doc; then
+	    dodoc ${DISTDIR}/Firebird-1.5-QuickStart.pdf
+	    dodoc ${WORKDIR}/manuals/*
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "1. If haven't done so already, please run:"
+	einfo
+	einfo "   \"emerge --config =${PF}\""
+	einfo
+	einfo "   to create lockfiles, set permissions and more"
+	einfo
+	einfo "2. Firebird now runs with it's own user. Please remember to"
+	einfo "   set permissions to firebird:firebird on databases you "
+	einfo "   already have (if any)."
+	einfo
+
+	if ! use xinetd
+	then
+		einfo "3. You've built the stand alone deamon version,"
+		einfo "   SuperServer. If you were using pre 1.5.0 ebuilds"
+		einfo "   you're probably have one installed via xinetd. please"
+		einfo "   remember to disable it (usually in /etc/xinetd.d/firebird),"
+		einfo "   since the current one has it's own init script under"
+		einfo "   /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.*}
+
+		einfo
+		einfo "Converted old isc4.gdb to security.fdb, isc4.gdb has been "
+		einfo "renamed to isc4.gdb.old. if you had previous security.fdb, "
+		einfo "it's backed to security.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
+
+	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
+
+	einfo "If you're using UDFs, please remember to move them"
+	einfo "to /opt/firebird/UDF"
+}
diff --git a/dev-db/firebird/firebird-1.5.3.ebuild b/dev-db/firebird/firebird-1.5.3.ebuild
index 7a5c0135477a..29ef039a073e 100644
--- a/dev-db/firebird/firebird-1.5.3.ebuild
+++ b/dev-db/firebird/firebird-1.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.5 2006/01/31 23:34:55 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.3.ebuild,v 1.6 2006/02/11 22:10:46 sekretarz Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,11 +12,11 @@ SRC_URI="mirror://sourceforge/firebird/${P}.${extra_ver}.tar.bz2"
 LICENSE="Interbase-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 sparc x86"
-IUSE="inetd"
+IUSE="xinetd"
 RESTRICT="nouserpriv"
 
 DEPEND="virtual/libc
-	inetd? ( virtual/inetd )"
+	xinetd? ( virtual/inetd )"
 
 S=${WORKDIR}/${P}.${extra_ver}
 
@@ -41,7 +41,7 @@ src_compile() {
 	filter-mfpmath sse
 
 	local myconf="--prefix=/opt/firebird --with-editline"
-	use inetd || myconf="${myconf} --enable-superserver"
+	use xinetd || myconf="${myconf} --enable-superserver"
 
 	NOCONFIGURE=1
 	./autogen.sh ${myconf} || die "couldn't run autogen.sh"
@@ -65,7 +65,7 @@ src_install() {
 	rm -r ${D}/opt/firebird/{README,WhatsNew,doc,misc}
 	rm -r ${D}/opt/firebird/examples
 
-	if use inetd ; then
+	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
@@ -91,7 +91,7 @@ src_install() {
 	chmod a=rx isql
 	chmod a=rx qli
 
-	use inetd && chmod ug=rxs,o= ${D}/opt/firebird/bin/{fb_lock_mgr,gds_drop,fb_inet_server}
+	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}
 
@@ -125,7 +125,7 @@ pkg_postinst() {
 	einfo "   already have (if any)."
 	einfo
 
-	if ! use inetd
+	if ! use xinetd
 	then
 		einfo "3. You've built the stand alone deamon version,"
 		einfo "   SuperServer. If you were using pre 1.5.0 ebuilds"