Bumped to latest release, removed past rc, and insecure version/files, removed dodoc on examples.

Package-Manager: portage-2.1.5_rc2

8 files changed, 23 insertions, 346 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index a941d0a80477..be83c6688474 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-db/firebird
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.92 2008/04/14 20:42:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.93 2008/04/19 01:35:53 wltjr Exp $
+
+*firebird-2.1.0.17798.0 (19 Apr 2008)
+
+  19 Apr 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  -files/firebird-2.1.0.17755_rc2-deps-flags-libs.patch,
+  +files/firebird-2.1.0.17798.0-deps-flags-libs.patch,
+  -files/firebird.conf.d, -files/firebird.init.d.2,
+  -firebird-2.0.3.12981.0-r5.ebuild, firebird-2.0.3.12981.0-r6.ebuild,
+  -firebird-2.1.0.17755_rc2-r1.ebuild, +firebird-2.1.0.17798.0.ebuild:
+  Bumped to latest release, removed past rc, and insecure version/files,
+  removed dodoc on examples.
 
   14 Apr 2008; Markus Meier <maekke@gentoo.org>
   firebird-2.0.3.12981.0-r6.ebuild:
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index ebcf3b47eaf3..624311994625 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,30 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70firebird 50 RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 SHA1 71b414835ed7c66f94b2908b7793da817d3c4438 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03
 AUX firebird-2.0.3.12981.0-CVE-2008-0387.patch 3279 RMD160 462a32e8bc64c2ede4852901a9ff7036a7c3b52a SHA1 7c87e7f41e8c408b190d84e80f7c6aa1a5c0753c SHA256 62dd30ec1a785578a4686ba37e82fedbc0b00d0e95735b4aab9b056b5b82ad4b
 AUX firebird-2.0.3.12981.0-CVE-2008-0467.patch 16005 RMD160 2bfd332b7d551402a1c9bed8b4706fc57cc80ec0 SHA1 38bc58cec68a4b9b12315846c3eb5f8c967e83e3 SHA256 f4de4b4b988669378b09fcbba59dac96b22a3b4cfeb6bdf7db45c4a16f81fd05
 AUX firebird-2.0.3.12981.0-external-libs.patch 1891 RMD160 6450f96348d1736ff1101d6bafe7b1057d221175 SHA1 b1ad1e60a538acd88cb9f7dcdea10e90459ed782 SHA256 75697d2d0cdc4e1fa48a6714f1e8e47563e2d2ea7765ae8a56f533a3c7b865da
 AUX firebird-2.0.3.12981.0-flags.patch 960 RMD160 9c75259b1fcd281a7c1e272bd209920cb434940a SHA1 250dcbc322a88b3c8c741ea6e58c637ddf44d066 SHA256 b3ad7f330fd22bcd3dd2189b91c0eb56af0215f2cfbc592e13d9596e9e841045
 AUX firebird-2.0.3.12981.0-make-deps.patch 1369 RMD160 843f3fdf1469ca31ccbf14b0d90f10d240ade63b SHA1 05d6e9c3b3dd0ac8f0093307cc5e3a1313f4dcb8 SHA256 826f6d70b71ec8630a9520dacfade245cff14cd9c766ba5be0eeda204f4bc9fb
-AUX firebird-2.1.0.17755_rc2-deps-flags-libs.patch 5002 RMD160 fdb35777355c4f438669d53263d431699f6fccf5 SHA1 270fd5991d10e8c61f08d2b1b92688ac6a88f6d3 SHA256 604a7274b38baa48a8e74b7a267ae61d858bf2b8047028432c8936f44c76014a
-AUX firebird.conf.d 84 RMD160 87e007bf5b9a540e67dd602b8d85da7c8a8aea21 SHA1 dd16a06bfb864c31d53220bdb5f0e3c3687e292c SHA256 e2d60371eb14ebfc20eaa1fc19610499ab495f9bdaffbb3075454ffc6a324d70
+AUX firebird-2.1.0.17798.0-deps-flags-libs.patch 5002 RMD160 fdb35777355c4f438669d53263d431699f6fccf5 SHA1 270fd5991d10e8c61f08d2b1b92688ac6a88f6d3 SHA256 604a7274b38baa48a8e74b7a267ae61d858bf2b8047028432c8936f44c76014a
 AUX firebird.conf.d.2 105 RMD160 a047ffded75ed5f055949993fd794941eee8fe25 SHA1 d10907676a706bdecae27321861ccd0e89bc7993 SHA256 032e26a957572718c3fb9ffbb1a83fac16a00cd41a027732e8cfbbe0f1a2ab61
 AUX firebird.init.d 692 RMD160 fd32d3ca38f149df1c6c46697a9c043b22bf25dd SHA1 379f3dd8e768e958ab3faff203d0d7a502c8f120 SHA256 7602d5030abaa7414cbe10f3223c38861742807bbe92f9af5693d28520398f6e
