Version bump of unixODBC - Bug #111910, thanks to Attila Fazekas <turul16@freemail.hu> for all of the patches. Also fixes bug #143149 for static libraries and bug #169566 for libtool handling.

Package-Manager: portage-2.1.2.3

4 files changed, 132 insertions, 15 deletions

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index 3353a2b7670e..f7a6826f0608 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/unixODBC
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.62 2007/01/04 14:36:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.63 2007/04/01 03:15:15 robbat2 Exp $
+
+*unixODBC-2.2.12 (01 Apr 2007)
+
+  01 Apr 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +unixODBC-2.2.12.ebuild:
+  Version bump of unixODBC - Bug #111910, thanks to Attila Fazekas
+  <turul16@freemail.hu> for all of the patches. Also fixes bug #143149 for
+  static libraries and bug #169566 for libtool handling.
 
   04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   unixODBC-2.2.11-r1.ebuild:
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 33e8e8435440..74ee7d3d5aea 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX unixODBC-2.2.11-Makefile.am.patch 1295 RMD160 4ff252fc9aaa9177770e7493e0e71466e53d3b37 SHA1 2b0953ffb879b8dfc98beab0a01eceeaaa01112b SHA256 669c3f0897fad09cb7dd750319605a34221eaeac633501550ca791a83e7e64c5
 MD5 9e8b6228770e807090916883a6903351 files/unixODBC-2.2.11-Makefile.am.patch 1295
 RMD160 4ff252fc9aaa9177770e7493e0e71466e53d3b37 files/unixODBC-2.2.11-Makefile.am.patch 1295
@@ -14,14 +11,20 @@ MD5 b07177ad3a171508d9be501501809193 files/unixODBC-2.2.11-flex.patch 486
 RMD160 5962bd7cceb3547446ec384bbb1474151f0eaaf7 files/unixODBC-2.2.11-flex.patch 486
 SHA256 9bd580e29ec4211b8bceccd044cd1bb4c6f32af4ae60b847548d08bbdb011ec7 files/unixODBC-2.2.11-flex.patch 486
 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 1489 RMD160 8cec400757556fbda563c4bc59e1e0db22137e79 SHA1 de2b6f64e7a2df1bae6ca76ea770715d02beae7a SHA256 c66704ce78ce66c99492e8a3106c4b6d853d2f7cdc6bc82a21c3990ff5a4164e
 MD5 5e1f7c19d1dacefec8d901e0d3d07bcd unixODBC-2.2.11-r1.ebuild 1489
 RMD160 8cec400757556fbda563c4bc59e1e0db22137e79 unixODBC-2.2.11-r1.ebuild 1489
 SHA256 c66704ce78ce66c99492e8a3106c4b6d853d2f7cdc6bc82a21c3990ff5a4164e unixODBC-2.2.11-r1.ebuild 1489
-MISC ChangeLog 8582 RMD160 bfbdd8162524cb1fd25277fd6511818b405968d3 SHA1 c894e61a509b41518d07ea1823b0c13202564846 SHA256 5a30c9256af599a45c0bcc322c313d071b5fd7ce38bc079b8322dee3318fdb83
-MD5 ecbda80c3aca90c6e07b3b48e09127ab ChangeLog 8582
-RMD160 bfbdd8162524cb1fd25277fd6511818b405968d3 ChangeLog 8582
-SHA256 5a30c9256af599a45c0bcc322c313d071b5fd7ce38bc079b8322dee3318fdb83 ChangeLog 8582
+EBUILD unixODBC-2.2.12.ebuild 2491 RMD160 5aa7ff65824b5ebf7d0bb466ed8b8ce9778adaa2 SHA1 7b8722d546b5efe82f457c175cd01adb88b34968 SHA256 7cb4745a58860bcd449579928a592f11d678243ecb16b5fa5dc904ecff48b714
+MD5 e0be569cb34ff7cb3d72de2d2bacdf58 unixODBC-2.2.12.ebuild 2491
+RMD160 5aa7ff65824b5ebf7d0bb466ed8b8ce9778adaa2 unixODBC-2.2.12.ebuild 2491
+SHA256 7cb4745a58860bcd449579928a592f11d678243ecb16b5fa5dc904ecff48b714 unixODBC-2.2.12.ebuild 2491
+MISC ChangeLog 8892 RMD160 271eb46850126e25832be5af8d3d6a540cfea5da SHA1 e77716e38edaa9174828bdcf42b0a6021afd21c4 SHA256 3a893bebed9ad769d091a71bbf52208ebd78ccaa4fb25405c59b319366ba1f5e
+MD5 04cd042dd3311849c3c6fb6038670598 ChangeLog 8892
+RMD160 271eb46850126e25832be5af8d3d6a540cfea5da ChangeLog 8892
+SHA256 3a893bebed9ad769d091a71bbf52208ebd78ccaa4fb25405c59b319366ba1f5e ChangeLog 8892
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -29,10 +32,6 @@ SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata
 MD5 407e07bb6fbfee45ad38041894170bcf files/digest-unixODBC-2.2.11-r1 250
 RMD160 7cbcf058a8c073af2963815727962caeabe29dcd files/digest-unixODBC-2.2.11-r1 250
 SHA256 3c0ac4cc92bcebf20290bcb7d6da83165c2b55edcb5dc71c367b19b124829fa4 files/digest-unixODBC-2.2.11-r1 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFnREGAiZjviIA2XgRAki3AJ0UrSlsCwt0vNGx6OODtf7NRgjQ4ACfVqP+
