Patch to allow tora building/running without Oracle. Closes bug #85646.

(Portage version: 2.0.51.19)

6 files changed, 154 insertions, 1 deletions

diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index ce89b17bd3e6..2faea42cf39a 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/tora
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.39 2005/03/08 17:34:57 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.40 2005/04/15 14:23:22 rizzo Exp $
+
+*tora-1.3.16-r1 (15 Apr 2005)
+
+  15 Apr 2005; Don Seiler <rizzo@gentoo.org>
+  +files/tora-1.3.16-configure-no_oracle.diff,
+  +files/tora-1.3.16-sh-no_oracle.diff, +tora-1.3.16-r1.ebuild:
+  Patch to allow tora building/running without Oracle.  Closes bug #85646.
 
   08 Mar 2005; Don Seiler <rizzo@gentoo.org>
   -files/tora-1.3.14.1-connection-memleak.diff,
diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index 0a40ebc7fb18..c3dc2d9089d4 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,4 +1,8 @@
 MD5 566fe397f52ab3e5dfc36dc720886f9c ChangeLog 6340
 MD5 bda8803c4adc9cf0b308b71157891f05 metadata.xml 536
+MD5 645250cee51095bbcc8b56a693554bb8 tora-1.3.16-r1.ebuild 1727
 MD5 2fe3e2e94de10c1ac9225060d1800263 tora-1.3.16.ebuild 1580
+MD5 515605f39cc89ed7f4e3efb14ae9bb59 files/tora-1.3.16-configure-no_oracle.diff 2153
+MD5 0b13d1a7a8370a01657623ade86d1c0b files/tora-1.3.16-sh-no_oracle.diff 611
+MD5 360385b94626738c4ea70afa2cc2ed56 files/digest-tora-1.3.16-r1 64
 MD5 360385b94626738c4ea70afa2cc2ed56 files/digest-tora-1.3.16 64
