Bug #103105 - migrate away from libtermcap-compat. Bug #149533 - compile fix for newer GCC.

(Portage version: 2.1.2_pre2)

6 files changed, 116 insertions, 1 deletions

diff --git a/dev-db/libodbc++/ChangeLog b/dev-db/libodbc++/ChangeLog
index 509b1f968032..8b37272b0227 100644
--- a/dev-db/libodbc++/ChangeLog
+++ b/dev-db/libodbc++/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/libodbc++
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/ChangeLog,v 1.9 2006/06/24 05:09:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/ChangeLog,v 1.10 2006/09/30 18:14:31 robbat2 Exp $
+
+*libodbc++-0.2.3-r2 (30 Sep 2006)
+
+  30 Sep 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/libodbc++-0.2.3-typecast.patch, +libodbc++-0.2.3-r2.ebuild:
+  Bug #103105 - migrate away from libtermcap-compat. Bug #149533 - compile fix
+  for newer GCC.
 
   24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> libodbc++-0.2.3.ebuild,
   libodbc++-0.2.3-r1.ebuild:
diff --git a/dev-db/libodbc++/files/digest-libodbc++-0.2.3 b/dev-db/libodbc++/files/digest-libodbc++-0.2.3
index 424216231d25..3b13b4fc83af 100644
--- a/dev-db/libodbc++/files/digest-libodbc++-0.2.3
+++ b/dev-db/libodbc++/files/digest-libodbc++-0.2.3
@@ -1 +1,3 @@
 MD5 92cb6171e5235324c710d89cd271eff9 libodbc++-0.2.3.tar.gz 450097
+RMD160 dc6f8cad2a10d028a4a40099c453528ab093e605 libodbc++-0.2.3.tar.gz 450097
+SHA256 06f93e2f828eeedaa51be51b65c8bb9324b52ce2e39530da6f9ce43f91991758 libodbc++-0.2.3.tar.gz 450097
diff --git a/dev-db/libodbc++/files/digest-libodbc++-0.2.3-r1 b/dev-db/libodbc++/files/digest-libodbc++-0.2.3-r1
index 424216231d25..3b13b4fc83af 100644
--- a/dev-db/libodbc++/files/digest-libodbc++-0.2.3-r1
+++ b/dev-db/libodbc++/files/digest-libodbc++-0.2.3-r1
@@ -1 +1,3 @@
 MD5 92cb6171e5235324c710d89cd271eff9 libodbc++-0.2.3.tar.gz 450097
