clean old ebuilds

Package-Manager: portage-2.1.8.3/cvs/Linux i686

6 files changed, 7 insertions, 1107 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index bed9f6bbd23b..d62e0e240f5c 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/firebird
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.102 2010/06/16 19:25:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.103 2010/07/20 18:21:50 mr_bones_ Exp $
+
+  20 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  -firebird-2.0.3.12981.0-r7.ebuild, -firebird-2.0.4.13130.1.ebuild,
+  -firebird-2.1.1.17910.0.ebuild, -firebird-2.1.2.18118.0.ebuild:
+  clean old ebuilds
 
   16 Jun 2010; Patrick Lauer <patrick@gentoo.org>
   firebird-2.0.3.12981.0-r6.ebuild, firebird-2.0.3.12981.0-r7.ebuild,
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 129cf1c2f98d..d4e19041b48d 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -15,16 +15,9 @@ AUX firebird.conf.d.2 105 RMD160 a047ffded75ed5f055949993fd794941eee8fe25 SHA1 d
 AUX firebird.init.d 692 RMD160 fd32d3ca38f149df1c6c46697a9c043b22bf25dd SHA1 379f3dd8e768e958ab3faff203d0d7a502c8f120 SHA256 7602d5030abaa7414cbe10f3223c38861742807bbe92f9af5693d28520398f6e
 AUX firebird.xinetd.2 199 RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 SHA1 1186bbc61ecd17adeb598442d78abfaa3ac54194 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48
 DIST Firebird-2.0.3.12981-0.tar.bz2 12623689 RMD160 6a1139b30a77070e6e74bdaebc5d9bdd52e32509 SHA1 8b6134ad1910ae0677e93c84279132f6c67e7862 SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e
-DIST Firebird-2.0.4.13130-1.tar.bz2 12679867 RMD160 997fcbd5d76ed11ce4f4ac9c1597bc72568ff5c6 SHA1 27af200f5c040ec084495693489d4ac71136c595 SHA256 e2e3bcdcc62f6dbdf0faecd4dd0d43ef41e94d731d485a9c4f0957f631b99bfa
-DIST Firebird-2.1.1.17910-0.tar.bz2 13457410 RMD160 ff4225438983a0c24da3a6b4df54de2cc40aac3f SHA1 122493f35b733b24047163f83724a6a271d4beb7 SHA256 6581286f57eba1494599cfb09a18e56970a45f03f2cd490a947e96874a57b645
-DIST Firebird-2.1.2.18118-0.tar.bz2 13485341 RMD160 37a35600092758715b4d1f82d728fa2e87f8c2de SHA1 1f2528af1804eb09f06f8cfa1d97b9643af181ef SHA256 91cb30a744c6d1e05a259ca97acc1f24d20e478ac37b7130e0675f209b3ec6e3
 DIST Firebird-2.1.3.18185-0.tar.bz2 13770360 RMD160 af9ae88f8a8152ffeb7d128f009436b06e28c07f SHA1 1504e4a579d9020bd47470ae54c67490ad13f032 SHA256 8047cbd4bdc79928be7369bf0cdfde74873f1de29c0ac74e7241826c02f0fd28
 DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d
 EBUILD firebird-2.0.3.12981.0-r6.ebuild 9996 RMD160 45e38ad5115b01a2f90b8a6b2a6871509830d960 SHA1 8dd4b923a93b92d1d61f248f41c3230f0a36adbc SHA256 dc135be695e8f5fff58899c39aa85237891965dc9c77c4281ac86bbbddf28d6c
