Clean old; Clean ebuild

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 56 insertions, 335 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index a02532150431..49dbf0935fb2 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/firebird
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.118 2014/12/16 10:14:12 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.119 2015/03/21 14:57:55 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -firebird-2.5.3.26780.0.ebuild,
+  firebird-2.5.3.26780.0-r1.ebuild, metadata.xml:
+  Clean old; Clean ebuild
 
 *firebird-2.5.3.26780.0-r1 (16 Dec 2014)
 
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 9f159ed8ce53..e5898aa30979 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX firebird-2.5.1.26351.0-client.patch 554 SHA256 afc61661c47dbedaac6b4d2582990712c8fbfe907340359c4eae12c4a66d1408 SHA512 dd1a62995b09f56db09b41b3a94bfb476b10018992b24e4cd19fb2ae95b557acb00b6a22c5bb28c4d2364aa424aca3ed717b9e9943e55fe8ef5412037b94c8f1 WHIRLPOOL fbe1281c31cace1cde2aad55f22203940e7c6703d68fee62f256dc7b4d5af54d5d2ec70d53b1c0a2d1584f7fcea05d59da2415160b8ef0fada86f8e21cce6be2
 AUX firebird-2.5.1.26351.0-deps-flags.patch 3025 SHA256 ff6d2c832b9b1705e14ba8f083a65a774742375c9d4588c3a921cb5806d72be2 SHA512 269d44934e0477283190802e887b6ddfe4eaaf44f878ae19ba1e473804163cfb55593cca9a6dc4ef8f86e25a6557383e13939907fdd3406d8469822a4586cb7a WHIRLPOOL 004c905e0029adaec69ae5bed4f6abec17adb616b4bf725f1635f1f13487acea933a8db2777cef46ccf94a4bda3af7c26cc2c3b96568626f2727049ce0abc204
@@ -11,14 +11,25 @@ AUX firebird.logrotate 169 SHA256 462a7273c4881b66d31fe44349aae45d1f7085ff4db848
 AUX firebird.xinetd 199 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 SHA512 4fc963b213e3cb13f1314129a7f5e04c44e3abd3b9cd6b28ea70219e34ecceda24995dc2f1a0a8ea342b016a897726f655604aa2ae6e7035e387d706515d1bfb WHIRLPOOL 4ac8ee679d07329143d9a98fb1acf432876c65695cd188748b3d4a2e4d693817fa6ea759f0e58ca7e75aa6cee8e902b097bcfe4a66715f825bb5379492fa8ad9
 DIST Firebird-2.5.3.26780-0.tar.bz2 13798872 SHA256 0c4b500d189aa9b4c12a7d2cf310a0b770118967c37ebe0edf8581cbcdad7aad SHA512 b8a0bef492d15739ea9a156225ac738687241a11571ce52ee6c644e5017dcff03007945aeb19b0537aadd1de01b339645871ff1905edf41c65679db377c69e98 WHIRLPOOL 0321763e79882dcdd2175191e1cbf6c82d656bb16e5ebd4a3bf0f08c77ee0494f06ffb08205b583c4a9990c33d652ac2fa73683e4c7ccebe900236975c8d60a5
 DIST ib_b60_doc.zip 10530848 SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a WHIRLPOOL 5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f