+RMD160 dc6f8cad2a10d028a4a40099c453528ab093e605 libodbc++-0.2.3.tar.gz 450097
+SHA256 06f93e2f828eeedaa51be51b65c8bb9324b52ce2e39530da6f9ce43f91991758 libodbc++-0.2.3.tar.gz 450097
diff --git a/dev-db/libodbc++/files/digest-libodbc++-0.2.3-r2 b/dev-db/libodbc++/files/digest-libodbc++-0.2.3-r2
new file mode 100644
index 000000000000..3b13b4fc83af
--- /dev/null
+++ b/dev-db/libodbc++/files/digest-libodbc++-0.2.3-r2
@@ -0,0 +1,3 @@
+MD5 92cb6171e5235324c710d89cd271eff9 libodbc++-0.2.3.tar.gz 450097
+RMD160 dc6f8cad2a10d028a4a40099c453528ab093e605 libodbc++-0.2.3.tar.gz 450097
+SHA256 06f93e2f828eeedaa51be51b65c8bb9324b52ce2e39530da6f9ce43f91991758 libodbc++-0.2.3.tar.gz 450097
diff --git a/dev-db/libodbc++/files/libodbc++-0.2.3-typecast.patch b/dev-db/libodbc++/files/libodbc++-0.2.3-typecast.patch
new file mode 100644
index 000000000000..39ab72c16f16
--- /dev/null
+++ b/dev-db/libodbc++/files/libodbc++-0.2.3-typecast.patch
@@ -0,0 +1,22 @@
+--- a/libodbc++-0.2.3/src/preparedstatement.cpp	2001-06-12 11:38:32.000000000 +0100
++++ b/libodbc++-0.2.3/src/preparedstatement.cpp	2006-09-29 12:28:42.000000000 +0100
+@@ -303,7 +303,7 @@
+       r=SQLParamData(hstmt_,&currentCol);
+       this->_checkStmtError(hstmt_,r,"SQLParamData failure");
+       if(r==SQL_NEED_DATA) {
+-	DataHandler* dh=rowset_->getColumn((int)currentCol);
++	DataHandler* dh=rowset_->getColumn((long)currentCol);
+ 
+ 	assert(dh->isStreamed_);
+ 	
+--- a/libodbc++-0.2.3/src/resultset.cpp	2003-06-17 10:58:45.000000000 +0100
++++ b/libodbc++-0.2.3/src/resultset.cpp	2006-09-29 12:38:58.000000000 +0100
+@@ -528,7 +528,7 @@
+       r=SQLParamData(hstmt_,&currentCol);
+       this->_checkStmtError(hstmt_,r,"SQLParamData failure");
+       if(r==SQL_NEED_DATA) {
+-	DataHandler* dh=rowset_->getColumn((int)currentCol);
++	DataHandler* dh=rowset_->getColumn((long)currentCol);
+ 
+ 	assert(dh->isStreamed_);
+ 
diff --git a/dev-db/libodbc++/libodbc++-0.2.3-r2.ebuild b/dev-db/libodbc++/libodbc++-0.2.3-r2.ebuild
new file mode 100644
index 000000000000..657a8df29674
--- /dev/null
+++ b/dev-db/libodbc++/libodbc++-0.2.3-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/libodbc++-0.2.3-r2.ebuild,v 1.1 2006/09/30 18:14:31 robbat2 Exp $
+
+inherit eutils
+
+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.gz"
+HOMEPAGE="http://libodbcxx.sourceforge.net/"
+LICENSE="LGPL-2.1"
+DEPEND="dev-db/unixODBC
+		sys-libs/ncurses"
+KEYWORDS="~x86 ~ppc ~hppa ~alpha ~amd64"
+IUSE="qt3"
+SLOT=0
+
+SB="${S}-build"
+SB_MT="${S}-build-mt"
+SB_QT="${S}-build_qt"
+SB_QT_MT="${S}-build_qt-mt"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-std-streamsize.patch
+	epatch "${FILESDIR}"/${P}-doxygen.patch
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${P}-typecast.patch
+
+	# Fix configure to use ncurses instead of termcap (bug #103105)
+	cd ${S}
+	sed -i -e 's~termcap~ncurses~g' configure
+}
+
+src_compile() {
+	local commonconf
+	commonconf="--with-odbc=/usr --without-tests"
+	commonconf="${commonconf} --enable-static --enable-shared"
+	# " --enable-threads"
+	if ! has ccache FEATURES; then
+		einfo "ccache would really help you compiling this package..."
+	fi
+
+	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
+		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"
+		[ "${sd}" == "${SB}" ] && commonconf2="${commonconf2} --with-isqlxx"
+		[ "${sd}" == "${SB_QT}" ] && commonconf2="${commonconf2} --with-qtsqlxx"
+		export LIBS
+		# using without-qt breaks the build
+		#--without-qt \
+		econf \
+			${commonconf} \
+			${commonconf2} \
+			|| die "econf failed"
+		emake || die "emake failed"
+	done
+}
+
+src_install () {
+	cd ${S}
+	dodoc AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README THANKS TODO
+
+	buildlist="${SB} ${SB_MT}"
+	use qt3 && buildlist="${buildlist} $SB_QT $SB_QT_MT"
+	for sd in ${buildlist}; do
+		cd ${sd}
+		make DESTDIR=${D} install || die "make install failed"
+	done
+}