From: Tobias Scherbaum <dertobi123@gentoo.org>
Date: Fri, 29 Dec 2006 02:36:01 +0000 (+0000)
Subject: Fix configure call, #159285
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=99b68d98de0d01d276a68a207f38b386214880e5;p=gentoo.git

Fix configure call, #159285
Package-Manager: portage-2.1.2_rc4-r1
---

diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index 5a0ff2f42a50..a9278bfd32d5 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/tora
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.54 2006/12/26 18:45:09 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.55 2006/12/29 02:36:01 dertobi123 Exp $
+
+  29 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  tora-1.3.21-r1.ebuild:
+  Fix configure call, #159285
 
 *tora-1.3.21-r1 (26 Dec 2006)
 
diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index e6d9d104b858..9ea0c72d6236 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -16,18 +16,18 @@ EBUILD tora-1.3.18.ebuild 1801 RMD160 3a8a5c1b126a988d437e8e3cd0519be344797fe9 S
 MD5 90d0055dfe8e220c065c2e8d9ff13045 tora-1.3.18.ebuild 1801
 RMD160 3a8a5c1b126a988d437e8e3cd0519be344797fe9 tora-1.3.18.ebuild 1801
 SHA256 7414321dd1c7b2bffb015d31bea0a1189bb756a59849c13548f6ee4322e07718 tora-1.3.18.ebuild 1801
-EBUILD tora-1.3.21-r1.ebuild 2279 RMD160 4af6f13b033798f035fbef533eca64ba6f1365b0 SHA1 ae6e08e4818c4a8e24e1cc8130eb5f55a99e00f5 SHA256 494b0ae5af27ca5f9df3a7a912d627e99e9d207695f46c6ddeaf7bcd60e0980b
-MD5 6e7193b60f604e4cf92978832768746d tora-1.3.21-r1.ebuild 2279
-RMD160 4af6f13b033798f035fbef533eca64ba6f1365b0 tora-1.3.21-r1.ebuild 2279
-SHA256 494b0ae5af27ca5f9df3a7a912d627e99e9d207695f46c6ddeaf7bcd60e0980b tora-1.3.21-r1.ebuild 2279
+EBUILD tora-1.3.21-r1.ebuild 2179 RMD160 21fad178de07fa01320155665c67668c04f5c662 SHA1 e62cc9695c830b58c84ba2e68ad14175b29d5f6e SHA256 e23329136decabfd91f004f18fd75ad59bad929da7a0bfc5f0bbdeff0e450e90
+MD5 c5e46cec0103094a8f4b76475e35202e tora-1.3.21-r1.ebuild 2179
+RMD160 21fad178de07fa01320155665c67668c04f5c662 tora-1.3.21-r1.ebuild 2179
+SHA256 e23329136decabfd91f004f18fd75ad59bad929da7a0bfc5f0bbdeff0e450e90 tora-1.3.21-r1.ebuild 2179
 EBUILD tora-1.3.21.ebuild 1815 RMD160 1a88a595c7ff75ddf05b5033ef0e284d4bfe5b52 SHA1 d6b98eb58aa8d7f291991a468be77b5120e538c7 SHA256 f437e58aab23b049df154c68d1ad33ce8f72859b7cd8e07802dad61b786bb1fb
 MD5 3be2b3a233932ce5b9cfc0031aef8e9e tora-1.3.21.ebuild 1815
 RMD160 1a88a595c7ff75ddf05b5033ef0e284d4bfe5b52 tora-1.3.21.ebuild 1815
 SHA256 f437e58aab23b049df154c68d1ad33ce8f72859b7cd8e07802dad61b786bb1fb tora-1.3.21.ebuild 1815
-MISC ChangeLog 8616 RMD160 e6937cc80ace2caaf88328893f70f9fe890326bb SHA1 da747d574d2db887d9b2bc162a02d52e0319e3c2 SHA256 bc218f08c71c24703f454f809cbd0dc09425b0f620f7e7eddcb662b8ea1ff300
-MD5 85104c95838d11beb8d7c488b66da01c ChangeLog 8616
-RMD160 e6937cc80ace2caaf88328893f70f9fe890326bb ChangeLog 8616
-SHA256 bc218f08c71c24703f454f809cbd0dc09425b0f620f7e7eddcb662b8ea1ff300 ChangeLog 8616
+MISC ChangeLog 8728 RMD160 76336e97a00d733de1ba55071d6e55194b6171ae SHA1 8b97cf936635b8471c258bdcac4d4fb0ca1334c5 SHA256 6e50c15a3af96a2576839293ecf4886610a6839b03c6b3f9005a4bf5a0d9dbfc
+MD5 2736087a88bede6b4c9aa968b043a459 ChangeLog 8728
+RMD160 76336e97a00d733de1ba55071d6e55194b6171ae ChangeLog 8728
+SHA256 6e50c15a3af96a2576839293ecf4886610a6839b03c6b3f9005a4bf5a0d9dbfc ChangeLog 8728
 MISC metadata.xml 545 RMD160 c8a0b509c95d54228308ab8016ca36f36cde8b78 SHA1 992a140bc0b64afcbd46a3feaff6a4adf85fea3b SHA256 99c153750d77644b1e959d2dba6d413fd23fdc4f4d55ea04e5d283f43aae6f95
 MD5 26195c7b7ebc00c63f817e3266b8c4a0 metadata.xml 545
 RMD160 c8a0b509c95d54228308ab8016ca36f36cde8b78 metadata.xml 545
diff --git a/dev-db/tora/tora-1.3.21-r1.ebuild b/dev-db/tora/tora-1.3.21-r1.ebuild
index fa25a124ab18..5db7b44bac22 100644
--- a/dev-db/tora/tora-1.3.21-r1.ebuild
+++ b/dev-db/tora/tora-1.3.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.21-r1.ebuild,v 1.1 2006/12/26 18:45:09 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.21-r1.ebuild,v 1.2 2006/12/29 02:36:01 dertobi123 Exp $
 
 inherit debug eutils kde-functions
 
@@ -57,16 +57,14 @@ src_compile() {
 	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"
-	myconf="${myconf} $(use_with oci8-instant-client instant-client)"
+	myconf="${myconf} $(use_with kde)"
+	myconf="${myconf} $(use_with oracle)"
 	myconf="${myconf} $(use_with xinerama)"
 
+	if use oci8-instant-client; then
+		myconf="$myconf --with-instant-client"
+	fi
+
 	myconf="$myconf --with-qt-dir=/usr/qt/3"
 
 	#./configure $myconf || die "configure failed"