-EBUILD firebird-2.5.3.26780.0-r1.ebuild 8383 SHA256 ad2d0504a4e0dc679e04cf7fb28cfdf7e64dd4510b117123cfe09fef5003f610 SHA512 9d1a038646d651af9f22cc33808e36e7763fa8328fadb09495ef7c575d34473795b575fd3901f65dc63482c9f76ec29a31c77c8dc2a29abcdc01a849747257b7 WHIRLPOOL ba1e969479d43eb8986990e373482f2543dda9932a6121bc515493fec3a92233e8aed9b042c7cf4afb2168b26a7c8d185e844bd7fcfba7ca972d3fe3bb91e847
-EBUILD firebird-2.5.3.26780.0.ebuild 8380 SHA256 4dbbd68dc4482dda58d647899353cd284267c58b0caea47c3d5ec589ed47f7ce SHA512 f68902ef814cc4a24b8f6cd4e1a5eb00f989ded1799937542787ed39874b69f3009c2c5f7ab32e508a08ab05459bd2d891303a1e384ee091c2dae41d21f5de8b WHIRLPOOL 7e8f8e3ea9745723922fbad9dc4dcd861335459591cfff074777568c2fd4e1963ddd56aff56a03f30015794ed710ebb683f38f3005a4204caa3078afcca52ae9
-MISC ChangeLog 27389 SHA256 65259b897ce1c1edd6a9c01ffa6e9058766cfcf031d3c555c45aea0e048e9171 SHA512 4cb67d17f090dd78924f833329cca438235df21fdf4947852f4ba7838fb671b3873649d6998554fd15fbd8292281c0c135f7694ca592d5cb343ca4dd12076ec0 WHIRLPOOL 601194c0927e6467cfa9a4db4fe0f319151ec655b4874eff6426f69db918efe9adf1516ca290e1f0a1576263a320731489acafeec2cda0431c94d9974dee28f0
-MISC metadata.xml 787 SHA256 6f5285eb2893a24ee779d1b1cf1840d0e34e38d152e65fdcb0244bfa5e6eceaa SHA512 2924fa1236aa39e737fce9d3c937bc8fc78ceaec165f45799bb07851c702a8f7be794907b2b7601abf3cd1a52db841c92403c03ba69626348f6c3bee7cc47a66 WHIRLPOOL 8d7dd3e4c7e4944458bdd5c7dd874d674ba12cb3dc868d0e451c29d1621a311a65519fae725f907060a88ecf792ccef44ec49df10d76d664a490e28cf78edaf0
+EBUILD firebird-2.5.3.26780.0-r1.ebuild 8349 SHA256 5d1e9198b7859bb4da3d4e9a568cbb96cf7736cd6ed8108ac9b68cc2d1662bc7 SHA512 bf97b1ad235f99381f5fcd0abd0f9570c2dbc9087004f6c9825d41338f824e4d1b4e418b06f57df50142418616b63e1209c59d4fa255bfdf67e8de77d3fb295e WHIRLPOOL 65d898bdbead10a2c94c93a25b6e69bc680f77ac03d1191831dcf4e729a9fe214810d286e5200ced5e14edb8109b01c14fc4628fb6aa7e4608bf976695080ac3
+MISC ChangeLog 27544 SHA256 0c1e9fa93d117c0e3d9b74ae4cf3054ad6021cfd2ce282a7b8ded8ef3b659a21 SHA512 11d140f0385e07ba8e57d874eb69d5a564c99f066bf78ecf703658a9f301066b894b53aad95e6b39ca899285d43eb91b551f3bbfe56c3fcb3c610de56e43328a WHIRLPOOL 4df9a1997dc25099591dd28e9b64a4ba25f82195e29ec642b386588e3fbc6a3fad535a529fe80a4397baf028177522c5466d8e2c7bb416409986afe930192fd5
+MISC metadata.xml 804 SHA256 d808eb2ef45124cf6a5b81b892b9062354a5752ce91498372d95a3625ad7ee2b SHA512 e204434a733eb1b2a41306eac93bec1e980913dff58cfa2b883932bfee40c92a1556e8b2acece0868849192496d3d7dda8de481a4e559a0f41e3785928f70ec7 WHIRLPOOL 21ea1ff6546430c0583e4f21cb0c868c7d98aa13e2d4595317e42fa5977d1dbf41fdef6eb4bda469852fcf10a25538c4f561af4d53186d92daef43a3cfe6e465
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlSQBfcACgkQCaWpQKGI+9TftACfTdYggT/CPJ305MtHZ+203e2X
-N/YAn1aGABxW38o//NxNqbvOziSkbXzS
-=VRvk
+iQJ8BAEBCgBmBQJVDYb8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirSLMP/1EBHq9hOuYTQlStUqhRtLmj
+Tp/UQHP1c/TokTWUT3HzRowrAmVHnp4xWbdsx7/9fwd2kpCHpGjWzVJL0NwVBKqG
+Haw2TVnjrx5we3UuNQ17kpnO4UfPb9AOi9GZG4Y47LbnRyx0b/hxwP3sjpMah7SC
+ePyJeb+k09p9Gke6oowa1m42PD86HaCIpmy4AXd7T9D7jkXGCQchG8RfSuGoLrCl
+Q4VQLCnZI8Szp8ni+rkSKzLWfcMMdpgqGJ8ipIbTDZW86dQb9LVZYEweMtmHrXen
+Pnj61QKJGQH3WNmKlc72lff086GHfRUDZiJd+O4ZZc2d3ofri+K+j0HnvzLuUULa
+1yGNcR1vcSgDge75q9Kj2pVb0uWqslsijEkEKMtbxeHp0rpJAaoMNHWfVOxklTFz
+9IVusm1/050apcITdNmprkkSoMgEwe0LlZBI5kahKNJRcc3/OR4b+YHn+TqR8kO3
+uK9/3c/W2pwXR6XIqprsYOug9C98KplPq0usskDhCjMrL1tfnu9+IkdJbrXbVSn0
+0Ur5GLw93ZkePZasMswkYG7eJxy0DXbwk6KRFXbZZAWyiVC44VWRAiWkS7ZPNK9A
+x5fx76odeGIfCgGTf1iMBFy1lzH/Oq5K56U8UvPHD4UPOX1rJs1+/W23LIH3Mp15
+lVpmEz91yAg+Qvdx7Uft
+=zi5D
 -----END PGP SIGNATURE-----
diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild b/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild
index 487da35a9a88..f99ff7a498c0 100644
--- a/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild
+++ b/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild,v 1.1 2014/12/16 10:14:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.3.26780.0-r1.ebuild,v 1.2 2015/03/21 14:57:55 jlec Exp $
 
 EAPI=5
+
 inherit flag-o-matic eutils autotools multilib user readme.gentoo versionator
 
 MY_P=${PN/f/F}-$(replace_version_separator 4 -)
@@ -10,7 +11,8 @@ MY_P=${PN/f/F}-$(replace_version_separator 4 -)
 
 DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features"
 HOMEPAGE="http://www.firebirdsql.org/"
-SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
+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"
@@ -24,21 +26,21 @@ REQUIRED_USE="
 	superserver? ( !xinetd )
 "
 
-RESTRICT="userpriv"
-
-RDEPEND="
+CDEPEND="
 	dev-libs/libedit
 	dev-libs/icu:=
 "
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	>=dev-util/btyacc-3.0-r2
 	doc? ( app-arch/unzip )
 "
-RDEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
 	xinetd? ( virtual/inetd )
 	!sys-cluster/ganglia
 "
 
+RESTRICT="userpriv"
+
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
@@ -53,26 +55,21 @@ function check_sed() {
 }
 
 src_unpack() {
+	unpack "${MY_P}.tar.bz2"
 	if use doc; then
 		# Unpack docs
-		mkdir "${WORKDIR}/manuals"
-		cd "${WORKDIR}/manuals"
+		mkdir "${WORKDIR}/manuals" && cd "${WORKDIR}/manuals" || die
 		unpack ib_b60_doc.zip
-		cd "${WORKDIR}"
 	fi
-	unpack "${MY_P}.tar.bz2"
-	cd "${S}"
 }
 
 src_prepare() {
 	# This patch might be portable, and not need to be duplicated per version
 	# also might no longer be necessary to patch deps or libs, just flags
-	epatch "${FILESDIR}/${PN}-2.5.3.26780.0-deps-flags.patch"
+	epatch "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
 
-	use client && epatch "${FILESDIR}/${PN}-2.5.1.26351.0-client.patch"
-	if ! use superserver ; then
-		epatch "${FILESDIR}/${PN}-2.5.1.26351.0-superclassic.patch"
-	fi
+	use client && epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-client.patch
+	use superserver || epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
 
 	# Rename references to isql to fbsql
 	# sed vs patch for portability and addtional location changes
@@ -85,8 +82,8 @@ src_prepare() {
 		-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/{btyacc,editline,icu}
+	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x || die
+	rm -rf "${S}"/extern/{btyacc,editline,icu} || die
 
 	eautoreconf
 }
@@ -129,15 +126,14 @@ src_compile() {
 }
 
 src_install() {
-	cd "${S}/gen/${PN}"
+	cd "${S}/gen/${PN}" || die
 
 	if use doc; then
 		dodoc "${S}"/doc/*.pdf
 		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
 	fi
 
-	insinto /usr/include
-	doins include/*
+	doheader include/*
 
 	rm lib/libfbstatic.a
 
@@ -253,11 +249,11 @@ pkg_config() {
 		chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
 		chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
 
-		einfo
+		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)."
-		einfo
+		echo
 	fi
 
 	# we need to enable local access to the server
diff --git a/dev-db/firebird/firebird-2.5.3.26780.0.ebuild b/dev-db/firebird/firebird-2.5.3.26780.0.ebuild
deleted file mode 100644
index b55200611847..000000000000
--- a/dev-db/firebird/firebird-2.5.3.26780.0.ebuild
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.5.3.26780.0.ebuild,v 1.1 2014/12/11 11:51:32 pacho Exp $
-
-EAPI=5
-inherit flag-o-matic eutils autotools multilib user readme.gentoo versionator
-
-MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
-
-DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 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 client superserver xinetd examples debug"
-REQUIRED_USE="
-	client? ( !superserver )
-	client? ( !xinetd )
-	superserver? ( !xinetd )
-"
-
-RESTRICT="userpriv"
-
-RDEPEND="
-	dev-libs/libedit
-	dev-libs/icu:=
-"
-DEPEND="${RDEPEND}
-	>=dev-util/btyacc-3.0-r2
-	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"
-	cd "${S}"
-}
-
-src_prepare() {
-	# This patch might be portable, and not need to be duplicated per version
-	# also might no longer be necessary to patch deps or libs, just flags
-	epatch "${FILESDIR}/${PN}-2.5.1.26351.0-deps-flags.patch"
-
-	use client && epatch "${FILESDIR}/${PN}-2.5.1.26351.0-client.patch"
-	if ! use superserver ; then
-		epatch "${FILESDIR}/${PN}-2.5.1.26351.0-superclassic.patch"
-	fi
-
-	# 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 "${S}" -name \*.sh -print0 | xargs -0 chmod +x
-	rm -rf "${S}"/extern/{btyacc,editline,icu}
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	econf \
-		--prefix=/usr/$(get_libdir)/firebird \
-		$(use_enable superserver 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 "${S}/gen/${PN}"
-
-	if use doc; then
-		dodoc "${S}"/doc/*.pdf
-		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
-	fi
-
-	insinto /usr/include
-	doins include/*
-
-	rm lib/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
-
-	use client && return
-
-	einfo "Renaming isql -> fbsql"
-	mv bin/isql bin/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 "${D}"/usr/$(get_libdir)/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 "${D}"/usr/$(get_libdir)/libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
-	dosym "${D}"/etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
-
-	exeinto /usr/$(get_libdir)/${PN}/plugins
-	dolib.so plugins/libfbtrace.so
-	dosym "${D}"/usr/$(get_libdir)/libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
-
-	exeinto /usr/$(get_libdir)/${PN}/UDF
-	doexe UDF/*.so
-
-	insinto /usr/share/${PN}/upgrade
-	doins "${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}
-
-	diropts -m 755 -o firebird -g firebird
-	dodir /var/log/${PN}
-	dodir /var/run/${PN}
-	keepdir /var/log/${PN}
-	keepdir /var/run/${PN}
-
-	use examples && docinto examples
-}
-
-pkg_postinst() {
-	use client && return
-
-	# Hack to fix ownership/perms
-	chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
-	chmod 750 "${ROOT}/etc/${PN}"
-}
-
-pkg_config() {
-	use client && return
-
-	# 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/metadata.xml b/dev-db/firebird/metadata.xml
index 18201c9b1e3d..2037a1b004ff 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
-	<longdescription>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription>
 	Firebird is a relational database offering many ANSI SQL standard 
 	features that runs on Linux, Windows, and a variety of Unix platforms.
 	Firebird offers excellent concurrency, high performance, and powerful
 	language support for stored procedures and triggers. It has been used
 	in production systems, under a variety of names, since 1981.
 	</longdescription>
-	<use>
-		<flag name='client'>Install client library and header files only</flag>
-		<flag name='superserver'>Install SuperServer</flag>
-		<flag name='xinetd'>Install ClassicServer</flag>
-	</use>
+  <use>
+    <flag name="client">Install client library and header files only</flag>
+    <flag name="superserver">Install SuperServer</flag>
+    <flag name="xinetd">Install ClassicServer</flag>
+  </use>
 </pkgmetadata>