Version bump thanks to Russell Chait. Fixes bug #77508

(Portage version: 2.0.51.22-r1)

5 files changed, 117 insertions, 7 deletions

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index 73394cea5344..66133a79ab80 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,12 @@
 # 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.42 2005/07/07 04:31:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.43 2005/07/16 00:10:47 dragonheart Exp $
+
+*unixODBC-2.2.11 (16 Jul 2005)
+
+  16 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/unixODBC-2.2.11-configure.in.patch, +unixODBC-2.2.11.ebuild:
+  Version bump thanks to Russell Chait. Fixes bug #77508
 
   07 Jul 2005; Caleb Tennis <caleb@gentoo.org> unixODBC-2.2.2.ebuild,
   unixODBC-2.2.6.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.8.ebuild:
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 3da36ae1106b..915b478307ca 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,14 +1,17 @@
-MD5 6b993e56b0c08a88fccb44abfc1ed502 unixODBC-2.2.2.ebuild 1282
+MD5 3ee4c39e57bd1565ce249769c923301c ChangeLog 5513
+MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
 MD5 eea61e477011ec918b75ba766aaad67a unixODBC-2.0.8.ebuild 969
+MD5 6b993e56b0c08a88fccb44abfc1ed502 unixODBC-2.2.2.ebuild 1282
 MD5 b9f4602957a14f85748533d4f1fcfd4b unixODBC-2.2.6.ebuild 1566
 MD5 7956dac74a0516140e437590070a0150 unixODBC-2.2.6-r1.ebuild 1638
 MD5 83a56fac1dc29fabea067942e93f768f unixODBC-2.2.8.ebuild 2083
-MD5 3ee4c39e57bd1565ce249769c923301c ChangeLog 5513
-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 061ffda0ee97873c8f7643ee1ca237ff unixODBC-2.2.11.ebuild 1952
 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 ffd3cee4e2a1f6dffc130557ccda934b files/gentoo-yac.diff 316
+MD5 4eaaa819fc28ee784da166d14e9f7fad files/digest-unixODBC-2.2.6-r1 67
+MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.6-configure.in.patch 239
 MD5 a60388d8cb9cb0dca3df5429fb364051 files/digest-unixODBC-2.2.8 67
+MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.11-configure.in.patch 239
+MD5 4baf7bca71abaad73ebb6a576517f435 files/digest-unixODBC-2.2.11 68
diff --git a/dev-db/unixODBC/files/digest-unixODBC-2.2.11 b/dev-db/unixODBC/files/digest-unixODBC-2.2.11
new file mode 100644
index 000000000000..365defd88551
--- /dev/null
+++ b/dev-db/unixODBC/files/digest-unixODBC-2.2.11
@@ -0,0 +1 @@
+MD5 9ae806396844e38244cf65ad26ba0f23 unixODBC-2.2.11.tar.gz 2406740
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
new file mode 100644
index 000000000000..6b72daa4f58e
--- /dev/null
+++ b/dev-db/unixODBC/files/unixODBC-2.2.11-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.11.ebuild b/dev-db/unixODBC/unixODBC-2.2.11.ebuild
new file mode 100644
index 000000000000..f7db36503e60
--- /dev/null
+++ b/dev-db/unixODBC/unixODBC-2.2.11.ebuild
@@ -0,0 +1,90 @@
+# 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.11.ebuild,v 1.1 2005/07/16 00:10:47 dragonheart Exp $
+
+inherit eutils gnuconfig
+
+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 ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~s390 ~ppc64"
+IUSE="qt gnome"
+
+DEPEND="virtual/libc
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	gnome? ( gnome-base/gnome-libs )
+	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
+
+	libtoolize --copy --force || die "libtoolize failed"
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	local myconf
+
+	if use qt && ! use mips;
+	then
+		myconf="--enable-gui=yes --x-libraries=/usr/lib "
+	else
+		myconf="--enable-gui=no"
+	fi
+
+	# Detect mips systems properly
+	gnuconfig_update
+
+	./configure --host=${CHOST} \
+		    --prefix=/usr \
+		    --sysconfdir=/etc/unixODBC \
+		    ${myconf} || die
+
+	make || die
+
+	if use gnome;
+	then
+		# Symlink for configure
+		ln -s ${S}/odbcinst/.libs ./lib
+		# Symlink for libtool
+		ln -s ${S}/odbcinst/.libs ./lib/.libs
+		cd gODBCConfig
+		./configure --host=${CHOST} \
+				--with-odbc=${S} \
+				--prefix=/usr \
+				--x-libraries=/usr/lib \
+				--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 gnome;
+	then
+		cd gODBCConfig
+		make DESTDIR=${D} install || die
+		cd ..
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README*
+	find doc/ -name "Makefile*" -exec rm '{}' \;
+	dohtml doc/*
+	prepalldocs
+}