-BDxqYcxvxFFRkVDfF9Mo3Ik=
-=025k
------END PGP SIGNATURE-----
+MD5 aa7ce1ec186b5c706a1f85a8637e0f42 files/digest-unixODBC-2.2.12 527
+RMD160 fa0255ad32903f307e8658da171a240c7ba9b5aa files/digest-unixODBC-2.2.12 527
+SHA256 d7ac74c72be9e156cdc18603656f7d5bc39e1c958802db08b4fec82971d3d8e4 files/digest-unixODBC-2.2.12 527
diff --git a/dev-db/unixODBC/files/digest-unixODBC-2.2.12 b/dev-db/unixODBC/files/digest-unixODBC-2.2.12
new file mode 100644
index 000000000000..76e427f17f80
--- /dev/null
+++ b/dev-db/unixODBC/files/digest-unixODBC-2.2.12
@@ -0,0 +1,6 @@
+MD5 2c34c7d903f0d850da0580e0ae50cad9 unixODBC-2.2.12-r0-patches.tar.bz2 6968
+RMD160 5d53a41f4645cd366e18405d23acbf3f87dc9eda unixODBC-2.2.12-r0-patches.tar.bz2 6968
+SHA256 da58a4c4a08ccef6416af4cac17bd0d6e89f1c513aecab21d9092bcbae0faefd unixODBC-2.2.12-r0-patches.tar.bz2 6968
+MD5 9a116aad4059c31d231b626ffdf1869a unixODBC-2.2.12.tar.gz 2798077
+RMD160 13c9ec87c3fff4a1fceb45ff7a552a0fa8666b16 unixODBC-2.2.12.tar.gz 2798077
+SHA256 d8b425e9cd8bf55ac21653d27e017045013a155a6149ca2930e257a146f9fe40 unixODBC-2.2.12.tar.gz 2798077
diff --git a/dev-db/unixODBC/unixODBC-2.2.12.ebuild b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
new file mode 100644
index 000000000000..a9400b4cf2bf
--- /dev/null
+++ b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2007 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.1 2007/04/01 03:15:15 robbat2 Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+PATCH_VERSION="2.2.12-r0"
+PATCH_P="${PN}-${PATCH_VERSION}-patches"
+
+inherit eutils multilib autotools gnuconfig
+
+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"
+
+DEPEND=">=sys-libs/readline-4.1
+		>=sys-libs/ncurses-5.2
+		qt3? ( =x11-libs/qt-3* )
+		gnome? ( gnome-base/libgnomeui )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch ${WORKDIR}/${PATCH_P}/*
+	#epatch "${FILESDIR}/${P}-configure.in.patch"
+	#epatch "${FILESDIR}/${P}-qt.m4.patch"
+	#epatch "${FILESDIR}/${P}-gODBCConfig-Makefile.am.patch"
+	#epatch "${FILESDIR}/${P}-gODBCConfig-configure.in.patch"
+	#epatch "${FILESDIR}/${P}-gODBCConfig-odbcconfig.c.patch"
+	#epatch "${FILESDIR}/${P}-gODBCConfig-support.c.patch"
+	#epatch "${FILESDIR}/${P}-gODBCConfig-support.h.patch"
+}
+
+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
+
+# Detect mips systems properly
+	gnuconfig_update
+	eautoreconf
+
+	econf --host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc/${PN} \
+		--libdir=/usr/$(get_libdir) \
+		--enable-static \
+		--enable-fdb \
+		${myconf} || die "econf failed"
+	emake -j1 || die "emake failed"
+
+	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
+		touch ChangeLog
+		gnuconfig_update
+		autoreconf --install
+		econf --host=${CHOST} \
+			--with-odbc=${S} \
+			--enable-static \
+			--prefix=/usr \
+			--sysconfdir=/etc/${PN} || die "econf gODBCConfig failed"
+		ln -s ../depcomp .
+		ln -s ../libtool .
+
+		emake || die "emake gODBCConfig failed"
+		cd ..
+	fi
+}
+
+
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	if use gnome;
+	then
+		cd gODBCConfig
+		emake DESTDIR=${D} install || die "emake gODBCConfig install failed"
+		cd ..
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README*
+	find doc/ -name "Makefile*" -exec rm '{}' \;
+	dohtml doc/*
+	prepalldocs
+}
+