-AUX firebird.init.d.2 691 RMD160 77b6fd440aadc515ce7c182c7ea2e41f3b5fcd1f SHA1 c8e49a255400e348c7fc6989dd46868267f24092 SHA256 b879956a3fc7b440885d558ef3f87c6df2b7e7c9b161cbf1f9e26c8589e839ed
 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.1.0.17755-ReleaseCandidate2.tar.bz2 13345949 RMD160 53b19b85c505ecd800a37c3d5f6d446c596dcb5f SHA1 1a66304d8591f13ac179160fb02d109d0aa219f5 SHA256 ae57170460291add41a4ed76aa9afb6170d9b2fd6926ab1d3f5b60ab2c532bba
+DIST Firebird-2.1.0.17798-0.tar.bz2 13362044 RMD160 2900fc0d9d23f8d545eeb616638dcae9def0a2a5 SHA1 800263f90d81d59f4b6d3fc1ecc98d7976b52981 SHA256 eca35209fad317efae5e7048f82c4e4d12c7361182bb49657d60818beeb15e9e
 DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d
-EBUILD firebird-2.0.3.12981.0-r5.ebuild 10017 RMD160 672703dff9874e80dcd25c748b5764aa0b63a33d SHA1 91c3e82435deeaad2873637ef32cf38ea3d6e659 SHA256 1011ac52c9b146363eb18c7ce1bbb61758ddfafc1c3f1a78e6e407e90363d980
-EBUILD firebird-2.0.3.12981.0-r6.ebuild 10010 RMD160 f044e4e2c8b79ece54e1d708049e00f80bde2402 SHA1 d2b9ea69e3cd6d629bf14bed734bd08b134c2443 SHA256 4c57fa1a5ca36d0bff1e4facc72bdd300f2067ce66f26cffbd71393c7d5782e9
-EBUILD firebird-2.1.0.17755_rc2-r1.ebuild 10115 RMD160 368e0aa2bc30476bd8ebfdcf43a7b217cba0a0f7 SHA1 124ce0bc9921c3c69895a2e8e63c3d0a9ff1baee SHA256 833d3c06abcd4369536e5e34dfedda93d40b47b91560ffd6451c18e3f3d28a95
-MISC ChangeLog 19409 RMD160 12deb64037beb425b7e157c4622cfa72c58f9e61 SHA1 3fee7e69255ea6d66d7b076d2574bcfa7793c920 SHA256 a28356253bf2c7ea4197aa442e5e102f4edbcff09a52060d9d4c00751676f018
+EBUILD firebird-2.0.3.12981.0-r6.ebuild 9977 RMD160 8c673604232281e9e7f2b16d6fc2e54271d71df7 SHA1 e188059d197c157bec258a5d7c788703fb83cb92 SHA256 3364ef83eb54924e574d14e5e564062d3e441b80f549e35874827aedfb2c8b8d
+EBUILD firebird-2.1.0.17798.0.ebuild 10078 RMD160 efcef845d5a2853a51441ca5bf76ceb285ee555f SHA1 33860dcf29078110a48f8f2671924d1ac84e81a2 SHA256 cb57d012cebf36b42912aef1afe0d7cccb459287c164c94f1bec3b2f12de70bf
+MISC ChangeLog 19913 RMD160 6f08446f493bc1f7ff4299bdd9061f6e2a36745f SHA1 5396a0d87a69c8e38e4def3935f013a6bf3b1ace SHA256 5e9f2b6a4a1f022804cb353a9e96f7f2ae61b9da5a162b63bb5600bdb2c41b86
 MISC metadata.xml 611 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 SHA1 ce284a4db1ea6aa20a3824fb0c5730385659f84c SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgDwe8ACgkQkKaRLQcq0GKTEwCcCFhObgvOjpjFsRi1w3FoybFP
