Remove USE="qt3" wrt #301361 by Ben de Groot.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 15 insertions, 152 deletions

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index 5e25bb526382..9fd904bf7fb3 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/unixODBC
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.75 2008/06/15 17:33:57 hoffie Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.76 2010/03/22 08:35:49 ssuominen Exp $
+
+  22 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  unixODBC-2.2.12.ebuild:
+  Remove USE="qt3" wrt #301361 by Ben de Groot.
 
   15 Jun 2008; Christian Hoffmann <hoffie@gentoo.org>
   unixODBC-2.2.12.ebuild:
diff --git a/dev-db/unixODBC/files/unixODBC-2.2.11-Makefile.am.patch b/dev-db/unixODBC/files/unixODBC-2.2.11-Makefile.am.patch
deleted file mode 100644
index 0417ff29cd8a..000000000000
--- a/dev-db/unixODBC/files/unixODBC-2.2.11-Makefile.am.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- unixODBC-2.2.11/DataManager/Makefile.am	2004-09-13 16:46:11.000000000 +0200
-+++ unixODBC.cvs/DataManager/Makefile.am	2005-03-09 17:39:17.000000000 +0100
-@@ -8,6 +8,7 @@
- 	@QT_LDFLAGS@ \
- 	@USER_LDFLAGS@ \
- 	@LIB_QT@ \
-+	../ini/libinilc.la \
- 	../odbcinst/libodbcinst.la \
- 	../DriverManager/libodbc.la 
- 
---- unixODBC-2.2.11/DataManagerII/Makefile.am	2004-11-20 13:57:38.000000000 +0100
-+++ unixODBC.cvs/DataManagerII/Makefile.am	2005-03-09 17:39:18.000000000 +0100
-@@ -8,6 +8,7 @@
- 	@QT_LDFLAGS@ \
- 	@USER_LDFLAGS@ \
- 	@LIB_QT@ \
-+	../ini/libinilc.la \
- 	../odbcinst/libodbcinst.la \
- 	../DriverManager/libodbc.la 
- 
---- unixODBC-2.2.11/odbctest/Makefile.am	2004-09-13 16:47:34.000000000 +0200
-+++ unixODBC.cvs/odbctest/Makefile.am	2005-03-09 17:39:27.000000000 +0100
-@@ -8,6 +8,7 @@
- 	@QT_LDFLAGS@ \
- 	@USER_LDFLAGS@ \
- 	@LIB_QT@ \
-+	../ini/libinilc.la \
- 	../odbcinst/libodbcinst.la \
- 	../DriverManager/libodbc.la \
- 	$(LIBLTDL) $(LIBADD_DL)
---- unixODBC-2.2.11/gODBCConfig/src/Makefile.am.orig	2005-07-21 10:03:12.051477479 +0200
-+++ unixODBC-2.2.11/gODBCConfig/src/Makefile.am	2005-07-21 10:04:10.359597876 +0200
-@@ -28,6 +28,7 @@
- 		$(GNOMEUI_LIBS) \
- 		$(INTLLIBS) \
- 		-L$(ODBCLIBS) $(ODBCLIB) \
--		libgtkodbcconfig.la 
-+		libgtkodbcconfig.la \
-+		../../ini/.libs/libinilc.la
- 		
- 
diff --git a/dev-db/unixODBC/files/unixODBC-2.2.11-configure.in.patch b/dev-db/unixODBC/files/unixODBC-2.2.11-configure.in.patch
deleted file mode 100644
index 6b72daa4f58e..000000000000
--- a/dev-db/unixODBC/files/unixODBC-2.2.11-configure.in.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in.orig	2003-12-10 20:08:49.000000000 -0800
-+++ configure.in	2003-12-10 20:11:33.000000000 -0800
-@@ -29,6 +29,7 @@
- 
- if test "x$gui" = "xtrue"; then
- AC_PROG_CXX
-+AC_PATH_X
- else
- dnl This gets around a autoconf problem
- if
diff --git a/dev-db/unixODBC/files/unixODBC-2.2.11-flex.patch b/dev-db/unixODBC/files/unixODBC-2.2.11-flex.patch
deleted file mode 100644
index 80652cd035ca..000000000000
--- a/dev-db/unixODBC/files/unixODBC-2.2.11-flex.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- unixODBC-2.2.6/sqp/lex.l.orig	Wed Oct 17 18:40:32 2001
-+++ unixODBC-2.2.6/sqp/lex.l	Thu Jul 10 11:23:35 2003
-@@ -178,6 +178,7 @@
- 
- '[^'\n]*$	{ 
- 			yyerror( "Unterminated string" ); 
-+			YY_FLUSH_BUFFER;
- 		}
- 
-  /***************************************
-@@ -236,8 +237,6 @@
- void yyerror( char *s )
- {
- 	sprintf( g_szError, "%s processing '%s' on line %d", s, yytext, g_nLineNo );
--	
--	YY_FLUSH_BUFFER;
- }
- 
- /**********************************************************************
diff --git a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
deleted file mode 100644
index c7b8a7b1a9f7..000000000000
--- a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild,v 1.19 2008/03/13 21:42:01 ricmm Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils multilib autotools
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DESCRIPTION="ODBC Interface for Linux."
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="qt3"
-
-DEPEND=">=sys-libs/readline-4.1
-		>=sys-libs/ncurses-5.2
-		qt3? ( =x11-libs/qt-3* )"
-RDEPEND="${DEPEND}"
-
-# the configure.in patch is required for 'use qt3'
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-
-	# solve bug #110167
-	epatch "${FILESDIR}/${P}-flex.patch"
-	# braindead check in configure fails - hackish approach
-	epatch "${FILESDIR}/${P}-configure.in.patch"
-	epatch "${FILESDIR}/${P}-Makefile.am.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	if use qt3 && ! use mips ; then
-		myconf="--enable-gui=yes --x-libraries=/usr/$(get_libdir)"
-	else
-		myconf="--enable-gui=no"
-	fi
-
-	econf --prefix=/usr \
-		--sysconfdir=/etc/${PN} \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README*
-	find doc/ -name "Makefile*" -exec rm '{}' \;
-	dohtml doc/*
-	prepalldocs
-}
diff --git a/dev-db/unixODBC/unixODBC-2.2.12.ebuild b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
index 7289c90405fc..27d8b200f5b6 100644
--- a/dev-db/unixODBC/unixODBC-2.2.12.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
@@ -1,29 +1,26 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.12.ebuild,v 1.15 2008/06/15 17:33:57 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.12.ebuild,v 1.16 2010/03/22 08:35:49 ssuominen Exp $
 
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
 PATCH_VERSION="2.2.12-r0"
 PATCH_P="${PN}-${PATCH_VERSION}-patches"
 
 inherit eutils multilib autotools gnuconfig libtool
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
 DESCRIPTION="ODBC Interface for Linux."
 HOMEPAGE="http://www.unixodbc.org/"
 SRC_URI="http://www.unixodbc.org/${P}.tar.gz
 		mirror://gentoo/${PATCH_P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="qt3 gnome"
+IUSE="gnome"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/readline-4.1
-		>=sys-libs/ncurses-5.2
-		qt3? ( =x11-libs/qt-3* )
-		gnome? ( gnome-base/libgnomeui )
-		sys-devel/libtool"
+	>=sys-libs/ncurses-5.2
+	gnome? ( gnome-base/libgnomeui )
+	sys-devel/libtool"
 DEPEND="${RDEPEND}
 	gnome? ( dev-util/cvs )" # see Bug 173256
 
@@ -50,13 +47,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-
-	if use qt3 && ! use mips ; then
-		myconf="--enable-gui=yes --x-libraries=/usr/$(get_libdir)"
-	else
-		myconf="--enable-gui=no"
-	fi
+	local myconf="--enable-gui=no"
 
 	econf --host=${CHOST} \
 		--prefix=/usr \