Configure patch for Bug #82550. Thanks to Nuno Araujo.

(Portage version: 2.0.51.16)

5 files changed, 107 insertions, 1 deletions

diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index 66da895433e4..53c764b7c58d 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,12 @@
 # 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.36 2005/02/17 21:17:21 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.37 2005/02/21 18:58:21 rizzo Exp $
+
+*tora-1.3.15-r1 (21 Feb 2005)
+
+  21 Feb 2005; Don Seiler <rizzo@gentoo.org>
+  +files/tora-1.3.15-configure.diff, +tora-1.3.15-r1.ebuild:
+  Configure patch for Bug #82550.  Thanks to Nuno Araujo.
 
 *tora-1.3.15 (17 Feb 2005)
 
diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index 4416ad645fe4..14d678ec1add 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -2,6 +2,7 @@ MD5 378b356f5679af1b9820c13598e92742 ChangeLog 5451
 MD5 bda8803c4adc9cf0b308b71157891f05 metadata.xml 536
 MD5 2d499ee46aa56b2430476d597fe42793 tora-1.3.14.1-r1.ebuild 2073
 MD5 6402fd079d7f1a4fa3d75d211d5da468 tora-1.3.14.1-r2.ebuild 2831
+MD5 26f823d9388d38ae21176f6681491b62 tora-1.3.15-r1.ebuild 1669
 MD5 174cba95230c3d5e0e0317a434825189 tora-1.3.15.ebuild 1582
 MD5 4cdf2dfb2aba1c9e73347bcc24eb16f5 files/tora-1.3.14.1-connection-memleak.diff 550
 MD5 4d38ba570ff115b02bfc9e2937fc0c84 files/tora-1.3.14.1-triggers.diff 449
@@ -14,3 +15,5 @@ MD5 f960b94be3f1d4b4710c1e8c97dedf43 files/tora-1.3.14.1-resultcontent-dtor.diff
 MD5 1bb1cc4967fbfd6b72661f28d53f57d8 files/tora-1.3.14.1-tooltip-memleaks.diff 2105
 MD5 e937ff9aa1c78b74db75186de6f51759 files/digest-tora-1.3.14.1-r2 72
 MD5 ce89901b4175205c8cf25a8704e0ee73 files/digest-tora-1.3.15 64
+MD5 86171f1c4ddda6f144161770820634fe files/tora-1.3.15-configure.diff 1051
+MD5 ce89901b4175205c8cf25a8704e0ee73 files/digest-tora-1.3.15-r1 64
diff --git a/dev-db/tora/files/digest-tora-1.3.15-r1 b/dev-db/tora/files/digest-tora-1.3.15-r1
new file mode 100644
index 000000000000..80bf3923f74d
--- /dev/null
+++ b/dev-db/tora/files/digest-tora-1.3.15-r1
@@ -0,0 +1 @@
+MD5 d8fffa5c3b4a0af82e605f568c34332c tora-1.3.15.tar.gz 2562513
diff --git a/dev-db/tora/files/tora-1.3.15-configure.diff b/dev-db/tora/files/tora-1.3.15-configure.diff
new file mode 100644
index 000000000000..a7060e2e4229
--- /dev/null
+++ b/dev-db/tora/files/tora-1.3.15-configure.diff
@@ -0,0 +1,28 @@
+Index: configure.pl
+===================================================================
+RCS file: /cvsroot/tora/tora/configure.pl,v
+retrieving revision 1.177
+diff -u -p -r1.177 configure.pl
+--- configure.pl	18 Feb 2005 22:07:47 -0000	1.177
++++ configure.pl	21 Feb 2005 17:45:38 -0000
+@@ -1046,6 +1046,9 @@ __TEMP__
+     $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/plsql/public");
+     $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/public");
+     $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/network/public");
++    if ( $ENV{C_INCLUDE_PATH} ) {
++        $Includes=&addInclude($Includes,$ENV{C_INCLUDE_PATH});
++    }
+     $Includes=&addInclude($Includes,$QtInclude);
+ 
+     if (!$ForceTarget) {
+@@ -1376,10 +1379,6 @@ __EOT__
+ 	print MAKEFILE "\t".join(".cpp \\\n\t",sort @allsource).
+ 	    ".cpp\n\ndefault: all\n";
+ 
+-	if ($OracleFound) {
+-	    print MAKEFILE "include \$(ORACLE_HOME)/rdbms/lib/env_rdbms.mk\n";
+-	}
+-
+ 	print MAKEFILE "\nTRANSLATIONS=\\\n";
+ 	for my $t (@translations) {
+ 	    print MAKEFILE "\t$t.ts\\\n";
diff --git a/dev-db/tora/tora-1.3.15-r1.ebuild b/dev-db/tora/tora-1.3.15-r1.ebuild
new file mode 100644
index 000000000000..3f17ec3674a6
--- /dev/null
+++ b/dev-db/tora/tora-1.3.15-r1.ebuild
@@ -0,0 +1,68 @@
+# 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.15-r1.ebuild,v 1.1 2005/02/21 18:58:21 rizzo Exp $
+
+inherit debug eutils kde-functions
+
+IUSE="kde oracle debug"
+DESCRIPTION="TOra - Toolkit For Oracle"
+HOMEPAGE="http://www.globecom.se/tora/"
+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.15-configure.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
+}