[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/, dev-db/firebird/files/

[Patrice Clement]

commit:     a5fb1a9f010c2eba9380baa55b9269add19a61b0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  6 11:50:00 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 11:26:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5fb1a9f

dev-db/firebird: drop awfully broken firebird-2*.

Closes: https://bugs.gentoo.org/639614
Closes: https://github.com/gentoo/gentoo/pull/6467
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-db/firebird/Manifest                           |   1 -
 .../firebird-2.5.1.26351.0-superclassic.patch      |  12 -
 .../files/firebird-2.5.3.26780.0-deps-flags.patch  |  59 -----
 .../files/firebird-2.5.7.27050.0-gcc6.patch        |  35 ---
 dev-db/firebird/files/firebird.conf.d.2.5          |   7 -
 dev-db/firebird/files/firebird.init.d.2.5          |  30 ---
 dev-db/firebird/files/firebird.xinetd              |  11 -
 dev-db/firebird/firebird-2.5.7.27050.0.ebuild      | 282 ---------------------
 dev-db/firebird/metadata.xml                       |   1 -
 9 files changed, 438 deletions(-)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 73ac09fcacf..d2a44ea8aed 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,3 +1,2 @@
-DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 BLAKE2B fbe7af7b5cfa738459df7fd1dba0b897b04f2f6c8244d1f951e18c908c298e91e89b2300677c45834103e5215856341f673040b80b761921e68b1dc05381938b SHA512 793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327
 DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 BLAKE2B 58afbdb430adb5f9aafe33d5459fb4fe8607e9440b6b114291777e43d447a7a5b5696c9f5903a10b63217a15836ce6386569e636369e37bf83195ec0b96e4fc6 SHA512 5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
 DIST ib_b60_doc.zip 10530848 BLAKE2B b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a

diff --git a/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch b/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch
deleted file mode 100644
index 3891cc776fa..00000000000
--- a/dev-db/firebird/files/firebird-2.5.1.26351.0-superclassic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur orig/builds/posix/Makefile.in.firebird builds/posix/Makefile.in.firebird
---- orig/builds/posix/Makefile.in.firebird	2010-11-09 12:42:45.000000000 -0500
-+++ builds/posix/Makefile.in.firebird	2011-03-07 20:26:56.612573632 -0500
-@@ -332,7 +332,7 @@
- .PHONY: libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql 
- .PHONY: embed_gpre embed_util
- 
--classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql \
-+classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed fbserver fb_smp_server embed_gfix embed_gbak embed_isql \
- 	embed_gpre libfbclient embed_util embed_gdef embed_qli embed_fbudf $(PLAT_CLASSIC_POST_TARGET)
- 
- libfbembed:

diff --git a/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch b/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch
deleted file mode 100644
index 506a6c07a79..00000000000
--- a/dev-db/firebird/files/firebird-2.5.3.26780.0-deps-flags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird
---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird	2011-03-28 15:10:09.814370706 -0400
-@@ -158,7 +158,7 @@
- # some complications particularly for super in needing to start the server
- # that you are currently building. MOD 28-July-2002
- 
--firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets
-+firebird_basic: firebird_boot basic_targets
- 
- firebird_boot: updateBuildNum boot_phase1 boot_phase2 
- 
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults
---- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults	2011-03-28 15:21:26.904370708 -0400
-@@ -138,7 +138,7 @@
- AR=			ar @AR_OPTIONS@ crsu
- LN=			@LN_S@
- RANLIB=			@RANLIB@
--BTYACC=$(ROOT)/extern/btyacc/btyacc
-+BTYACC=/usr/bin/btyacc
- 
- CC =	@CC@
- CXX =	@CXX@
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux
---- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux	2011-03-25 21:38:29.031037374 -0400
-@@ -18,11 +18,10 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
- 
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
-+COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- 
--PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
- 
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64
---- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64	2011-03-25 21:39:15.134370707 -0400
-@@ -18,12 +18,11 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
- 
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer 
-+COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- CXXFLAGS:= $(CXXFLAGS) -fno-rtti
- 
--PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
- 

diff --git a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
deleted file mode 100644
index 312f3576bcc..00000000000
--- a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Bug: https://bugs.gentoo.org/608294
-PR: https://github.com/FirebirdSQL/firebird/pull/104
-
---- a/src/common/classes/alloc.h
-+++ b/src/common/classes/alloc.h
-@@ -498,10 +498,14 @@ using Firebird::MemoryPool;
-
- inline static MemoryPool* getDefaultMemoryPool() { return Firebird::MemoryPool::processMemoryPool; }
-
-+#if (( ! __GNUC__ ) || ( __GNUC__ < 6 ))
-+
- // Global versions of operators new and delete
- void* operator new(size_t s) THROW_BAD_ALLOC;
- void* operator new[](size_t s) THROW_BAD_ALLOC;
-
-+#endif
-+
- void operator delete(void* mem) throw();
- void operator delete[](void* mem) throw();
-
---- a/src/dudley/exe.epp
-+++ b/src/dudley/exe.epp
-@@ -2884,9 +2884,9 @@ static USHORT get_prot_mask( const TEXT * relation, TEXT * field)
- 		blr_parameter, 0, 0, 0,
- 		blr_parameter, 0, 1, 0,
- 		blr_parameter, 1, 0, 0,
--		blr_end,
--		blr_end,
--		blr_end,
-+		static_cast<SCHAR>(blr_end),
-+		static_cast<SCHAR>(blr_end),
-+		static_cast<SCHAR>(blr_end),
- 		blr_eoc
- 	};
- 	static FB_API_HANDLE req_handle;