-EBUILD firebird-2.0.3.12981.0-r7.ebuild 9966 RMD160 45f2678edb38e4b63003bb5f3e274b49c2453eb0 SHA1 187fa26e44935734db518f52f3f5a6dca47ba356 SHA256 b79a8948981878686c6d0193e68a62c40803392e938534650e8ff64ea4935ff6
-EBUILD firebird-2.0.4.13130.1.ebuild 9789 RMD160 7cd43f74abe7adbe043585fa9b1462a7b9943c5a SHA1 8241eb9192dd1e54f7e00518efe234c9c66bfe21 SHA256 b9955646f7711d9179ed9e98998253f9e0c2e0be9fc011851fa0930c2a44b5ab
-EBUILD firebird-2.1.1.17910.0.ebuild 10236 RMD160 23f4d64d6f177bf37499cc8b4e08940175505314 SHA1 50686015b08e3ce6a3fc7576aedbff0fe5709392 SHA256 d12be2809db988536aafc0c7af538849034eb01ba22ea413036d8d24c753656b
-EBUILD firebird-2.1.2.18118.0.ebuild 10236 RMD160 6e2fe7ef5988fa9c71eb35790e631dfcf672a0ad SHA1 5334b0e53b154cc1dad69aac6f2bbba2acc0715b SHA256 796e9e7289733ec10404e0c62c35305333b05903102aee31002d88b3d88f72d4
 EBUILD firebird-2.1.3.18185.0.ebuild 10266 RMD160 a816e0cf73e27aaecd74e1dd4a07f9b0a45252d8 SHA1 88fc465b2dab15bc8de1ddd10522b12c1ae05c7a SHA256 defcca6e5382a1646136a5b7b42d147f365f4a60d0f7e25e7808e21f2b6d7141
-MISC ChangeLog 22628 RMD160 e23fe4a5b723b2ab232a164deb2488e91736a19d SHA1 fd6ce4a8fee3f89702879cac783425648086f309 SHA256 dd5b04ac4ec0c6ee7a9b4524802723e131e55f4eb8f8aea0575807ccce379801
+MISC ChangeLog 22841 RMD160 52bad5f2bf2cc2531febfc3b0dbfe5b03c0858d5 SHA1 76b3e141700bdd5771b18a5c46f07e0a5556638a SHA256 7d55dd9c7fda4aa85e55755d8a37f0334d500eec8082dd7324c4efb560ec9ea8
 MISC metadata.xml 619 RMD160 098761b0ad299b3c7bf0d3b59b9ebe2cf01cc145 SHA1 ef2a0fbd0a8b21692ae1a2a12e8b0ce7222fff9f SHA256 6b01dc565960c0345d81dafc9775196f4bc719eb925ea94c6b0a0c20e195e9e8
