gentoo resync : 14.07.2018

6 files changed, 163 insertions, 0 deletions

diff --git a/dev-db/libodbc++/Manifest b/dev-db/libodbc++/Manifest
new file mode 100644
index 000000000000..6f303c6fe9d4
--- /dev/null
+++ b/dev-db/libodbc++/Manifest
@@ -0,0 +1,6 @@
+AUX libodbc++-0.2.3-doxygen.patch 561 BLAKE2B 4b1813dc89760c0e70d36f853c21e5a830040fbb9128da4852c319b39a0e667533a515f8aaf17d6984e79cb35dcfc5c6e019b564d8bb6e5068c79ac20f9f2196 SHA512 226dcfe4cbe3bac7a3eba2f1eb1184115e71494a6063521e2a3c6944316a323c383c88891780c701ffaef3a3564248b58869b2ce5d1da753063579fca0f1b7d5
+AUX libodbc++-0.2.3-gcc41.patch 456 BLAKE2B ad9de19388669c345cd619ab95518e0a8c3ca4dc5b246bedc386c76ae45a1d89e5fe1a9c15e88e298e1f228fcf066a4e2c3237e60f75bc893c695aa3a518526a SHA512 9b758fab94141338f42d9ce4291620bb839f7d044a9020de90258b70ef0554bb128879a3008bbafae9e5fab2082170d1a2b9e631d5ea7ef5c23eaf03f14d7615
+AUX libodbc++-0.2.3-gcc44.patch 316 BLAKE2B a7c4e6466b9c3b0b4aca8ea4288df30a86e462835fba4b63cb1c7c1925732bcb75f5652d154bb7223fe135dccfc0308167e0f521e958b2ef3262a24d17820353 SHA512 6b8b6f57523e9128927530d95477c3c55a27c47836e7231e8017958bd20407e637fd4896015a2a3fbf2e47e3e44f7f3e933a28c4ac84fc600366b899462aebb1
+DIST libodbc++-0.2.5.tar.bz2 362310 BLAKE2B c0266eef510f8bee3c430b6998f68859955968ee26b1ce8b456a497f84ad5f67ef96b474de0966aa07ff4ef308737103887c949704635696b095fef0bbfe59f7 SHA512 cc2485a0dae8a3f548a26a759f1421133a0a23715296f632067f5967b61778ca64e1339e19a4de15d06fb80b4e43ec8ddb13ba170b70dd7202c4d07b5669c2c7
+EBUILD libodbc++-0.2.5-r2.ebuild 3266 BLAKE2B f9ade3122983dfc191874ded2a02d73d0adbd7c9549a7066fbd3ff319202f26022c7f5dc62c385c557e2acd1f32e7e91473817b159d0d05662ed5070a06aba14 SHA512 2a76bbc2584fda03c1547b2d8e9153d1e21366e62d1ff08120085a8bc66855258b13a58903c481d614cff27740a6fd9e4c4bd4744709f09c64db556fbd4b2352
+MISC metadata.xml 407 BLAKE2B a3b699351c53efebceb80a888a63d2481c021417d47234d8da83a9249602e4fbf55564430cf20e54c3171849310e440461da3d6c8e5ea1e9854c50cfd6bf17ef SHA512 053eab77d80889554b167bd7449d9ae3994d59c68f84e1732413e003729b3ee852b05fa2dcc160746be7b482b6ea8811f790e4f2ce61f025010c9a8070121cf0
diff --git a/dev-db/libodbc++/files/libodbc++-0.2.3-doxygen.patch b/dev-db/libodbc++/files/libodbc++-0.2.3-doxygen.patch
new file mode 100644
index 000000000000..e750c198123f
--- /dev/null
+++ b/dev-db/libodbc++/files/libodbc++-0.2.3-doxygen.patch
@@ -0,0 +1,12 @@
+diff -ur libodbc++-0.2.3-orig/doc/progref/Doxyfile libodbc++-0.2.3/doc/progref/Doxyfile
+--- libodbc++-0.2.3-orig/doc/progref/Doxyfile	2006-04-08 01:03:20.000000000 -0400
++++ libodbc++-0.2.3/doc/progref/Doxyfile	2006-04-08 01:06:03.000000000 -0400
+@@ -256,7 +256,7 @@
+ # each generated HTML page. If it is left blank doxygen will generate a 
+ # standard footer.
+ 
+-HTML_FOOTER          = footer
++HTML_FOOTER          =
+ 
+ # The HTML_STYLESHEET tag can be used to specify a user defined cascading
+ # style sheet that is used by each HTML page. It can be used to 
diff --git a/dev-db/libodbc++/files/libodbc++-0.2.3-gcc41.patch b/dev-db/libodbc++/files/libodbc++-0.2.3-gcc41.patch
new file mode 100644
index 000000000000..089277fbd722
--- /dev/null
+++ b/dev-db/libodbc++/files/libodbc++-0.2.3-gcc41.patch
@@ -0,0 +1,12 @@
+diff -ur libodbc++-0.2.3-orig/include/odbc++/drivermanager.h libodbc++-0.2.3/include/odbc++/drivermanager.h
+--- libodbc++-0.2.3-orig/include/odbc++/drivermanager.h	2006-04-08 00:54:19.000000000 -0400
++++ libodbc++-0.2.3/include/odbc++/drivermanager.h	2006-04-08 00:56:15.000000000 -0400
+@@ -26,6 +26,8 @@
+ 
+ #include <odbc++/types.h>
+ 
++#include <odbc++/errorhandler.h>
++
+ /** The namespace where all <b>libodbc++</b> classes reside */
+ namespace odbc {
+ 
diff --git a/dev-db/libodbc++/files/libodbc++-0.2.3-gcc44.patch b/dev-db/libodbc++/files/libodbc++-0.2.3-gcc44.patch
new file mode 100644
index 000000000000..415ae0185e08
--- /dev/null
+++ b/dev-db/libodbc++/files/libodbc++-0.2.3-gcc44.patch
@@ -0,0 +1,11 @@
+--- libodbc++-0.2.3-orig/src/datastream.h       2009-06-12 13:31:54.000000000 +0200
++++ libodbc++-0.2.3/src/datastream.h    2009-06-12 13:32:11.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <odbc++/types.h>
+ 
+ #if defined(ODBCXX_HAVE_ISO_CXXLIB)
++# include <cstdio>
+ # include <istream>
+ # include <streambuf>
+ #else
+
diff --git a/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild b/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild
new file mode 100644
index 000000000000..2ff9b64fa4bf
--- /dev/null
+++ b/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="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
+}
diff --git a/dev-db/libodbc++/metadata.xml b/dev-db/libodbc++/metadata.xml
new file mode 100644
index 000000000000..4fe3e6f563b4
--- /dev/null
+++ b/dev-db/libodbc++/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>cpp@gentoo.org</email>
+		<name>Gentoo C++ Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">libodbcxx</remote-id>
+	</upstream>
+</pkgmetadata>