-+fAAn3twimqpzCcJ3Pouu3asrIbFSOz4
-=/4ME
------END PGP SIGNATURE-----
diff --git a/dev-db/firebird/files/firebird-2.1.0.17755_rc2-deps-flags-libs.patch b/dev-db/firebird/files/firebird-2.1.0.17798.0-deps-flags-libs.patch
index 8bcd3ca0dfd4..8bcd3ca0dfd4 100644
--- a/dev-db/firebird/files/firebird-2.1.0.17755_rc2-deps-flags-libs.patch
+++ b/dev-db/firebird/files/firebird-2.1.0.17798.0-deps-flags-libs.patch
diff --git a/dev-db/firebird/files/firebird.conf.d b/dev-db/firebird/files/firebird.conf.d
deleted file mode 100644
index 3c1e72a55eba..000000000000
--- a/dev-db/firebird/files/firebird.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-ISC_USER=SYSDBA
-ISC_PASSWORD=masterke
-FIREBIRD=/usr/lib/firebird
-FBRunUser=firebird
diff --git a/dev-db/firebird/files/firebird.init.d.2 b/dev-db/firebird/files/firebird.init.d.2
deleted file mode 100644
index 0bedf82511c1..000000000000
--- a/dev-db/firebird/files/firebird.init.d.2
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/files/firebird.init.d.2,v 1.1 2007/09/21 02:15:04 wltjr Exp $
-
- 
-#  NOTE: make sure you have localhost in your hosts.equiv file see next 2 
-#  lines for example of hosts.equiv contents
-#localhost.localdomain
-#localhost
-
-
-export FIREBIRD
-export ISC_USER
-export ISC_PASSWORD
-export FBRunUser
-MANAGER=/usr/bin/fbmgr.bin
-
-depend() {
-	need net
-}
-
-start(){
-	ebegin "Starting Firebird server"
-	su $FBRunUser -c "${MANAGER} -start -forever"
-	eend $?
-}
-
-stop(){
-	ebegin "Stopping Firebird server"
-	$MANAGER -shut
-	eend $?
-}
diff --git a/dev-db/firebird/firebird-2.0.3.12981.0-r5.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r5.ebuild
deleted file mode 100644
index ea9d709a9457..000000000000
--- a/dev-db/firebird/firebird-2.0.3.12981.0-r5.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2008 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-r5.ebuild,v 1.3 2008/02/25 15:49:26 beandog 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://firebird.sourceforge.net/"
-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 )"
-
-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.2" ${PN}
-		newconfd "${FILESDIR}/firebird.conf.d" ${PN}
-		fperms 640 /etc/conf.d/firebird
-	fi
-	doenvd "${FILESDIR}/70${PN}"
-
-	# Install docs
-	use doc && dodoc "${WORKDIR}"/manuals/*
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*
-	fi
-}
-
-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.3.12981.0-r6.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild
index 0147a024113c..04b30bc540e2 100644
--- a/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild
+++ b/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r6.ebuild,v 1.2 2008/04/14 20:42:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild,v 1.3 2008/04/19 01:35:53 wltjr Exp $
 
 inherit flag-o-matic eutils autotools versionator multilib
 
@@ -200,11 +200,7 @@ src_install() {
 
 	# Install docs
 	use doc && dodoc "${WORKDIR}"/manuals/*
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*
-	fi
+	use examples && docinto examples
 }
 
 pkg_postinst() {
diff --git a/dev-db/firebird/firebird-2.1.0.17755_rc2-r1.ebuild b/dev-db/firebird/firebird-2.1.0.17798.0.ebuild
index f3d56de45861..63b4d51f1b25 100644
--- a/dev-db/firebird/firebird-2.1.0.17755_rc2-r1.ebuild
+++ b/dev-db/firebird/firebird-2.1.0.17798.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.17755_rc2-r1.ebuild,v 1.1 2008/04/10 22:59:59 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.17798.0.ebuild,v 1.1 2008/04/19 01:35:53 wltjr Exp $
 
 inherit flag-o-matic eutils autotools versionator
 
-#MY_P=Firebird-$(replace_version_separator 4 -)
-MY_P=Firebird-${PV/_rc/-ReleaseCandidate}
+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://firebird.sourceforge.net/"
@@ -203,11 +203,7 @@ src_install() {
 
 	# Install docs
 	use doc && dodoc "${WORKDIR}"/manuals/*
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*
-	fi
+	use examples && docinto examples
 }
 
 pkg_postinst() {