diff --git a/dev-db/tora/files/digest-tora-1.3.16-r1 b/dev-db/tora/files/digest-tora-1.3.16-r1
new file mode 100644
index 000000000000..42a472cb3bf5
--- /dev/null
+++ b/dev-db/tora/files/digest-tora-1.3.16-r1
@@ -0,0 +1 @@
+MD5 6e3276f208d64bf8269fecf0c5cb34b8 tora-1.3.16.tar.gz 2761539
diff --git a/dev-db/tora/files/tora-1.3.16-configure-no_oracle.diff b/dev-db/tora/files/tora-1.3.16-configure-no_oracle.diff
new file mode 100644
index 000000000000..ebc48205c0ce
--- /dev/null
+++ b/dev-db/tora/files/tora-1.3.16-configure-no_oracle.diff
@@ -0,0 +1,53 @@
+===================================================================
+RCS file: /cvsroot/tora/tora/configure.pl,v
+retrieving revision 1.181
+retrieving revision 1.182
+diff -u -r1.181 -r1.182
+--- configure.pl	2005/02/24 18:40:37	1.181
++++ configure.pl	2005/03/13 14:28:52	1.182
+@@ -1012,12 +1012,13 @@
+ 	print "QSql ";
+     }
+     print "\n";
+-
++    if ($OracleFound) {
+     $LFlags.="\"-L".$ENV{ORACLE_HOME}."/lib32\" ";
+     $LFlags.="\"-L".$ENV{ORACLE_HOME}."/lib\" ";
+     $LFlags.="\"-L".$ENV{ORACLE_HOME}."\" ";
++    }
+     $LFlags.="\"-L".$QtLib."\" ";
+-    if ($OracleRelease =~ /^8.0/) {
++    if ($OracleFound && $OracleRelease =~ /^8.0/) {
+         $LFlags.="\"$ENV{ORACLE_HOME}/lib/scorept.o\" ";
+         $LFlags.="\"-lcore4\" ";
+         $LFlags.="\"-lnlsrtl3\" ";
+@@ -1047,17 +1048,21 @@
+     print "$extra\n";
+ 
+     if (!$NoRPath) {
+-	$LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."/lib32\" ";
+-	$LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."/lib\" ";
+-	$LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."\" ";
++	if ($OracleFound) {
++	    $LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."/lib32\" ";
++	    $LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."/lib\" ";
++	    $LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."\" ";
++	}
+ 	$LFlags.="-Xlinker \"--rpath\=$QtLib\" ";
+     }
+ 
+-    $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/demo");
+-    $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/plsql/public");
+-    $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/public");
+-    $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/network/public");
+-    $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/sdk/include");
++    if ($OracleFound) {
++	$Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/demo");
++	$Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/plsql/public");
++	$Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/public");
++	$Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/network/public");
++	$Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/sdk/include");
++    }
+     if ( $ENV{C_INCLUDE_PATH} ) {
+       $Includes=&addInclude($Includes,$ENV{C_INCLUDE_PATH});
+     }
diff --git a/dev-db/tora/files/tora-1.3.16-sh-no_oracle.diff b/dev-db/tora/files/tora-1.3.16-sh-no_oracle.diff
new file mode 100644
index 000000000000..4f2d38886ce2
--- /dev/null
+++ b/dev-db/tora/files/tora-1.3.16-sh-no_oracle.diff
@@ -0,0 +1,19 @@
+===================================================================
+RCS file: /cvsroot/tora/tora/rpm/tora.sh,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- rpm/tora.sh	2003/07/22 20:14:15	1.1
++++ rpm/tora.sh	2005/03/29 19:15:47	1.2
+@@ -2,9 +2,9 @@
+ 
+ if [ "X$ORACLE_HOME" = "X" ]
+ then
+-    echo "Environment variable ORACLE_HOME not set, check your Oracle installation"
++    echo "WARNING: Environment variable ORACLE_HOME not set, check your Oracle installation"
+ else
+     LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME/lib
+     export LD_LIBRARY_PATH
+-    tora.real
+ fi
++tora.real
diff --git a/dev-db/tora/tora-1.3.16-r1.ebuild b/dev-db/tora/tora-1.3.16-r1.ebuild
new file mode 100644
index 000000000000..7dfcc781cfbf
--- /dev/null
+++ b/dev-db/tora/tora-1.3.16-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.16-r1.ebuild,v 1.1 2005/04/15 14:23:22 rizzo Exp $
+
+inherit debug eutils kde-functions
+
+IUSE="kde oracle debug"
+DESCRIPTION="TOra - Toolkit For Oracle"
+HOMEPAGE="http://tora.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+
+DEPEND=">=x11-libs/qt-3.0.0
+	dev-lang/perl
+	kde? ( >=kde-base/kdelibs-3.1 )"
+
+pkg_setup() {
+	if use oracle && [ -z "$ORACLE_HOME" ] ; then
+		eerror "ORACLE_HOME variable is not set."
+		eerror
+		eerror "You must install Oracle >= 8i client for Linux in"
+		eerror "order to compile TOra with Oracle support."
+		eerror
+		eerror "Otherwise specify -oracle in your USE variable."
+		eerror
+		eerror "You can download the Oracle software from"
+		eerror "http://otn.oracle.com/software/content.html"
+		die
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/tora-1.3.16-configure-no_oracle.diff
+	epatch ${FILESDIR}/tora-1.3.16-sh-no_oracle.diff
+}
+
+src_compile() {
+	set-qtdir 3
+	set-kdedir 3
+
+	# Need to fake out Qt or we'll get sandbox problems
+	REALHOME="$HOME"
+	mkdir -p $T/fakehome/.kde
+	mkdir -p $T/fakehome/.qt
+	export HOME="$T/fakehome"
+	addwrite "${QTDIR}/etc/settings"
+
+	local myconf
+	myconf="--prefix=/usr"
+	myconf="$myconf --with-mono"
+
+	use kde \
+		&& myconf="$myconf --with-kde" \
+		|| myconf="$myconf --without-kde"
+	use oracle || myconf="$myconf --without-oracle"
+
+	./configure $myconf || die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install ROOT=${D}
+	dodoc LICENSE.txt BUGS INSTALL NEWS README TODO
+}