old
authorSamuli Suominen <ssuominen@gentoo.org>
Mon, 22 Mar 2010 08:53:48 +0000 (08:53 +0000)
committerSamuli Suominen <ssuominen@gentoo.org>
Mon, 22 Mar 2010 08:53:48 +0000 (08:53 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

dev-db/libodbc++/Manifest
dev-db/libodbc++/files/libodbc++-0.2.3-gcc43.patch [deleted file]
dev-db/libodbc++/files/libodbc++-0.2.3-std-streamsize.patch [deleted file]
dev-db/libodbc++/files/libodbc++-0.2.3-typecast.patch [deleted file]
dev-db/libodbc++/libodbc++-0.2.3-r2.ebuild [deleted file]
dev-db/libodbc++/libodbc++-0.2.5.ebuild [deleted file]

index 0f0cbb8a392ceb32ffaf07fe4ef74ba9730a1201..d3ab509f2cc62b2760fc1912b292602014274489 100644 (file)
@@ -1,13 +1,7 @@
 AUX libodbc++-0.2.3-doxygen.patch 561 RMD160 644cf99e74ae874ae3c3dc287c751adb1d5e1d68 SHA1 c317cff0d26a19021b5f83461aca66c222f72507 SHA256 2642d896e705ab56fc378547ae9eb27e1db136bd54d6ac6656463de24d79f825
 AUX libodbc++-0.2.3-gcc41.patch 456 RMD160 b944a42fdd6dc3069244b40f8a294afb73a66c36 SHA1 9840f6375af232895ff1aa41154eb536d2439f54 SHA256 ad380ec268435405146431e47a9a9bd354be8c0edc1229b315f31c60990a3c43
-AUX libodbc++-0.2.3-gcc43.patch 300 RMD160 6b5204a1f4e69a1344aca8c4114274f0c9f88e47 SHA1 f28675ea6f383d26cc5161e87e0576348cd25c05 SHA256 48f9fb465c90b8ae5ed3c452db188477ebdcaef1eab16bd3f73742eb1ab17d1f
 AUX libodbc++-0.2.3-gcc44.patch 316 RMD160 79b98920c117e9b018dfe517f70793aec6407be1 SHA1 b9138adca4428265e7ab56226cfd9e1842ecf518 SHA256 738490176ed9a8efd3cb28b2260f289bd99603e8c30eb3f986625dcf612479f8
-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
 EBUILD libodbc++-0.2.5-r1.ebuild 3286 RMD160 6d5778ed87da4597b23472a642136190cb2de23b SHA1 c62cdf1422da37cf36c2f71fd672e7a90760d9fc SHA256 602dd6aa2abc4bc1b7495ad6ee1813e3b60b6c3184df484660aff68dddae85cc
-EBUILD libodbc++-0.2.5.ebuild 3312 RMD160 01e183ea51bb20b44b841adc087f7257e5ad5c05 SHA1 fb1dfa76678d4335e43e1f3f45618085afa1b3ed SHA256 53a30f4d141ee1fc3906bac5c6188d1fe1ba6f764482efc821d742085a3972ec
 MISC ChangeLog 3594 RMD160 18162a9f222d37b53fe4318435b4c2a0e9023e32 SHA1 40523c0ca2cb490b93d03e32c668450f51f9941e SHA256 c392a64f807546c37914df33f6b935618e46b9cc748983441432c39d685803e8
 MISC metadata.xml 219 RMD160 38db0f8e5f44d75870709f7d3c98f081451875ef SHA1 9a9a48ef3ef70943b35ffd9b6f97b1a7bf5d64f9 SHA256 3335b69d39a6e311a24d996131a068c8846b17ea832eac15a646e25a6a73c5d7
diff --git a/dev-db/libodbc++/files/libodbc++-0.2.3-gcc43.patch b/dev-db/libodbc++/files/libodbc++-0.2.3-gcc43.patch
deleted file mode 100644 (file)
index fe76162..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- libodbc++-0.2.3/include/odbc++/types.h.orig        2008-06-14 16:39:35.000000000 +0000
-+++ libodbc++-0.2.3/include/odbc++/types.h     2008-06-14 16:39:58.000000000 +0000
-@@ -25,6 +25,7 @@
- #include <odbc++/setup.h>
- 
- #include <exception>
-+#include <cstring>
- 
- #if !defined(ODBCXX_QT)
- # include <string>
-
diff --git a/dev-db/libodbc++/files/libodbc++-0.2.3-std-streamsize.patch b/dev-db/libodbc++/files/libodbc++-0.2.3-std-streamsize.patch
deleted file mode 100644 (file)
index 1973889..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- libodbc++-0.2.3/src/datastream.h   2003-04-21 09:28:38.000000000 -0700
-+++ libodbc++-0.2.3/src/datastream.h   2006-01-03 12:24:13.000000000 -0800
-@@ -63,7 +63,7 @@
-       return 0;
-     }
-     
--    virtual int showmanyc() {
-+    virtual std::streamsize showmanyc() {
-       if(this->gptr() < this->egptr()) {
-       return this->egptr() - this->gptr();
-       }
diff --git a/dev-db/libodbc++/files/libodbc++-0.2.3-typecast.patch b/dev-db/libodbc++/files/libodbc++-0.2.3-typecast.patch
deleted file mode 100644 (file)
index 39ab72c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
deleted file mode 100644 (file)
index 14003e2..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2009 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.8 2009/12/16 11:06:40 ssuominen Exp $
-
-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.gz"
-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"
-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}-gcc43.patch
-       epatch "${FILESDIR}"/${P}-typecast.patch
-       epatch "${FILESDIR}"/${P}-gcc44.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"
-
-       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 NEWS README THANKS TODO
-
-       buildlist="${SB} ${SB_MT}"
-       use qt3 && buildlist="${buildlist} $SB_QT $SB_QT_MT"
-       for sd in ${buildlist}; do
-               cd ${sd}
-               emake DESTDIR="${D}" install || die "make install failed"
-       done
-}
diff --git a/dev-db/libodbc++/libodbc++-0.2.5.ebuild b/dev-db/libodbc++/libodbc++-0.2.5.ebuild
deleted file mode 100644 (file)
index 3a0b53c..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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.2 2010/02/19 21:55:11 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
-               qt3? ( dev-db/unixODBC[qt3] )
-               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_prepare() {
-       #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 () {
-       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
-       if [[ "${P}" != "${PF}" ]]; then
-               mv "${D}"/usr/share/doc/${P}/* "${D}"/usr/share/doc/${PF}/
-               rmdir "${D}"/usr/share/doc/${P}
-       fi
-}