Corrected missing fbintl.conf, other minor changes, removed previous revision

Package-Manager: portage-2.1.3.11

4 files changed, 262 insertions, 5 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 71186b737c38..832216d8b449 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/firebird
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.73 2007/09/21 02:15:03 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.74 2007/10/01 05:39:32 wltjr Exp $
+
+*firebird-2.0.3.12981.0-r2 (01 Oct 2007)
+
+  01 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +firebird-2.0.3.12981.0-r2.ebuild:
+  Corrected missing fbintl.conf, other minor changes, removed previous revision
 
 *firebird-2.0.3.12981.0-r1 (21 Sep 2007)
 
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 270d02ed5d9d..6516771452c7 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -51,14 +51,18 @@ EBUILD firebird-2.0.3.12981.0-r1.ebuild 6602 RMD160 3a26f80694b640a1bc74e9182595
 MD5 885814763d110eec34c6085cbc336b69 firebird-2.0.3.12981.0-r1.ebuild 6602
 RMD160 3a26f80694b640a1bc74e918259514e56007f1e8 firebird-2.0.3.12981.0-r1.ebuild 6602
 SHA256 0c37a3de716b0a3d422524a2e89434402df7b785b1006100439072a94094fb91 firebird-2.0.3.12981.0-r1.ebuild 6602
+EBUILD firebird-2.0.3.12981.0-r2.ebuild 6585 RMD160 51cd655cdb8d1ac20be412772fc226096f52c561 SHA1 d9fc7bf8f6aa2aa23c88d1b3c1ef81437a050279 SHA256 abceb163794d625f9fe700aeada698cd012765d0f7434d928755a92be3973f0c
+MD5 bb8d25e9e555656b696d089e5f1adc1b firebird-2.0.3.12981.0-r2.ebuild 6585
+RMD160 51cd655cdb8d1ac20be412772fc226096f52c561 firebird-2.0.3.12981.0-r2.ebuild 6585
+SHA256 abceb163794d625f9fe700aeada698cd012765d0f7434d928755a92be3973f0c firebird-2.0.3.12981.0-r2.ebuild 6585
 EBUILD firebird-2.0.3.12981.0.ebuild 7124 RMD160 1bdc2d6ac6d0cfe52e6b0f84325b1b6a6876880c SHA1 56323977522ceae064b4ad5e375e0571cfae441d SHA256 9dbccfc1d0cb64efccf1cb6d308fba01c4fdf973816bb961b873f5b0f3115684
 MD5 ec533a35b8eadb0b72fea0b55e2400a5 firebird-2.0.3.12981.0.ebuild 7124
 RMD160 1bdc2d6ac6d0cfe52e6b0f84325b1b6a6876880c firebird-2.0.3.12981.0.ebuild 7124
 SHA256 9dbccfc1d0cb64efccf1cb6d308fba01c4fdf973816bb961b873f5b0f3115684 firebird-2.0.3.12981.0.ebuild 7124
-MISC ChangeLog 13367 RMD160 947f9556c1779c702a8239ed1b34f1c7f207b320 SHA1 6055b4aa43f6116122966e8d2eb5e0dee6907548 SHA256 6d4f6cbe5553369b5bbdeb64d4695aa50274bb7678e81fe187e50a9cece1e6b3
-MD5 e134ec9c3cea313a5ad0603944193507 ChangeLog 13367
-RMD160 947f9556c1779c702a8239ed1b34f1c7f207b320 ChangeLog 13367
-SHA256 6d4f6cbe5553369b5bbdeb64d4695aa50274bb7678e81fe187e50a9cece1e6b3 ChangeLog 13367
+MISC ChangeLog 13584 RMD160 dd2af3a61287bb0668805bf9a4643af91f0b6155 SHA1 59cf8f7f84d7b4be6d2f7a406d310c2d952fccc5 SHA256 0086ad87894af21dba0016613d7b7ac8c62cc836f11d2ec8d0950fd4c063ca4c
+MD5 f0879755eb012f241602632034b5f806 ChangeLog 13584
+RMD160 dd2af3a61287bb0668805bf9a4643af91f0b6155 ChangeLog 13584
+SHA256 0086ad87894af21dba0016613d7b7ac8c62cc836f11d2ec8d0950fd4c063ca4c ChangeLog 13584
 MISC metadata.xml 611 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 SHA1 ce284a4db1ea6aa20a3824fb0c5730385659f84c SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63
 MD5 bf38ebc9198cc6b2bfc486bc9328c943 metadata.xml 611
 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 metadata.xml 611
