added dusan cerhaty's fix for QT and finding X libraries. Fixes #79620

5 files changed, 17 insertions, 21 deletions

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index d3cec8b6a846..88ffcb10f94a 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/unixODBC
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.35 2005/01/07 11:32:03 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.36 2005/02/07 01:47:15 rphillips Exp $
+
+  06 Feb 2005; <rphillips@gentoo.org> unixODBC-2.2.8.ebuild:
+  added dusan cerhaty's fix for QT and finding X libraries. #79620
 
   07 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> unixODBC-2.2.8.ebuild:
   Fix libtool version mismatch for bug 74642.
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 2772bac93a26..2a7cba5028e7 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 798d73782d49579aeb92d10b6a03fc89 unixODBC-2.2.2.ebuild 1290
 MD5 c9ac848fe04e27de6420aaa64ce0f4bf unixODBC-2.0.8.ebuild 1092
-MD5 c99806e811b686f705b99db1f9c64d53 unixODBC-2.2.6.ebuild 1492
-MD5 fcdddb89a4e227ad1cb2170d10565195 unixODBC-2.2.6-r1.ebuild 1593
-MD5 34ad0a2006b5ad14d26359be71114551 unixODBC-2.2.8.ebuild 1912
-MD5 fcdbc54db88cb42e75e211546cae4bb7 ChangeLog 4543
+MD5 a3e823f140fc9c6a6191d413c111bf51 unixODBC-2.2.6.ebuild 1543
+MD5 debd2ebec70db3e3756fe0963204ce86 unixODBC-2.2.6-r1.ebuild 1645
+MD5 f6ad1d6e93be50104e96c0d4db7282a4 unixODBC-2.2.8.ebuild 1967
+MD5 88236f57a45e423c5452a135d5b2f03f ChangeLog 4674
 MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
 MD5 ffd3cee4e2a1f6dffc130557ccda934b files/gentoo-yac.diff 316
 MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.6-configure.in.patch 239
@@ -15,10 +12,3 @@ MD5 f383c7806ba5f687ba55d5f1bc6a36aa files/digest-unixODBC-2.0.8 67
 MD5 0f7614b93d6ede252ed2f7d7ff1aac90 files/digest-unixODBC-2.2.2 67
 MD5 4eaaa819fc28ee784da166d14e9f7fad files/digest-unixODBC-2.2.6 67
 MD5 a60388d8cb9cb0dca3df5429fb364051 files/digest-unixODBC-2.2.8 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB3nN+EZCkKN40op4RAiZIAJ0fFGl7Jv9HJ4Qq1M2bfDS1Y89A/QCfQZJo
-jDMUIvcCqj4JRY0R+YTaWgI=
-=jmPu
------END PGP SIGNATURE-----
diff --git a/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
index 97da1ee4cdc1..572fdd5a18ff 100644
--- a/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild,v 1.9 2005/01/01 17:44:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild,v 1.10 2005/02/07 01:47:15 rphillips Exp $
 
 inherit eutils
 
@@ -34,7 +34,7 @@ src_compile() {
 	local myconf
 
 	if use qt ; then
-		myconf="--enable-gui=yes"
+		myconf="--enable-gui=yes --x-libraries=/usr/lib "
 	else
 		myconf="--enable-gui=no"
 	fi
@@ -54,6 +54,7 @@ src_compile() {
 			--host=${CHOST} \
 			--prefix=/usr \
 			--sysconfdir=/etc/unixODBC \
+			--x-libraries=/usr/lib \
 			${myconf} || die
 
 		# not sure why these symlinks are needed. busted configure, i guess...
diff --git a/dev-db/unixODBC/unixODBC-2.2.6.ebuild b/dev-db/unixODBC/unixODBC-2.2.6.ebuild
index 650227a7b3ca..cd6515984a54 100644
--- a/dev-db/unixODBC/unixODBC-2.2.6.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6.ebuild,v 1.13 2005/01/01 17:44:35 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6.ebuild,v 1.14 2005/02/07 01:47:15 rphillips Exp $
 
 DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.unixodbc.org/"
@@ -22,7 +22,7 @@ src_compile() {
 
 	if use qt
 	then
-		myconf="--enable-gui=yes"
+		myconf="--enable-gui=yes --x-libraries=/usr/lib"
 	else
 		myconf="--enable-gui=no"
 	fi
@@ -44,6 +44,7 @@ src_compile() {
 		./configure --host=${CHOST} \
 				--with-odbc=${S} \
 				--prefix=/usr \
+				--x-libraries=/usr/lib \
 				--sysconfdir=/etc/unixODBC \
 				|| die
 
diff --git a/dev-db/unixODBC/unixODBC-2.2.8.ebuild b/dev-db/unixODBC/unixODBC-2.2.8.ebuild
index fcd45e75afd7..4ca05aa2f539 100644
--- a/dev-db/unixODBC/unixODBC-2.2.8.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.8.ebuild,v 1.16 2005/01/07 11:32:03 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.8.ebuild,v 1.17 2005/02/07 01:47:15 rphillips Exp $
 
 inherit eutils gnuconfig
 
@@ -38,7 +38,7 @@ src_compile() {
 
 	if use qt && ! use mips
 	then
-		myconf="--enable-gui=yes"
+		myconf="--enable-gui=yes --x-libraries=/usr/lib "
 	else
 		myconf="--enable-gui=no"
 	fi
@@ -63,6 +63,7 @@ src_compile() {
 		./configure --host=${CHOST} \
 				--with-odbc=${S} \
 				--prefix=/usr \
+				--x-libraries=/usr/lib \
 				--sysconfdir=/etc/unixODBC \
 				${myconf} || die