3 files changed, 115 insertions, 3 deletions
diff --git a/dev-db/libodbc++/ChangeLog b/dev-db/libodbc++/ChangeLog
index 90634e43e3bd..09a71a2122a0 100644
--- a/dev-db/libodbc++/ChangeLog
+++ b/dev-db/libodbc++/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/libodbc++
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/ChangeLog,v 1.18 2009/12/16 11:06:40 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/ChangeLog,v 1.19 2010/02/19 21:41:22 robbat2 Exp $
+
+*libodbc++-0.2.5 (19 Feb 2010)
+
+  19 Feb 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +libodbc++-0.2.5.ebuild:
+  Bug #282982: version bump. Upstream build system has lots of bugs however,
+  so there is no longer any isql++ CLI tool, nor non-mt Qt build, as neither
+  of them build.
 
   16 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
   libodbc++-0.2.3-r2.ebuild:
diff --git a/dev-db/libodbc++/Manifest b/dev-db/libodbc++/Manifest
index eb186eafa818..cc3c3d07f459 100644
--- a/dev-db/libodbc++/Manifest
+++ b/dev-db/libodbc++/Manifest
@@ -5,6 +5,8 @@ AUX libodbc++-0.2.3-gcc44.patch 316 RMD160 79b98920c117e9b018dfe517f70793aec6407
 AUX libodbc++-0.2.3-std-streamsize.patch 358 RMD160 0ca0ef123943fa4e80e3a8d4edc6b6f5a115322f SHA1 82451d837199c8fb594261006483fa3f2268f2e1 SHA256 0ee73b37752273016a2b18ceb8c301412128883e86d61d61a4f43a39811681b9
 AUX libodbc++-0.2.3-typecast.patch 917 RMD160 de780c1267e223d66f70aaf58968e878239e7daf SHA1 890c6473b667a0ada692d5191ea5abb1191c24a4 SHA256 8781b693764801bb37237ea59d6f8ad8c51c7ea0cd9ebdef8c3bb747ea291d19
 DIST libodbc++-0.2.3.tar.gz 450097 RMD160 dc6f8cad2a10d028a4a40099c453528ab093e605 SHA1 962860ed6bb569c57d35fcc324d2b624d2260074 SHA256 06f93e2f828eeedaa51be51b65c8bb9324b52ce2e39530da6f9ce43f91991758
+DIST libodbc++-0.2.5.tar.bz2 362310 RMD160 c9f4e73d5f0cf2a99d1b684a56678aa65b5caafd SHA1 8a77921b21c23926042c413f4a7a187a3656025b SHA256 ba3030a27b34e4aafbececa2ddbbf42a38815e9534f34c051620540531b5e23e
 EBUILD libodbc++-0.2.3-r2.ebuild 2324 RMD160 e20405b6f3aa3b4a5d6fe86bc542e807ef35c49a SHA1 c6dd268f20696a5f16fadf911f1bb6a380cf5b8f SHA256 4eeea2d6a62bc5fc558fe621204cb4656546d2467ace604f3faa0eb07b459af7
-MISC ChangeLog 2920 RMD160 0ddb5bee3d6335817d225b113ac3c95e3b43148b SHA1 0d44ee0b601ac95c7734fab101a956a706f16191 SHA256 d7895dad304f449ef6f1e02546c16d5c8d8f17bc71d2131e631132b3b76f3267
+EBUILD libodbc++-0.2.5.ebuild 3181 RMD160 67ca971e00c4a6ac620bd1a8557908c8f80a4e1d SHA1 95a02ee57b684516b060659c107a1616b9f57cf6 SHA256 f885b439f586c11896b657fa4c75cdd6a5b4013932758f142906d25b6df7b124
+MISC ChangeLog 3202 RMD160 c2af2fcc30a830c27c87ab72ff716d8d9ef85cf6 SHA1 c5e87e7f78d1ec847a2fba9e1f7bcaa102ac5ffc SHA256 7c697c5a9b61a2ea676272009a71b35cbf50e2fd237eb59066b00cb0715b220d
 MISC metadata.xml 219 RMD160 38db0f8e5f44d75870709f7d3c98f081451875ef SHA1 9a9a48ef3ef70943b35ffd9b6f97b1a7bf5d64f9 SHA256 3335b69d39a6e311a24d996131a068c8846b17ea832eac15a646e25a6a73c5d7
