[gentoo-commits] gentoo-x86 commit in dev-db/libodbc++: ChangeLog libodbc++-0.2.5-r2.ebuild libodbc++-0.2.5-r1.ebuild

[gentoo-commits] gentoo-x86 commit in dev-db/libodbc++: ChangeLog libodbc++-0.2.5-r2.ebuild libodbc++-0.2.5-r1.ebuild

[Sergey Popov (pinkbyte)]

pinkbyte    15/05/22 06:39:56

  Modified:             ChangeLog
  Added:                libodbc++-0.2.5-r2.ebuild
  Removed:              libodbc++-0.2.5-r1.ebuild
  Log:
  Revision bump: EAPI 5, add support for user patches, do not build static libs unconditionally. Fix build error with undeclared ODBCXX_STRING_PERCENT symbol, bug #532356, patch by Duane Griffin <duaneg AT dghda.com>. Drop old revision
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x60C0742D1F357D42)

Revision  Changes    Path
1.23                 dev-db/libodbc++/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/libodbc++/ChangeLog?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/libodbc++/ChangeLog?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/libodbc++/ChangeLog?r1=1.22&r2=1.23

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/libodbc++/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog	10 Aug 2014 20:01:08 -0000	1.22
+++ ChangeLog	22 May 2015 06:39:56 -0000	1.23
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/libodbc++
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/ChangeLog,v 1.22 2014/08/10 20:01:08 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/ChangeLog,v 1.23 2015/05/22 06:39:56 pinkbyte Exp $
+
+*libodbc++-0.2.5-r2 (22 May 2015)
+
+  22 May 2015; Sergey Popov <pinkbyte@gentoo.org> -libodbc++-0.2.5-r1.ebuild,
+  +libodbc++-0.2.5-r2.ebuild:
+  Revision bump: EAPI 5, add support for user patches, do not build static libs
+  unconditionally. Fix build error with undeclared ODBCXX_STRING_PERCENT
+  symbol, bug #532356, patch by Duane Griffin <duaneg AT dghda.com>. Drop old
+  revision
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> libodbc++-0.2.5-r1.ebuild:
   QA: drop trailing '.' from DESCRIPTION



1.1                  dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild?rev=1.1&content-type=text/plain

Index: libodbc++-0.2.5-r2.ebuild
===================================================================
# Copyright 1999-2015 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-r2.ebuild,v 1.1 2015/05/22 06:39:56 pinkbyte Exp $

EAPI=5
inherit eutils flag-o-matic

DESCRIPTION="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
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"

IUSE="static-libs"

DEPEND="dev-db/unixODBC
		sys-libs/ncurses"
RDEPEND="${DEPEND}"

SB="${S}-build"
SB_MT="${S}-build-mt"
# QT3 is no longer supported in Gentoo.
#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

	# Fix undeclared ODBCXX_STRING_PERCENT symbol, bug #532356
	sed -i -e 's/ODBCXX_STRING_PERCENT/"%"/' src/dtconv.h || die

	epatch_user
}

src_configure() {
	local commonconf buildlist
	commonconf="--with-odbc=/usr --without-tests"
	commonconf="${commonconf} $(use_enable static-libs 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
	done
	if [[ "${P}" != "${PF}" ]]; then
		mv "${D}"/usr/share/doc/${P}/* "${D}"/usr/share/doc/${PF}/
		rmdir "${D}"/usr/share/doc/${P}
	fi
}