diff --git a/dev-db/firebird/firebird-2.0.3.12981.0-r7.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r7.ebuild
deleted file mode 100644
index 45693a667b53..000000000000
--- a/dev-db/firebird/firebird-2.0.3.12981.0-r7.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r7.ebuild,v 1.3 2010/06/16 19:25:44 patrick Exp $
-
-inherit flag-o-matic eutils autotools versionator multilib
-
-MY_P=Firebird-$(replace_version_separator 4 -)
-
-DESCRIPTION="A relational database offering many ANSI SQL-99 features"
-HOMEPAGE="http://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 -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 )
-	!sys-cluster/ganglia"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
-}
-
-function check_sed() {
-	MSG="sed of $3, required $2 lines modified $1"
-	einfo "${MSG}"
-	[[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-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"
-
-	# compile time relative path hacks, ew :(
-	mkdir -p "${WORKDIR}/../etc" \
-		"${WORKDIR}/usr" \
-		"${WORKDIR}/var/log/firebird" \
-		"${WORKDIR}/var/run/firebird"
-	cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin"
-	cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird
-
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-CVE-2008-0387.patch"
-	epatch "${FILESDIR}/${P}-CVE-2008-0467.patch"
-	epatch "${FILESDIR}/${P}-external-libs.patch"
-	epatch "${FILESDIR}/${P}-flags.patch"
-	epatch "${FILESDIR}/${P}-make-deps.patch"
-
-	einfo "Split up Firebird via relative path hacks"
-	# sed vs patch for portability and addtional location changes
-	# based on FIREBIRD=/usr/lib/firebird
-	check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \
-		src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \
-		-e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \
-		-e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \
-		-e 's:"isc_config:"../../../var/run/firebird/isc_config:w /dev/stdout' \
-		-e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \
-		-e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \
-		-e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/jrd/file_params.h | wc -l)" "14" "src/jrd/file_params.h" # 14 lines
-	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line
-	check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
-		src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \
-		-e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \
-		-e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \
-		-e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \
-		-e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \
-		-e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \
-		-e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \
-		-e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \
-		-e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \
-		src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines
-	check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \
-		src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line
-	check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
-		src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \
-		src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \
-		src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line
-	check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \
-		src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line
-
-	# Rename references to isql to fbsql
-	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/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		-e 's:ISQL :FBSQL :w /dev/stdout' \
-		src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.sql" # 4 lines
-
-	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
-	rm -rf "${S}"/extern/{editline,icu}
-
-	eautoreconf
-}
-
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	econf --prefix=/usr/$(get_libdir)/firebird --with-editline \
-		$(use_enable !xinetd superserver) \
-		$(use_enable debug) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "error during make"
-}
-
-src_install() {
-	cd "${S}/gen/firebird"
-
-# Seems to be ignored?
-	insinto /usr/share/firebird/bin
-	dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-	rm bin/*.sh || die "Could not remove *sh files"
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql
-
-	insinto /usr/bin
-	dobin bin/*
-
-	insinto /usr/include
-	doins include/*
-
-	insinto /usr/$(get_libdir)
-	dolib.so lib/*.so*
-	dolib.a lib/*.a*
-
-	insinto /usr/$(get_libdir)/firebird
-	doins *.msg
-
-	insinto /usr/$(get_libdir)/firebird/help
-	doins help/help.fdb
-
-	insinto /usr/share/firebird/upgrade
-	doins "${S}"/src/misc/upgrade/v2/*
-
-	insinto /etc/firebird
-	insopts -m0644 -o firebird -g firebird
-	doins misc/*
-	doins ../install/misc/aliases.conf
-	insopts -m0660 -o firebird -g firebird
-	doins security2.fdb
-
-	exeinto /usr/$(get_libdir)/firebird/UDF
-	doexe UDF/*.so
-
-	exeinto /usr/$(get_libdir)/firebird/intl
-	newexe intl/libfbintl.so fbintl.so
-
-	insinto /usr/$(get_libdir)/firebird/intl
-	doins ../install/misc/fbintl.conf
-
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/firebird
-	dodir /var/run/firebird
-	keepdir /var/log/firebird
-	keepdir /var/run/firebird
-
-	# create links for backwards compatibility
-	cd "${D}/usr/$(get_libdir)"
-	ln -s libfbclient.so libgds.so
-	ln -s libfbclient.so libgds.so.0
-	ln -s libfbclient.so libfbclient.so.1
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
-	else
-		newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-		newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-		fperms 640 /etc/conf.d/${PN}
-	fi
-
-	# Install docs
-	use doc && dodoc "${WORKDIR}"/manuals/*
-	use examples && docinto examples
-}
-
-pkg_postinst() {
-	# Hack to fix ownership/perms
-	chown -fR firebird:firebird "${ROOT}/etc/firebird" \
-		"${ROOT}/usr/$(get_libdir)/firebird"
-	chmod 750 "${ROOT}/etc/firebird"
-
-	elog
-	elog "Firebird is no longer installed in /opt. Binaries are in"
-	elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
-	elog "are in /var/log/firebird, and lock files in /var/run/firebird"
-	elog "The command line tool isql has been renamed to fbsql."
-	elog "Please report any problems or issues to bugs.gentoo.org."
-	elog
-}
-
-pkg_config() {
-	# if found /etc/security.gdb from previous install, backup, and restore as
-	# /etc/security2.fdb
-	if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
-		# if we have scurity2.fdb already, back it 1st
-		if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
-			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
-		fi
-		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
-		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
-		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
-		rm "${ROOT}/etc/firebird/security.gbk"
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
-		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
-
-		einfo
-		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
-		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
-		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
-		einfo
-	fi
-
-	# we need to enable local access to the server
-	if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
-		touch "${ROOT}/etc/hosts.equiv"
-		chown root:0 "${ROOT}/etc/hosts.equiv"
-		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost.localdomain' to the hosts.equiv file...
-	if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost' to the hosts.equiv file...
-	if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /usr/lib/firebird/UDF"
-}
diff --git a/dev-db/firebird/firebird-2.0.4.13130.1.ebuild b/dev-db/firebird/firebird-2.0.4.13130.1.ebuild
deleted file mode 100644
index 81e3231fdd31..000000000000
--- a/dev-db/firebird/firebird-2.0.4.13130.1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.4.13130.1.ebuild,v 1.3 2010/06/16 19:25:44 patrick Exp $
-
-inherit flag-o-matic eutils autotools versionator multilib
-
-MY_P=Firebird-$(replace_version_separator 4 -)
-
-DESCRIPTION="A relational database offering many ANSI SQL-99 features"
-HOMEPAGE="http://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 -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 )
-	!sys-cluster/ganglia"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /usr/$(get_libdir)/firebird firebird
-}
-
-function check_sed() {
-	MSG="sed of $3, required $2 lines modified $1"
-	einfo "${MSG}"
-	[[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-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"
-
-	# compile time relative path hacks, ew :(
-	mkdir -p "${WORKDIR}/../etc" \
-		"${WORKDIR}/usr" \
-		"${WORKDIR}/var/log/firebird" \
-		"${WORKDIR}/var/run/firebird"
-	cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin"
-	cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird
-
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-deps-flags-libs.patch"
-
-	einfo "Split up Firebird via relative path hacks"
-	# sed vs patch for portability and addtional location changes
-	# based on FIREBIRD=/usr/lib/firebird
-	check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \
-		src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \
-		-e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \
-		-e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \
-		-e 's:"isc_config:"../../../var/run/firebird/isc_config:w /dev/stdout' \
-		-e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \
-		-e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \
-		-e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/jrd/file_params.h | wc -l)" "14" "src/jrd/file_params.h" # 14 lines
-	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line
-	check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
-		src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \
-		-e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \
-		-e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \
-		-e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \
-		-e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \
-		-e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \
-		-e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \
-		-e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \
-		-e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \
-		src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines
-	check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \
-		src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line
-	check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
-		src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \
-		src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \
-		src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line
-	check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \
-		src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line
-
-	# Rename references to isql to fbsql
-	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/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines
-	check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
-		-e 's:ISQL :FBSQL :w /dev/stdout' \
-		src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.sql" # 4 lines
-
-	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
-	rm -rf "${S}"/extern/{editline,icu}
-
-	eautoreconf
-}
-
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	econf --prefix=/usr/$(get_libdir)/firebird --with-editline \
-		$(use_enable !xinetd superserver) \
-		$(use_enable debug) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "error during make"
-}
-
-src_install() {
-	cd "${S}/gen/firebird"
-
-# Seems to be ignored?
-	insinto /usr/share/firebird/bin
-	dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-	rm bin/*.sh || die "Could not remove *sh files"
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql
-
-	insinto /usr/bin
-	dobin bin/*
-
-	insinto /usr/include
-	doins include/*
-
-	insinto /usr/$(get_libdir)
-	dolib.so lib/*.so*
-	dolib.a lib/*.a*
-
-	insinto /usr/$(get_libdir)/firebird
-	doins *.msg
-
-	insinto /usr/$(get_libdir)/firebird/help
-	doins help/help.fdb
-
-	insinto /usr/share/firebird/upgrade
-	doins "${S}"/src/misc/upgrade/v2/*
-
-	insinto /etc/firebird
-	insopts -m0644 -o firebird -g firebird
-	doins misc/*
-	doins ../install/misc/aliases.conf
-	insopts -m0660 -o firebird -g firebird
-	doins security2.fdb
-
-	exeinto /usr/$(get_libdir)/firebird/UDF
-	doexe UDF/*.so
-
-	exeinto /usr/$(get_libdir)/firebird/intl
-	newexe intl/libfbintl.so fbintl.so
-
-	insinto /usr/$(get_libdir)/firebird/intl
-	doins ../install/misc/fbintl.conf
-
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/firebird
-	dodir /var/run/firebird
-	keepdir /var/log/firebird
-	keepdir /var/run/firebird
-
-	# create links for backwards compatibility
-	cd "${D}/usr/$(get_libdir)"
-	ln -s libfbclient.so libgds.so
-	ln -s libfbclient.so libgds.so.0
-	ln -s libfbclient.so libfbclient.so.1
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
-	else
-		newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-		newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-		fperms 640 /etc/conf.d/${PN}
-	fi
-
-	# Install docs
-	use doc && dodoc "${WORKDIR}"/manuals/*
-	use examples && docinto examples
-}
-
-pkg_postinst() {
-	# Hack to fix ownership/perms
-	chown -fR firebird:firebird "${ROOT}/etc/firebird" \
-		"${ROOT}/usr/$(get_libdir)/firebird"
-	chmod 750 "${ROOT}/etc/firebird"
-
-	elog
-	elog "Firebird is no longer installed in /opt. Binaries are in"
-	elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
-	elog "are in /var/log/firebird, and lock files in /var/run/firebird"
-	elog "The command line tool isql has been renamed to fbsql."
-	elog "Please report any problems or issues to bugs.gentoo.org."
-	elog
-}
-
-pkg_config() {
-	# if found /etc/security.gdb from previous install, backup, and restore as
-	# /etc/security2.fdb
-	if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
-		# if we have scurity2.fdb already, back it 1st
-		if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
-			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
-		fi
-		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
-		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
-		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
-		rm "${ROOT}/etc/firebird/security.gbk"
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
-		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
-
-		einfo
-		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
-		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
-		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
-		einfo
-	fi
-
-	# we need to enable local access to the server
-	if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
-		touch "${ROOT}/etc/hosts.equiv"
-		chown root:0 "${ROOT}/etc/hosts.equiv"
-		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost.localdomain' to the hosts.equiv file...
-	if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost' to the hosts.equiv file...
-	if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /usr/lib/firebird/UDF"
-}
diff --git a/dev-db/firebird/firebird-2.1.1.17910.0.ebuild b/dev-db/firebird/firebird-2.1.1.17910.0.ebuild
deleted file mode 100644
index 0bd510f160c7..000000000000
--- a/dev-db/firebird/firebird-2.1.1.17910.0.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.1.17910.0.ebuild,v 1.5 2010/06/16 19:25:44 patrick Exp $
-
-inherit flag-o-matic eutils autotools versionator
-
-MY_P=Firebird-$(replace_version_separator 4 -)
-#MY_P=Firebird-${PV/_rc/-ReleaseCandidate}
-
-DESCRIPTION="A relational database offering many ANSI SQL-99 features"
-HOMEPAGE="http://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 -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 )
-	!sys-cluster/ganglia"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /usr/lib/firebird firebird
-}
-
-function check_sed() {
-	MSG="sed of $3, required $2 lines modified $1"
-	einfo "${MSG}"
-	[[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-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"
-
-	# compile time relative path hacks, ew :(
-	mkdir -p "${WORKDIR}/../etc" \
-		"${WORKDIR}/usr" \
-		"${WORKDIR}/var/log/firebird" \
-		"${WORKDIR}/var/run/firebird"
-	cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin"
-	cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird
-
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-deps-flags-libs.patch"
-
-	einfo "Split up Firebird via relative path hacks"
-	# sed vs patch for portability and addtional location changes
-	# based on FIREBIRD=/usr/lib/firebird
-	check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \
-		src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \
-		-e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \
-		-e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \
-		-e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \
-		-e 's:"isc_monitor1:"../../../var/run/firebird/isc_monitor1:w /dev/stdout' \
-		-e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \
-		-e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/jrd/file_params.h | wc -l)" "12" "src/jrd/file_params.h" # 12 lines
-	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line
-	check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
-		src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \
-		-e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \
-		-e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \
-		-e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \
-		-e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \
-		-e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \
-		-e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \
-		-e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \
-		-e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \
-		src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines
-	check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \
-		src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line
-	check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
-		src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \
-		src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \
-		src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line
-	check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \
-		src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line
-
-	# Rename references to isql to fbsql
-	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/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines
-	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' \
-		src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.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 "${S}" -name \*.sh -print0 | xargs -0 chmod +x
-	rm -rf "${S}"/extern/{editline,icu}
-
-	epatch "${FILESDIR}/${P}-gcc-icu-declare.patch"
-
-	# allow debug to use valgrind 3.4 (instead of obsolete valgrind 3.3)
-	epatch "${FILESDIR}/${PN}-update-valgrind.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	econf --prefix=/usr/lib/firebird --with-editline \
-		$(use_enable !xinetd superserver) \
-		$(use_enable debug) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "error during make"
-}
-
-src_install() {
-	cd "${S}/gen/firebird"
-
-# Seems to be ignored?
-	insinto /usr/share/firebird/bin
-	dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-	rm bin/*.sh || die "Could not remove *sh files"
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql
-
-	insinto /usr/bin
-	dobin bin/*
-
-	insinto /usr/include
-	doins include/*
-
-	insinto /usr/lib
-	dolib.so lib/*.so*
-	dolib.a lib/*.a*
-
-	insinto /usr/lib/firebird
-	doins *.msg
-
-	insinto /usr/lib/firebird/help
-	doins help/help.fdb
-
-	insinto /usr/share/firebird/upgrade
-	doins "${S}"/src/misc/upgrade/v2/*
-
-	insinto /etc/firebird
-	insopts -m0644 -o firebird -g firebird
-	doins misc/*
-	doins ../install/misc/aliases.conf
-	insopts -m0660 -o firebird -g firebird
-	doins security2.fdb
-
-	exeinto /usr/lib/firebird/UDF
-	doexe UDF/*.so
-
-	exeinto /usr/lib/firebird/intl
-	newexe intl/libfbintl.so fbintl.so
-
-	insinto /usr/lib/firebird/intl
-	doins ../install/misc/fbintl.conf
-
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/firebird
-	dodir /var/run/firebird
-	keepdir /var/log/firebird
-	keepdir /var/run/firebird
-
-	# create links for backwards compatibility
-	cd "${D}/usr/lib"
-	ln -s libfbclient.so libgds.so
-	ln -s libfbclient.so libgds.so.0
-	ln -s libfbclient.so libfbclient.so.1
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
-	else
-		newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-		newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-		fperms 640 /etc/conf.d/${PN}
-	fi
-
-	# Install docs
-	use doc && dodoc "${WORKDIR}"/manuals/*
-	use examples && docinto examples
-}
-
-pkg_postinst() {
-	# Hack to fix ownership/perms
-	chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/lib/firebird"
-	chmod 750 "${ROOT}/etc/firebird"
-
-	elog
-	elog "Firebird is no longer installed in /opt. Binaries are in"
-	elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
-	elog "are in /var/log/firebird, and lock files in /var/run/firebird"
-	elog "The command line tool isql has been renamed to fbsql."
-	elog "Please report any problems or issues to bugs.gentoo.org."
-	elog
-}
-
-pkg_config() {
-	# if found /etc/security.gdb from previous install, backup, and restore as
-	# /etc/security2.fdb
-	if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
-		# if we have scurity2.fdb already, back it 1st
-		if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
-			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
-		fi
-		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
-		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
-		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
-		rm "${ROOT}/etc/firebird/security.gbk"
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
-		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
-
-		einfo
-		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
-		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
-		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
-		einfo
-	fi
-
-	# we need to enable local access to the server
-	if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
-		touch "${ROOT}/etc/hosts.equiv"
-		chown root:0 "${ROOT}/etc/hosts.equiv"
-		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost.localdomain' to the hosts.equiv file...
-	if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost' to the hosts.equiv file...
-	if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /usr/lib/firebird/UDF"
-}
diff --git a/dev-db/firebird/firebird-2.1.2.18118.0.ebuild b/dev-db/firebird/firebird-2.1.2.18118.0.ebuild
deleted file mode 100644
index 6734496f5ea5..000000000000
--- a/dev-db/firebird/firebird-2.1.2.18118.0.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.2.18118.0.ebuild,v 1.3 2010/06/16 19:25:44 patrick Exp $
-
-inherit flag-o-matic eutils autotools versionator
-
-MY_P=Firebird-$(replace_version_separator 4 -)
-#MY_P=Firebird-${PV/_rc/-ReleaseCandidate}
-
-DESCRIPTION="A relational database offering many ANSI SQL-99 features"
-HOMEPAGE="http://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 -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 )
-	!sys-cluster/ganglia"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup firebird 450
-	enewuser firebird 450 /bin/bash /usr/lib/firebird firebird
-}
-
-function check_sed() {
-	MSG="sed of $3, required $2 lines modified $1"
-	einfo "${MSG}"
-	[[ $1 -ge $2 ]] || die "${MSG}"
-}
-
-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"
-
-	# compile time relative path hacks, ew :(
-	mkdir -p "${WORKDIR}/../etc" \
-		"${WORKDIR}/usr" \
-		"${WORKDIR}/var/log/firebird" \
-		"${WORKDIR}/var/run/firebird"
-	cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin"
-	cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird
-
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-deps-flags-libs.patch"
-
-	einfo "Split up Firebird via relative path hacks"
-	# sed vs patch for portability and addtional location changes
-	# based on FIREBIRD=/usr/lib/firebird
-	check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \
-		src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \
-		-e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \
-		-e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \
-		-e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \
-		-e 's:"isc_monitor1:"../../../var/run/firebird/isc_monitor1:w /dev/stdout' \
-		-e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \
-		-e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/jrd/file_params.h | wc -l)" "12" "src/jrd/file_params.h" # 12 lines
-	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line
-	check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
-		src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \
-		-e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \
-		-e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \
-		-e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \
-		-e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \
-		-e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \
-		-e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \
-		-e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \
-		-e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \
-		src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines
-	check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \
-		src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line
-	check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
-		src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
-		src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \
-		src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line
-	check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \
-		src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line
-	check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \
-		src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line
-
-	# Rename references to isql to fbsql
-	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/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines
-	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' \
-		src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.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 "${S}" -name \*.sh -print0 | xargs -0 chmod +x
-	rm -rf "${S}"/extern/{editline,icu}
-
-	epatch "${FILESDIR}/${P}-gcc-icu-declare.patch"
-
-	# allow debug to use valgrind 3.4 (instead of obsolete valgrind 3.3)
-	epatch "${FILESDIR}/${PN}-update-valgrind.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	econf --prefix=/usr/lib/firebird --with-editline \
-		$(use_enable !xinetd superserver) \
-		$(use_enable debug) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "error during make"
-}
-
-src_install() {
-	cd "${S}/gen/firebird"
-
-# Seems to be ignored?
-	insinto /usr/share/firebird/bin
-	dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
-	rm bin/*.sh || die "Could not remove *sh files"
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/fbsql
-
-	insinto /usr/bin
-	dobin bin/*
-
-	insinto /usr/include
-	doins include/*
-
-	insinto /usr/lib
-	dolib.so lib/*.so*
-	dolib.a lib/*.a*
-
-	insinto /usr/lib/firebird
-	doins *.msg
-
-	insinto /usr/lib/firebird/help
-	doins help/help.fdb
-
-	insinto /usr/share/firebird/upgrade
-	doins "${S}"/src/misc/upgrade/v2/*
-
-	insinto /etc/firebird
-	insopts -m0644 -o firebird -g firebird
-	doins misc/*
-	doins ../install/misc/aliases.conf
-	insopts -m0660 -o firebird -g firebird
-	doins security2.fdb
-
-	exeinto /usr/lib/firebird/UDF
-	doexe UDF/*.so
-
-	exeinto /usr/lib/firebird/intl
-	newexe intl/libfbintl.so fbintl.so
-
-	insinto /usr/lib/firebird/intl
-	doins ../install/misc/fbintl.conf
-
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/firebird
-	dodir /var/run/firebird
-	keepdir /var/log/firebird
-	keepdir /var/run/firebird
-
-	# create links for backwards compatibility
-	cd "${D}/usr/lib"
-	ln -s libfbclient.so libgds.so
-	ln -s libfbclient.so libgds.so.0
-	ln -s libfbclient.so libfbclient.so.1
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
-	else
-		newinitd "${FILESDIR}/${PN}.init.d" ${PN}
-		newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
-		fperms 640 /etc/conf.d/${PN}
-	fi
-
-	# Install docs
-	use doc && dodoc "${WORKDIR}"/manuals/*
-	use examples && docinto examples
-}
-
-pkg_postinst() {
-	# Hack to fix ownership/perms
-	chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/lib/firebird"
-	chmod 750 "${ROOT}/etc/firebird"
-
-	elog
-	elog "Firebird is no longer installed in /opt. Binaries are in"
-	elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
-	elog "are in /var/log/firebird, and lock files in /var/run/firebird"
-	elog "The command line tool isql has been renamed to fbsql."
-	elog "Please report any problems or issues to bugs.gentoo.org."
-	elog
-}
-
-pkg_config() {
-	# if found /etc/security.gdb from previous install, backup, and restore as
-	# /etc/security2.fdb
-	if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
-		# if we have scurity2.fdb already, back it 1st
-		if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
-			cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
-		fi
-		gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
-		gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
-		mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
-		rm "${ROOT}/etc/firebird/security.gbk"
-
-		# make sure they are readable only to firebird
-		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
-		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
-
-		einfo
-		einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
-		einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
-		einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
-		einfo
-	fi
-
-	# we need to enable local access to the server
-	if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
-		touch "${ROOT}/etc/hosts.equiv"
-		chown root:0 "${ROOT}/etc/hosts.equiv"
-		chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost.localdomain' to the hosts.equiv file...
-	if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	# add 'localhost' to the hosts.equiv file...
-	if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "localhost" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	HS_NAME=`hostname`
-	if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
-		echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
-		einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
-	fi
-
-	einfo "If you're using UDFs, please remember to move them"
-	einfo "to /usr/lib/firebird/UDF"
-}