For 2.2.8, masked the qt/gnome-libs interface for unixODBC until qt stuff can be sorted out on mips.

7 files changed, 28 insertions, 20 deletions

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index 8681c58d675f..97f440690af8 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/unixODBC
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.25 2004/02/27 09:55:14 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.26 2004/03/23 09:15:10 kumba Exp $
+
+  23 Mar 2004; Joshua Kinard <kumba@gentoo.org> unixODBC-2.0.8.ebuild,
+  unixODBC-2.2.2.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.6.ebuild,
+  unixODBC-2.2.8.ebuild:
+  For 2.2.8, masked the qt/gnome-libs interface for unixODBC until qt stuff can
+  be sorted out on mips.
 
   27 Feb 2004; Joshua Kinard <kumba@gentoo.org> unixODBC-2.2.8.ebuild:
   Forgot gnuconfig
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index b02b3e492fb1..aa43d5d3e432 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,10 +1,10 @@
-MD5 fc7b0b450adf47dd4ed3362090168c88 ChangeLog 3318
+MD5 7ed58adeedf9897024966acd09751b22 ChangeLog 3594
 MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
-MD5 0bd88c25618464c75595f9e0e39195ff unixODBC-2.0.8.ebuild 1108
-MD5 2352820d0c329b031a28ed77cd6be6d3 unixODBC-2.2.2.ebuild 1297
-MD5 5745da25ab3811eae8c558cbdb756445 unixODBC-2.2.6.ebuild 1522
-MD5 0c9762bc1c2b832a91cbd1eaeb0f7c23 unixODBC-2.2.6-r1.ebuild 1622
-MD5 317581900dc6724129b9736e8836a4fb unixODBC-2.2.8.ebuild 1719
+MD5 174fd77a715288a5e4ab76a17d693b6f unixODBC-2.0.8.ebuild 1108
+MD5 106bc895600ad0b4305e3a33845fed79 unixODBC-2.2.2.ebuild 1297
+MD5 10d32f1faaafe562243fc495138e97ca unixODBC-2.2.6.ebuild 1522
+MD5 c91aac07e4a48b3b4318d9b2a5ca8dce unixODBC-2.2.6-r1.ebuild 1622
+MD5 2c7a332eed909d0714ee8dc36a1b454a unixODBC-2.2.8.ebuild 1756
 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
diff --git a/dev-db/unixODBC/unixODBC-2.0.8.ebuild b/dev-db/unixODBC/unixODBC-2.0.8.ebuild
index b3e4d60a67d3..4f9b59a60072 100644
--- a/dev-db/unixODBC/unixODBC-2.0.8.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.0.8.ebuild,v 1.17 2003/09/11 01:06:22 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.0.8.ebuild,v 1.18 2004/03/23 09:15:10 kumba Exp $
 
 DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.unixodbc.org/"
diff --git a/dev-db/unixODBC/unixODBC-2.2.2.ebuild b/dev-db/unixODBC/unixODBC-2.2.2.ebuild
index 2a5c0b1e147c..8dccc9ddd7ab 100644
--- a/dev-db/unixODBC/unixODBC-2.2.2.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.2.ebuild,v 1.13 2003/10/27 02:07:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.2.ebuild,v 1.14 2004/03/23 09:15:10 kumba Exp $
 
 DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.unixodbc.org/"
diff --git a/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
index 18a2c4798826..7dd340e2136e 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-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.3 2004/02/16 20:58:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild,v 1.4 2004/03/23 09:15:10 kumba Exp $
 
 DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.unixodbc.org/"
diff --git a/dev-db/unixODBC/unixODBC-2.2.6.ebuild b/dev-db/unixODBC/unixODBC-2.2.6.ebuild
index fee8f928f96d..96aacd656ecd 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-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.8 2004/01/08 09:21:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6.ebuild,v 1.9 2004/03/23 09:15:10 kumba Exp $
 
 DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.unixodbc.org/"
diff --git a/dev-db/unixODBC/unixODBC-2.2.8.ebuild b/dev-db/unixODBC/unixODBC-2.2.8.ebuild
index 721e27916491..04086a0bce8a 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-2004 Gentoo Technologies, Inc.
 # 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.3 2004/02/27 09:55:14 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.8.ebuild,v 1.4 2004/03/23 09:15:10 kumba Exp $
 
 DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.unixodbc.org/"
@@ -8,15 +8,17 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~hppa ~alpha ~amd64 ~sparc ~mips"
+KEYWORDS="~x86 ~ppc ~hppa ~alpha ~amd64 ~sparc mips"
 IUSE="qt gnome"
 inherit eutils gnuconfig
 
 DEPEND="virtual/glibc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	gnome? ( gnome-base/gnome-libs )
-	qt? ( >=x11-libs/qt-3.0* )"
+	!mips? (
+		gnome? ( gnome-base/gnome-libs )
+		qt? ( >=x11-libs/qt-3.0* )
+	)"
 
 # the configure.in patch is required for 'use qt'
 src_unpack() {
@@ -32,7 +34,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	if [ "`use qt`" ]
+	if [ "`use qt`" ] && [ -z "`use mips`" ]
 	then
 		myconf="--enable-gui=yes"
 	else