diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-22 08:53:48 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-22 08:53:48 +0000 |
commit | c2af13bb246f79e98ea07af74d03126af0df336e (patch) | |
tree | f5956b83bff9afe9d3f9964e1030bad8f0bbaf11 /dev-db | |
parent | Remove USE="qt3" wrt #246932 by Yaroslav Gorbunov. (diff) | |
download | gentoo-2-c2af13bb246f79e98ea07af74d03126af0df336e.tar.gz gentoo-2-c2af13bb246f79e98ea07af74d03126af0df336e.tar.bz2 gentoo-2-c2af13bb246f79e98ea07af74d03126af0df336e.zip |
old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/libodbc++/files/libodbc++-0.2.3-gcc43.patch | 11 | ||||
-rw-r--r-- | dev-db/libodbc++/files/libodbc++-0.2.3-std-streamsize.patch | 11 | ||||
-rw-r--r-- | dev-db/libodbc++/files/libodbc++-0.2.3-typecast.patch | 22 | ||||
-rw-r--r-- | dev-db/libodbc++/libodbc++-0.2.3-r2.ebuild | 81 | ||||
-rw-r--r-- | dev-db/libodbc++/libodbc++-0.2.5.ebuild | 104 |
5 files changed, 0 insertions, 229 deletions
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 index fe76162715d0..000000000000 --- a/dev-db/libodbc++/files/libodbc++-0.2.3-gcc43.patch +++ /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 index 197388982745..000000000000 --- a/dev-db/libodbc++/files/libodbc++-0.2.3-std-streamsize.patch +++ /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 index 39ab72c16f16..000000000000 --- a/dev-db/libodbc++/files/libodbc++-0.2.3-typecast.patch +++ /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_,¤tCol); - 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_,¤tCol); - 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 index 14003e21468a..000000000000 --- a/dev-db/libodbc++/libodbc++-0.2.3-r2.ebuild +++ /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 index 3a0b53ca3458..000000000000 --- a/dev-db/libodbc++/libodbc++-0.2.5.ebuild +++ /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 -} |