diff --git a/dev-db/firebird/files/firebird.conf.d.2.5 b/dev-db/firebird/files/firebird.conf.d.2.5
deleted file mode 100644
index 625963d0c13..00000000000
--- a/dev-db/firebird/files/firebird.conf.d.2.5
+++ /dev/null
@@ -1,7 +0,0 @@
-FBUSER=firebird
-FBGROUP=firebird
-FIREBIRD=/usr/lib/firebird
-FBGUARD=/usr/sbin/fbguard
-PIDFILE=/var/run/firebird/firebird.pid
-FB_OPTS="-forever -daemon -pidfile $PIDFILE"
-LD_LIBRARY_PATH=/usr/lib/:/usr/lib/firebird/intl/:/usr/lib/firebird/plugins/:/usr/lib/firebird/UDF/

diff --git a/dev-db/firebird/files/firebird.init.d.2.5 b/dev-db/firebird/files/firebird.init.d.2.5
deleted file mode 100644
index 9c9bfb92d60..00000000000
--- a/dev-db/firebird/files/firebird.init.d.2.5
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -d -o $FBUSER "$(dirname $PIDFILE)"
-}
-
-start(){
-	ebegin "Starting Firebird server"
-	start-stop-daemon --start --pidfile $PIDFILE --user $FBUSER --group $FBGROUP --exec $FBGUARD -- $FB_OPTS
-	eend $?
-}
-
-stop(){
-	ebegin "Stopping Firebird server"
-	start-stop-daemon --stop --name fbguard
-	eend $?
-}
-
-restart(){
-	svc_stop
-	sleep 1
-	svc_start
-}
-

diff --git a/dev-db/firebird/files/firebird.xinetd b/dev-db/firebird/files/firebird.xinetd
deleted file mode 100644
index 01fc102ee3a..00000000000
--- a/dev-db/firebird/files/firebird.xinetd
+++ /dev/null
@@ -1,11 +0,0 @@
-service gds_db
-{
-	flags			= REUSE
-	socket_type		= stream
-	wait			= no
-	user			= firebird
-	log_on_success		+= USERID
-	log_on_failure 		+= USERID
-	server			= /usr/bin/fb_inet_server
-	disable			= yes
-}

diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
deleted file mode 100644
index 68a0c71d850..00000000000
--- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic user versionator
-
-MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-
-DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features"
-HOMEPAGE="https://www.firebirdsql.org/"
-SRC_URI="
-	mirror://sourceforge/firebird/${MY_P}.tar.bz2
-	doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug doc examples +superserver xinetd"
-REQUIRED_USE="?? ( superserver xinetd )"
-
-CDEPEND="
-	dev-libs/icu:=
-	dev-libs/libedit
-"
-DEPEND="${CDEPEND}
-	>=dev-util/btyacc-3.0-r2
-	doc? ( app-arch/unzip )
-"
-RDEPEND="${CDEPEND}
-	xinetd? ( virtual/inetd )
-	!sys-cluster/ganglia
-"
-
-RESTRICT="userpriv"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
-}
-
-check_sed() {
-	MSG="sed of $3, required $2 line(s) modified $1"
-	einfo "${MSG}"
-	[[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-src_unpack() {
-	unpack "${MY_P}.tar.bz2"
-	if use doc; then
-		# Unpack docs
-		mkdir "manuals" || die
-		cd "manuals" || die
-		unpack ib_b60_doc.zip
-	fi
-}
-
-src_prepare() {
-	use xinetd || eapply "${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
-
-	default
-
-	# Rename references to isql to fbsql
-	# sed vs patch for portability and addtional location changes
-	check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
-		src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
-	check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
-		-e 's:isql :fbsql :w /dev/stdout' \
-		-e 's:ISQL :FBSQL :w /dev/stdout' \
-		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
-
-	find . -name \*.sh -exec chmod +x {} + || die
-	rm -r extern/{btyacc,editline,icu} || die
-
-	mv configure.in configure.ac || die "failed to mv configure.in configure.ac"
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-	# bug 639614
-	append-cxxflags -flifetime-dse=1 -fno-sized-deallocation -fno-delete-null-pointer-checks
-
-	econf \
-		--prefix=/usr/$(get_libdir)/firebird \
-		$(use_enable superserver) \
-		$(use_enable debug) \
-		--with-editline \
-		--with-system-editline \
-		--with-system-icu \
-		--with-fbbin=/usr/bin \
-		--with-fbsbin=/usr/sbin \
-		--with-fbconf=/etc/${PN} \
-		--with-fblib=/usr/$(get_libdir) \
-		--with-fbinclude=/usr/include \
-		--with-fbdoc=/usr/share/doc/${P} \
-		--with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
-		--with-fbsample=/usr/share/doc/${P}/examples \
-		--with-fbsample-db=/usr/share/doc/${P}/examples/db \
-		--with-fbhelp=/usr/$(get_libdir)/${PN}/help \
-		--with-fbintl=/usr/$(get_libdir)/${PN}/intl \
-		--with-fbmisc=/usr/share/${PN} \
-		--with-fbsecure-db=/etc/${PN} \
-		--with-fbmsg=/usr/$(get_libdir)/${PN} \
-		--with-fblog=/var/log/${PN}/ \
-		--with-fbglock=/var/run/${PN} \
-		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins \
-		--with-gnu-ld \
-		${myconf}
-}
-
-src_compile() {
-	MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
-	emake
-}
-
-src_install() {
-	cd "gen/${PN}" || die
-
-	if use doc; then
-		dodoc "${S}"/doc/*.pdf
-		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
-	fi
-
-	doheader include/*
-
-	rm lib/libfbstatic.a || die "failed to remove libfbstatic.a"
-
-	insinto /usr/$(get_libdir)
-	dolib.so lib/*.so*
-
-	# links for backwards compatibility
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so
-	dosym libfbclient.so /usr/$(get_libdir)/libgds.so.0
-	dosym libfbclient.so /usr/$(get_libdir)/libfbclient.so.1
-
-	insinto /usr/$(get_libdir)/${PN}
-	doins *.msg
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
-
-	local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat nbackup qli"
-	for bin in ${bins}; do
-		dobin bin/${bin}
-	done
-
-	dosbin bin/fb_lock_print
-	# SuperServer
-	if use superserver ; then
-		dosbin bin/{fbguard,fbserver}
-	# ClassicServer
-	elif use xinetd ; then
-		dosbin bin/fb_inet_server
-	# SuperClassic
-	else
-		dosbin bin/{fbguard,fb_smp_server}
-
-		#Temp should not be necessary, need to patch/fix
-		dosym ../../libib_util.so /usr/$(get_libdir)/${PN}/lib/libib_util.so
-	fi
-
-	exeinto /usr/bin/${PN}
-	exeopts -m0755
-	doexe bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-
-	insinto /usr/$(get_libdir)/${PN}/help
-	doins help/help.fdb
-
-	exeinto /usr/$(get_libdir)/firebird/intl
-	dolib.so intl/libfbintl.so
-	dosym ../../libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
-	dosym libfbintl.so /usr/$(get_libdir)/libfbintl.so.1
-	dosym /etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
-
-	exeinto /usr/$(get_libdir)/${PN}/plugins
-	dolib.so plugins/libfbtrace.so
-	dosym ../../libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
-	dosym libfbtrace.so /usr/$(get_libdir)/libfbtrace.so.0
-
-	exeinto /usr/$(get_libdir)/${PN}/UDF
-	doexe UDF/*.so
-
-	insinto /usr/share/${PN}/upgrade
-	doins -r "${S}"/src/misc/upgrade/v2/*
-
-	insinto /etc/${PN}
-	insopts -m0644 -o firebird -g firebird
-	doins ../install/misc/*.conf
-	insopts -m0660 -o firebird -g firebird
-	doins security2.fdb
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd" ${PN}
-	else
-		newinitd "${FILESDIR}/${PN}.init.d.2.5" ${PN}
-		newconfd "${FILESDIR}/${PN}.conf.d.2.5" ${PN}
-		fperms 640 /etc/conf.d/${PN}
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-	fperms 0644 /etc/logrotate.d/${PN}
-
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/${PN}
-	keepdir /var/log/${PN}
-
-	use examples && docinto examples
-}
-
-pkg_postinst() {
-	# Hack to fix ownership/perms
-	chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
-	chmod 750 "${ROOT}/etc/${PN}"
-}
-
-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" || die
-		fi
-		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk" || die
-		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb" || die
-		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old" || die
-		rm "${ROOT}/etc/firebird/security.gbk" || die
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}" || die
-		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}" || die
-
-		echo
-		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)."
-		echo
-	fi
-
-	# we need to enable local access to the server
-	if [[ ! -f "${ROOT}/etc/hosts.equiv" ]] ; then
-		touch "${ROOT}/etc/hosts.equiv" || die
-		chown root:0 "${ROOT}/etc/hosts.equiv" || die
-		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv" || die
-	fi
-
-	# add 'localhost.localdomain' to the hosts.equiv file...
-	if grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" ; then
-		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv" || die
-		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" ; then
-		echo "localhost" >> "${ROOT}/etc/hosts.equiv" || die
-		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" ; then
-		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv" || die
-		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /usr/$(get_libdir)/firebird/UDF"
-}

diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index a6eba6edad0..dfb6ac14cec 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -9,7 +9,6 @@
 	in production systems, under a variety of names, since 1981.
 	</longdescription>
 	<use>
-		<flag name="superserver">Install SuperServer</flag>
 		<flag name="server">Install the server components of Firebird, not just the client</flag>
 		<flag name="xinetd">Install ClassicServer</flag>
 	</use>