Added patch for custom flags vs default hard coded, thanks to cla there :). Removed past 2.1 beta version.

(Portage version: 2.1.3.17)

7 files changed, 265 insertions, 3 deletions

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 392670231129..4369a9ed2ad8 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,18 @@
 # 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.77 2007/11/06 02:15:33 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.78 2007/11/06 04:49:39 wltjr Exp $
+
+*firebird-2.1.0.16780_beta2-r1 (06 Nov 2007)
+*firebird-2.0.3.12981.0-r3 (06 Nov 2007)
+
+  06 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/firebird-2.0.3.12981.0-flags.patch,
+  +files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch,
+  -files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch,
+  +firebird-2.0.3.12981.0-r3.ebuild, -firebird-2.1.0.16780_beta2.ebuild,
+  +firebird-2.1.0.16780_beta2-r1.ebuild:
+  Added patch for custom flags vs default hard coded, thanks to cla there :).
+  Removed past 2.1 beta version.
 
   06 Nov 2007; Dawid Węgliński <cla@gentoo.org>
   firebird-2.0.3.12981.0-r2.ebuild:
diff --git a/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r3 b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r3
new file mode 100644
index 000000000000..9d8d28d4fe6b
--- /dev/null
+++ b/dev-db/firebird/files/digest-firebird-2.0.3.12981.0-r3
@@ -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/files/digest-firebird-2.1.0.16780_beta2 b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r1
index f63a1165d43f..f63a1165d43f 100644
--- a/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2
+++ b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r1
diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch
new file mode 100644
index 000000000000..c1cc28edab90
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch
@@ -0,0 +1,12 @@
+diff -Naur Firebird-2.0.3.12981-0_orig/builds/posix/prefix.linux Firebird-2.0.3.12981-0/builds/posix/prefix.linux
+--- Firebird-2.0.3.12981-0_orig/builds/posix/prefix.linux	2007-11-05 21:07:48.000000000 -0500
++++ Firebird-2.0.3.12981-0/builds/posix/prefix.linux	2007-11-05 21:23:36.000000000 -0500
+@@ -20,7 +20,7 @@
+ 
+ # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
+ # you may remove it if engine is getting compiled with any other GCC version
+-PROD_FLAGS=-ggdb -O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin -DNDEBUG -DLINUX -pipe -MMD -fPIC -fmessage-length=0
++PROD_FLAGS=-ggdb -DNDEBUG -DLINUX -pipe -MMD -fPIC
+ DEV_FLAGS=-DUSE_VALGRIND -ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
+ #DEV_FLAGS=-ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
+ 
diff --git a/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch
index 62319ecb08be..de9459cc797f 100644
--- a/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-libs-paths.patch
+++ b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs-paths.patch
@@ -96,6 +96,23 @@ diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets Fire
  	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
  
  
+diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux
+--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux	2007-10-19 11:11:36.000000000 -0400
++++ Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux	2007-11-05 21:31:20.000000000 -0500
+@@ -21,11 +21,10 @@
+ # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
+ # you may remove it if engine is getting compiled with any other GCC version
+ 
+-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
+-OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin
++COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC
+ WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
+ 
+-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
++PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS)
+ DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
+ #DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
+ 
 diff -Naur Firebird-2.1.0.16780-Beta2_orig/configure Firebird-2.1.0.16780-Beta2/configure
 --- Firebird-2.1.0.16780-Beta2_orig/configure	2007-10-19 11:11:39.000000000 -0400
 +++ Firebird-2.1.0.16780-Beta2/configure	2007-10-19 11:26:19.000000000 -0400
diff --git a/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild
new file mode 100644
index 000000000000..e3b12ee9b925
--- /dev/null
+++ b/dev-db/firebird/firebird-2.0.3.12981.0-r3.ebuild
@@ -0,0 +1,215 @@
+# 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-r3.ebuild,v 1.1 2007/11/06 04:49:39 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}-flags.patch"
+	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"
+
+# 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/*
+
+	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/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
+}
+
+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/share/firebird/UDF"
+}
diff --git a/dev-db/firebird/firebird-2.1.0.16780_beta2.ebuild b/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild
index 7492221751f0..832fb624ade3 100644
--- a/dev-db/firebird/firebird-2.1.0.16780_beta2.ebuild
+++ b/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.0.16780_beta2.ebuild,v 1.1 2007/10/19 18:09:27 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.16780_beta2-r1.ebuild,v 1.1 2007/11/06 04:49:39 wltjr Exp $
 
 inherit flag-o-matic eutils autotools versionator
 
@@ -52,7 +52,7 @@ src_unpack() {
 
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-deps-libs-paths.patch"
+	epatch "${FILESDIR}/${P}-deps-flags-libs-paths.patch"
 
 	find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
 	rm -rf "${S}"/extern/{editline,icu}