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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 17 insertions, 169 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/Manifest b/dev-db/unixODBC/Manifest
index b2bfbc5229c6..efebfd1c63f1 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,22 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 350-unixODBC-2.2.12-gODBCConfig-as-needed.patch 382 RMD160 080c2947d564ed320071ebd7750cda50886084d6 SHA1 11f482aeeea33fc196b45ba35120755ac88c2978 SHA256 460bbf2dd174d0286b89330d991c3f7030ca7256bce8b16ebf4593572cf7be85
 AUX 360-unixODBC-2.2.12-libltdlfixes.patch 1124 RMD160 ee215893cbdb2aa9672ec63501cd0bddaf08c397 SHA1 0d8fc8b5db51c7bf3ce72abfe7ba8119808702ad SHA256 974942040de5e471274b109ae478f05dea75ac0e5042aaf9eb1acd3f2461d4bf
-AUX unixODBC-2.2.11-Makefile.am.patch 1295 RMD160 4ff252fc9aaa9177770e7493e0e71466e53d3b37 SHA1 2b0953ffb879b8dfc98beab0a01eceeaaa01112b SHA256 669c3f0897fad09cb7dd750319605a34221eaeac633501550ca791a83e7e64c5
-AUX unixODBC-2.2.11-configure.in.patch 239 RMD160 c3821bbe8c815997698d66bf6b1c7151cdb853c5 SHA1 ab6493ab5387d27a3c1130cf46b46f603829d965 SHA256 e41f79814d320104273aa9f9b4eaaece593ed07d14fd36c8a6cfe313c93b80fe
-AUX unixODBC-2.2.11-flex.patch 486 RMD160 5962bd7cceb3547446ec384bbb1474151f0eaaf7 SHA1 4b24b239d3c2240f9df11397150946a84be903ab SHA256 9bd580e29ec4211b8bceccd044cd1bb4c6f32af4ae60b847548d08bbdb011ec7
-DIST unixODBC-2.2.11.tar.gz 2406740 RMD160 533a2733aa9f49bf9e3fd062b6d0ebfdff4dfcf1 SHA1 a8869c38d0f1bb18b33e5165a2a79dd8770f98b3 SHA256 7990bc1652c083ccd2b7915a14e4a3bb1901c5bf988be20001dfcb3dfb58ed88
 DIST unixODBC-2.2.12-r0-patches.tar.bz2 6968 RMD160 5d53a41f4645cd366e18405d23acbf3f87dc9eda SHA1 1aa13bf8a6d031583fae844a7d0d503405607f28 SHA256 da58a4c4a08ccef6416af4cac17bd0d6e89f1c513aecab21d9092bcbae0faefd
 DIST unixODBC-2.2.12.tar.gz 2798077 RMD160 13c9ec87c3fff4a1fceb45ff7a552a0fa8666b16 SHA1 d1cb286fb538c664549153165e2b9183b58a627b SHA256 d8b425e9cd8bf55ac21653d27e017045013a155a6149ca2930e257a146f9fe40
-EBUILD unixODBC-2.2.11-r1.ebuild 1486 RMD160 e75c6c5fcdafd752a9cccab8d1cc10dd6dd0dfbd SHA1 0323fe19593b82238410aa70db74427ff95b8eae SHA256 3d4b4eb7117218dcaaf2fe888e22b4f4478befa9e0235c4df8d2f4d78ddb933a
-EBUILD unixODBC-2.2.12.ebuild 2381 RMD160 4d291c41cf0ce9c9dddc56d6969021192a608c5d SHA1 678e8dd8505c5f13c628d24329dbfb442d710d40 SHA256 20c39e404c36ac52c8ef0b905c80fba2f5bd9bfd666c03b213f3336a31359983
-MISC ChangeLog 10734 RMD160 36a8b9d76e6788220d3ef9abda9bdba2fc0127a9 SHA1 156c77d0d8b7bbc5bc9fbc9b62d96406b1517d1d SHA256 d6c8baff3dddc9447842888c33c754d759ab9f471e459387057cd0d212190852
+EBUILD unixODBC-2.2.12.ebuild 2190 RMD160 26fce83fb57f0b0cad3c1e6f98502a293100cadc SHA1 b39668eda489671712c53a3ace2197cbf913320a SHA256 0096e488b882bd28c40a0b3269afa05f9c014274e45edec7ce3bc8d9252e2977
+MISC ChangeLog 10866 RMD160 67a40291feaf9766061149c253438e8c58149c2c SHA1 126393957bc92c3f3747b86b5eb4e6eef9cd27bf SHA256 44f15f2134d5ee4e9883d2638f9d2dbf3cd4ffc265397e60247804dde104c916
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhVUo4ACgkQV6E0EIywUuWVMwCfR3Uq7HG2eEfmyzfCD07//ujY
-PbkAoIrpvfOWFS12t3NE2EbkeVjB4Brq
-=H5Zz
------END PGP SIGNATURE-----
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 \