added X autoconf patch from bug #35570

5 files changed, 100 insertions, 4 deletions

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index ad556be226cb..c9d5cb4e7452 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/unixODBC
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.20 2004/01/08 09:21:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.21 2004/02/11 05:18:55 rphillips Exp $
+
+*unixODBC-2.2.6-r1 (10 Feb 2004)
+
+  10 Feb 2004; root <root@gentoo.org> unixODBC-2.2.6-r1.ebuild:
+  Added William Blew's patch. Bug #35570
 
   08 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> unixODBC-2.2.6.ebuild:
   bump to ppc stable
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index ed4357107fe8..f4d25b5bd908 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,9 +1,12 @@
 MD5 2352820d0c329b031a28ed77cd6be6d3 unixODBC-2.2.2.ebuild 1297
 MD5 0bd88c25618464c75595f9e0e39195ff unixODBC-2.0.8.ebuild 1108
+MD5 5745da25ab3811eae8c558cbdb756445 unixODBC-2.2.6.ebuild 1522
+MD5 9e16e7c503c7950bfb5c5750fc1b1a13 unixODBC-2.2.6-r1.ebuild 1613
+MD5 4cf9305512c7438ec8ab0ef367d0236c ChangeLog 2745
+MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
 MD5 ffd3cee4e2a1f6dffc130557ccda934b files/gentoo-yac.diff 316
+MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.6-configure.in.patch 239
+MD5 4eaaa819fc28ee784da166d14e9f7fad files/digest-unixODBC-2.2.6-r1 67
 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 5745da25ab3811eae8c558cbdb756445 unixODBC-2.2.6.ebuild 1522
-MD5 45f84ae0fc59a793972430e7d8b8223b ChangeLog 2605
-MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
diff --git a/dev-db/unixODBC/files/digest-unixODBC-2.2.6-r1 b/dev-db/unixODBC/files/digest-unixODBC-2.2.6-r1
new file mode 100644
index 000000000000..03fbb95c7531
--- /dev/null
+++ b/dev-db/unixODBC/files/digest-unixODBC-2.2.6-r1
@@ -0,0 +1 @@
+MD5 748ce54e34b2b339c99a8b1ddaee54f5 unixODBC-2.2.6.tar.gz 2179245
diff --git a/dev-db/unixODBC/files/unixODBC-2.2.6-configure.in.patch b/dev-db/unixODBC/files/unixODBC-2.2.6-configure.in.patch
new file mode 100644
index 000000000000..6b72daa4f58e
--- /dev/null
+++ b/dev-db/unixODBC/files/unixODBC-2.2.6-configure.in.patch
@@ -0,0 +1,10 @@
+--- 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/unixODBC-2.2.6-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
new file mode 100644
index 000000000000..6ea949529f3a
--- /dev/null
+++ b/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2003 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.1 2004/02/11 05:18:55 rphillips Exp $
+
+DESCRIPTION="ODBC Interface for Linux"
+HOMEPAGE="http://www.unixodbc.org/"
+SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~hppa ~alpha ~amd64 ~sparc"
+IUSE="qt gtk"
+
+DEPEND="virtual/glibc
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	qt? ( >=x11-libs/qt-3.0* )"
+
+# the configure.in patch is required for 'use qt'
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+						 
+# braindead check in configure fails - hack approach
+	epatch ${FILESDIR}/${P}-configure.in.patch
+												  
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	local myconf
+
+	if [ "`use qt`" ]
+	then
+		myconf="--enable-gui=yes"
+	else
+		myconf="--enable-gui=no"
+	fi
+
+	./configure --host=${CHOST} \
+		    --prefix=/usr \
+		    --sysconfdir=/etc/unixODBC \
+		    ${myconf} || die
+
+	make || die
+
+	if [ "`use gtk`" ]
+	then
+		cd gODBCConfig
+		./configure --host=${CHOST} \
+				--prefix=/usr \
+				--sysconfdir=/etc/unixODBC \
+				${myconf} || die
+
+		# not sure why these symlinks are needed. busted configure, i guess...
+		ln -s ../depcomp .
+		ln -s ../libtool .
+		make || die
+		cd ..
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	if [ "`use gtk`" ]
+	then
+		cd gODBCConfig
+		make DESTDIR=${D} install || die
+		cd ..
+	fi
+
+	dodoc AUTHORS COPYING ChangeLog NEWS README*
+	find doc/ -name "Makefile*" -exec rm '{}' \;
+	dohtml doc/*
+	prepalldocs
+}