@@ -72,3 +76,6 @@ SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/di
 MD5 693fad7757fc0c2e66f358e8703ef309 files/digest-firebird-2.0.3.12981.0-r1 506
 RMD160 b0ba0f24dd612555f7ce7b7858fc6456448dbe78 files/digest-firebird-2.0.3.12981.0-r1 506
 SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/digest-firebird-2.0.3.12981.0-r1 506
+MD5 693fad7757fc0c2e66f358e8703ef309 files/digest-firebird-2.0.3.12981.0-r2 506
+RMD160 b0ba0f24dd612555f7ce7b7858fc6456448dbe78 files/digest-firebird-2.0.3.12981.0-r2 506
+SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/digest-firebird-2.0.3.12981.0-r2 506
diff --git a/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r2 b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r2
new file mode 100644
index 000000000000..9d8d28d4fe6b
--- /dev/null
+++ b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r2
@@ -0,0 +1,6 @@
+MD5 9a28587a596a149eb01f006be1cb2ddb Firebird-2.0.3.12981-0.tar.bz2 12623689
+RMD160 6a1139b30a77070e6e74bdaebc5d9bdd52e32509 Firebird-2.0.3.12981-0.tar.bz2 12623689
+SHA256 7abda7a3a35abeb4d2ff38b99e6238d713184e6c70a786777b7adcbad6b1261e Firebird-2.0.3.12981-0.tar.bz2 12623689
+MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848
+RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848
+SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848
diff --git a/dev-db/firebird/firebird-2.0.3.12981.0-r2.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r2.ebuild
new file mode 100644
index 000000000000..6589fe2ab61a
--- /dev/null
+++ b/dev-db/firebird/firebird-2.0.3.12981.0-r2.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2007 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-r2.ebuild,v 1.1 2007/10/01 05:39:33 wltjr Exp $
+
+inherit flag-o-matic eutils autotools versionator
+
+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="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/share/firebird firebird
+}
+
+src_unpack() {
+	if use doc; then
+		# Unpack docs
+		mkdir "${WORKDIR}/manuals"
+		cd "${WORKDIR}/manuals"
+		unpack ib_b60_doc.zip
+		cd "${WORKDIR}"
+	fi
+
+	unpack "${MY_P}.tar.bz2"
+
+	mkdir -p "${WORKDIR}/../etc" \
+		"${WORKDIR}/usr" \
+		"${WORKDIR}/var/log/firebird" \
+		"${WORKDIR}/var/run/firebird"
+	cd "${WORKDIR}/usr"; ln -s "${WORKDIR}/${MY_P}/gen/firebird/bin"
+	cd "${WORKDIR}/../etc"; ln -s "${WORKDIR}/${MY_P}/gen/firebird" firebird
+
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-external-libs.patch"
+	epatch "${FILESDIR}/${P}-make-deps.patch"
+	epatch "${FILESDIR}/${P}-paths.patch"
+
+	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/share/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"
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*
+	fi
+
+# Seems to be ignored?
+#	insinto /usr/share/firebird/bin
+#	dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
+	rm bin/*.sh || die "Could not remove *sh files"
+
+	insinto /usr/bin
+	dobin bin/*
+
+	insinto /usr/include
+	doins include/*
+
+	insinto /usr/lib
+	dolib.so lib/*.so*
+	dolib.a lib/*.a*
+
+	insinto /usr/share/firebird
+	doins *.msg
+
+	insinto /usr/share/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/share/firebird/UDF
+	doexe UDF/*.so
+
+	exeinto /usr/share/firebird/intl
+	doexe intl/*.so
+#	newexe intl/libfbintl.so fbintl
+
+	insinto /usr/share/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 "${S}/gen/install/misc/${PN}.xinetd.2" "${PN}" || die "newins xinetd file failed"
+	else
+		newinitd "${FILESDIR}/${PN}.init.d.2" ${PN}
+		newconfd "${FILESDIR}/firebird.conf.d.2" ${PN}
+		fperms 640 /etc/conf.d/firebird
+	fi
+	doenvd "${FILESDIR}/70${PN}"
+
+	# Install docs
+	use doc && dodoc "${WORKDIR}"/manuals/*
+}
+
+pkg_postinst() {
+	# Hack to fix ownership/perms
+	chown -fR firebird:firebird ${ROOT}/etc/firebird ${ROOT}/usr/share/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/share/firebird. Logs"
+	elog "are in /var/log/firebird, and lock files in /var/run/firebird"
+	elog "Please report any problems or issues to bugs.gentoo.org."
+	elog
+
+#	elog
+#	elog "1. If haven't done so already, please run:"
+#	elog
+#	elog "	  \"emerge --config =${PF}\""
+#	elog
+#	elog "	  to create lockfiles, set permissions and more"
+#	elog
+#	elog "2. Firebird now runs with it's own user. Please remember to"
+#	elog "	  set permissions to firebird:firebird on databases you "
+#	elog "	  already have (if any)."
+#	elog
+#
+#	if ! use xinetd
+#	then
+#		elog "3. You've built the stand alone deamon version,"
+#		elog "	  SuperServer. If you were using pre 1.5.0 ebuilds"
+#		elog "	  you're probably have one installed via xinetd. please"
+#		elog "	  remember to disable it (usually in /etc/xinetd.d/firebird),"
+#		elog "	  since the current one has it's own init script under"
+#		elog "	  /etc/init.d"
+#	fi
+}
+
+pkg_config() {
+	# if found /etc/security.gdb from previous install, backup, and restore as
+	# /etc/security2.fdb
+	if [ -f /etc/firebird/security.gdb ]
+	then
+		# if we have scurity2.fdb already, back it 1st
+		if [ -f /etc/firebird/security2.fdb ] ; then
+			cp /etc/firebird/security2.fdb /etc/firebird/security2.fdb.old
+		fi
+		gbak -B /etc/firebird/security.gdb /etc/firebird/security.gbk
+		gbak -R /etc/firebird/security.gbk /etc/firebird/security2.fdb
+		mv /etc/firebird/security.gdb /etc/firebird/security.gdb.old
+		rm /etc/firebird/security.gbk
+
+		# make sure they are readable only to firebird
+		chown firebird:firebird /etc/firebird/{security.*,security2.*}
+		chmod 660 /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 /etc/firebird)."
+		einfo
+	fi
+
+	# we need to enable local access to the server
+	if [ ! -f /etc/hosts.equiv ] ; then
+		touch /etc/hosts.equiv
+		chown root:0 /etc/hosts.equiv
+		chmod u=rw,go=r /etc/hosts.equiv
+	fi
+
+	# add 'localhost.localdomain' to the hosts.equiv file...
+	if grep -q 'localhost.localdomain$' /etc/hosts.equiv 2>/dev/null; then
+		echo "localhost.localdomain" >> /etc/hosts.equiv
+		einfo "Added localhost.localdomain to /etc/hosts.equiv"
+	fi
+
+	# add 'localhost' to the hosts.equiv file...
+	if grep -q 'localhost$' /etc/hosts.equiv 2>/dev/null; then
+		echo "localhost" >> /etc/hosts.equiv
+		einfo "Added localhost to /etc/hosts.equiv"
+	fi
+
+	HS_NAME=`hostname`
+	if grep -q ${HS_NAME} /etc/hosts.equiv 2>/dev/null; then
+		echo "${HS_NAME}" >> /etc/hosts.equiv
+		einfo "Added ${HS_NAME} to /etc/hosts.equiv"
+	fi
+
+	einfo "If you're using UDFs, please remember to move them"
+	einfo "to /usr/share/firebird/UDF"
+}