diff --git a/dev-db/libodbc++/libodbc++-0.2.5.ebuild b/dev-db/libodbc++/libodbc++-0.2.5.ebuild
new file mode 100644
index 000000000000..1256aa8baf15
--- /dev/null
+++ b/dev-db/libodbc++/libodbc++-0.2.5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/libodbc++-0.2.5.ebuild,v 1.1 2010/02/19 21:41:22 robbat2 Exp $
+
+EAPI=2
+inherit eutils flag-o-matic
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+
+DESCRIPTION="Libodbc++ is a c++ class library that provides a subset of the well-known JDBC 2.0(tm) and runs on top of ODBC."
+SRC_URI="mirror://sourceforge/libodbcxx/${P}.tar.bz2"
+HOMEPAGE="http://libodbcxx.sourceforge.net/"
+LICENSE="LGPL-2.1"
+SLOT=0
+IUSE="qt3"
+
+DEPEND="dev-db/unixODBC
+		sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+SB="${S}-build"
+SB_MT="${S}-build-mt"
+# non-mt QT does not build presently.
+#SB_QT="${S}-build_qt"
+SB_QT_MT="${S}-build_qt-mt"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	#epatch "${FILESDIR}"/${PN}-0.2.3-std-streamsize.patch
+	epatch "${FILESDIR}"/${PN}-0.2.3-doxygen.patch
+	epatch "${FILESDIR}"/${PN}-0.2.3-gcc41.patch
+	#epatch "${FILESDIR}"/${PN}-0.2.3-gcc43.patch
+	#epatch "${FILESDIR}"/${PN}-0.2.3-typecast.patch
+	epatch "${FILESDIR}"/${PN}-0.2.3-gcc44.patch
+
+	# Fix configure to use ncurses instead of termcap (bug #103105)
+	sed -i -e 's~termcap~ncurses~g' configure
+}
+
+src_configure() {
+	local commonconf buildlist
+	commonconf="--with-odbc=/usr --without-tests"
+	commonconf="${commonconf} --enable-static --enable-shared"
+	# " --enable-threads"
+
+	export ECONF_SOURCE="${S}"
+	append-flags -DODBCXX_DISABLE_READLINE_HACK
+
+	buildlist="${SB} ${SB_MT}"
+	use qt3 && buildlist="${buildlist} $SB_QT $SB_QT_MT"
+
+	for sd in ${buildlist}; do
+		einfo "Doing configure pass for $sd"
+		mkdir -p "${sd}"
+		cd "${sd}"
+		commonconf2=''
+		LIBS=''
+		[ "${sd}" == "${SB_MT}" -o "${sd}" == "${SB_QT_MT}" ] && commonconf2="${commonconf2} --enable-threads"
+		[ "${sd}" == "${SB_QT}" -o "${sd}" == "${SB_QT_MT}" ] && commonconf2="${commonconf2} --with-qt"
+		# isql++ tool fails to compile:
+		#libodbc++-0.2.5/isql++/isql++.cpp: In constructor 'Isql::Isql(odbc::Connection*)':
+		#libodbc++-0.2.5/isql++/isql++.cpp:275: error: invalid cast to function type 'char** ()()'
+		#[ "${sd}" == "${SB}" ] && commonconf2="${commonconf2} --with-isqlxx"
+		# Upstream configure is broken as well, passing --without or
+		# --with-isqlxx=no will turn it ON instead of forcing it off.
+		#commonconf2="${commonconf2} _-without-isqlxx"
+		[ "${sd}" == "${SB_QT}" ] && commonconf2="${commonconf2} --with-qtsqlxx"
+		export LIBS
+		# using without-qt breaks the build
+		#--without-qt \
+		econf \
+			${commonconf} \
+			${commonconf2} \
+			|| die "econf failed"
+	done
+}
+
+src_compile() {
+	local buildlist failures
+	buildlist="${SB} ${SB_MT}"
+	use qt3 && buildlist="${buildlist} $SB_QT $SB_QT_MT"
+	for sd in ${buildlist}; do
+		einfo "Doing compile pass for $sd"
+		cd "${sd}"
+		emake LIBS='' || failures="${failures} ${sd//${S}-}"
+	done
+	[ -n "${failures}" ] && die "Failures: ${failures}"
+}
+
+src_install () {
+	cd "${S}"
+	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
+
+	buildlist="${SB} ${SB_MT}"
+	use qt3 && buildlist="${buildlist} $SB_QT $SB_QT_MT"
+	for sd in ${buildlist}; do
+		einfo "Doing install pass for $sd"
+		cd ${sd}
+		emake DESTDIR="${D}" install || die "make install failed"
+	done
+}