diff options
| -rw-r--r-- | dev-db/unixODBC/ChangeLog | 12 | ||||
| -rw-r--r-- | dev-db/unixODBC/Manifest | 3 | ||||
| -rw-r--r-- | dev-db/unixODBC/files/digest-unixODBC-2.2.11-r1 | 1 | ||||
| -rw-r--r-- | dev-db/unixODBC/files/unixODBC-2.2.11-Makefile.am.patch | 41 | ||||
| -rw-r--r-- | dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild | 92 |
5 files changed, 148 insertions, 1 deletions
diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog index c47346e08d24..d2d6a66ab1a7 100644 --- a/dev-db/unixODBC/ChangeLog +++ b/dev-db/unixODBC/ChangeLog @@ -1,6 +1,16 @@ # 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.44 2005/07/25 15:38:13 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.45 2005/08/12 13:25:50 caleb Exp $ + + 12 Aug 2005; Caleb Tennis <caleb@gentoo.org> + +files/unixODBC-2.2.11-Makefile.am.patch, +unixODBC-2.2.11-r1.ebuild: + Bump to x86 stable + +*unixODBC-2.2.11-r1 (12 Aug 2005) + + 12 Aug 2005; Caleb Tennis <caleb@gentoo.org> + +files/unixODBC-2.2.11-Makefile.am.patch, +unixODBC-2.2.11-r1.ebuild: + Add a patch to fix a compilation issue 25 Jul 2005; Caleb Tennis <caleb@gentoo.org> unixODBC-2.2.11.ebuild: Fix qt dep diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest index 0be348e9d14f..42de07dbed51 100644 --- a/dev-db/unixODBC/Manifest +++ b/dev-db/unixODBC/Manifest @@ -4,11 +4,14 @@ 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 fa5c8601aa8d0ca9486efb4204c4b962 unixODBC-2.2.11.ebuild 1943 +MD5 699932c903f17b169ea02bbc522e4404 unixODBC-2.2.11-r1.ebuild 1985 MD5 128e2ec24f0d8b4ca460563486bc7d70 ChangeLog 5811 MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225 MD5 ffd3cee4e2a1f6dffc130557ccda934b files/gentoo-yac.diff 316 +MD5 4baf7bca71abaad73ebb6a576517f435 files/digest-unixODBC-2.2.11-r1 68 MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.6-configure.in.patch 239 MD5 4eaaa819fc28ee784da166d14e9f7fad files/digest-unixODBC-2.2.6-r1 67 +MD5 9e8b6228770e807090916883a6903351 files/unixODBC-2.2.11-Makefile.am.patch 1295 MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.11-configure.in.patch 239 MD5 4baf7bca71abaad73ebb6a576517f435 files/digest-unixODBC-2.2.11 68 MD5 f383c7806ba5f687ba55d5f1bc6a36aa files/digest-unixODBC-2.0.8 67 diff --git a/dev-db/unixODBC/files/digest-unixODBC-2.2.11-r1 b/dev-db/unixODBC/files/digest-unixODBC-2.2.11-r1 new file mode 100644 index 000000000000..365defd88551 --- /dev/null +++ b/dev-db/unixODBC/files/digest-unixODBC-2.2.11-r1 @@ -0,0 +1 @@ +MD5 9ae806396844e38244cf65ad26ba0f23 unixODBC-2.2.11.tar.gz 2406740 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 new file mode 100644 index 000000000000..0417ff29cd8a --- /dev/null +++ b/dev-db/unixODBC/files/unixODBC-2.2.11-Makefile.am.patch @@ -0,0 +1,41 @@ +--- 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/unixODBC-2.2.11-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild new file mode 100644 index 000000000000..102756922669 --- /dev/null +++ b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild @@ -0,0 +1,92 @@ +# 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-r1.ebuild,v 1.1 2005/08/12 13:25:50 caleb 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="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86" +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* )" + +# 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 + epatch ${FILESDIR}/${P}-Makefile.am.patch + aclocal && \ + libtoolize -c -f && \ + automake && \ + autoconf || die "autotools 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 +} |