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

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42

3 files changed, 34 insertions, 15 deletions

diff --git a/dev-db/libodbc++/ChangeLog b/dev-db/libodbc++/ChangeLog
index f77704e20138..913cf9faf8fb 100644
--- a/dev-db/libodbc++/ChangeLog
+++ b/dev-db/libodbc++/ChangeLog
@@ -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
diff --git a/dev-db/libodbc++/Manifest b/dev-db/libodbc++/Manifest
index 1d3b298e4ef3..f25237f9d7a1 100644
--- a/dev-db/libodbc++/Manifest
+++ b/dev-db/libodbc++/Manifest
@@ -5,13 +5,17 @@ AUX libodbc++-0.2.3-doxygen.patch 561 SHA256 2642d896e705ab56fc378547ae9eb27e1db
 AUX libodbc++-0.2.3-gcc41.patch 456 SHA256 ad380ec268435405146431e47a9a9bd354be8c0edc1229b315f31c60990a3c43 SHA512 9b758fab94141338f42d9ce4291620bb839f7d044a9020de90258b70ef0554bb128879a3008bbafae9e5fab2082170d1a2b9e631d5ea7ef5c23eaf03f14d7615 WHIRLPOOL 48ababe3258ef8b5b34a2114f7039e9bc86f24463d24d63c6491cb8aec92c0e5a5a227ebacfba0c5cdab169375ee692056c01c3d14490d3317221d68550e9270
 AUX libodbc++-0.2.3-gcc44.patch 316 SHA256 738490176ed9a8efd3cb28b2260f289bd99603e8c30eb3f986625dcf612479f8 SHA512 6b8b6f57523e9128927530d95477c3c55a27c47836e7231e8017958bd20407e637fd4896015a2a3fbf2e47e3e44f7f3e933a28c4ac84fc600366b899462aebb1 WHIRLPOOL 3cd4d22053f8c5c2edee69568ea970ce7fcea28e8eefd097e1e1c17479327538ff5bbad97caebf2350dcb4387400bc2afaa8442a64e4bbb605ee5c039e932671
 DIST libodbc++-0.2.5.tar.bz2 362310 SHA256 ba3030a27b34e4aafbececa2ddbbf42a38815e9534f34c051620540531b5e23e SHA512 cc2485a0dae8a3f548a26a759f1421133a0a23715296f632067f5967b61778ca64e1339e19a4de15d06fb80b4e43ec8ddb13ba170b70dd7202c4d07b5669c2c7 WHIRLPOOL e39b35d288f6a37ea84815346540f07f39ed30fca3cdf9ce768ef48a3133301364a45fc2495daf11d6655d3d7748a7b9ab833b16213e67bce92c403dfdc9806f
-EBUILD libodbc++-0.2.5-r1.ebuild 3269 SHA256 c2436e8631b5a1f603d786874dcb6940b7d74a229970a51defec1c133f6d0866 SHA512 cdc6fc082dcb2469526f0f5fab8129d2ac0fc30b6f57aa3444c03111e532eadb1141c043043a49314c4f64dcd9b5607282f6f279a16efa9b03dfcee76036e270 WHIRLPOOL 46aa2080630cc75118132d67ee8329a6a835c3945b540d9c7aac4d63dd860e6a877e6ada2a1c4798fcfb499e12011bfb193f5cf4fd14f19597d59d853bd15bd8
-MISC ChangeLog 3837 SHA256 470ff36075796f0afb5b25e35590e2334a87bd248c90a90f7022f16dca86a0ad SHA512 284590cb9e9f67c4c80f348919a9252eb8885dfb93a0d041960a36993f0ef1f71aba7dc0e4b6990636513af7ecc239e9c6268cb80c04daf0e026e1211bfde127 WHIRLPOOL 43a9307a431de6bb2a6059854999fe1344da607e7e51423a732637743e5606e826b18a0baa8cc3e99f8bc2d047f6e02109ac9e22d9b9a8e7191bb3a0f3023154
+EBUILD libodbc++-0.2.5-r2.ebuild 3408 SHA256 c0fc1df69ee3e4e108b564110dd9ffca15c01b82cd4f72ff5267f169172bc8b0 SHA512 545ae0322a7d0135b8a2a889d2ee3ef2cca1c3ca614ac79746d79053c35dcc67d36c034efbec2af38e7bfc296eabb05e508c803dd9aae63f802a435445188583 WHIRLPOOL 51ae42cc7aa3fa6745459f5af8e7981eba26bf64a37989b1484f2679ad0ba1d4f22cea191be3b590fdaf967cedb699431e713770bbbd354b7c942daabc382e4d
+MISC ChangeLog 4225 SHA256 587dd77ade07b4c4bdd04aed187e0c6fb88d8857c6bff3774c133f855d66d3b6 SHA512 279f00fb5bce6c8960c9676f9194766afd6a96ab7b9209092568254925e4ed74c806b537a3e2f46038da07097143efeae9ec9c580023d952488d278eb15c34fe WHIRLPOOL 957426e5ad99db93eec94cf0b75d920bd5ea584e7ef1742dea0321b1671e87593948e8c1576120a321414c0d001a6288399e72530d339db8a8d131084a9a40b5
 MISC metadata.xml 219 SHA256 3335b69d39a6e311a24d996131a068c8846b17ea832eac15a646e25a6a73c5d7 SHA512 f96a3304ada419cfaf483ac66553e25574cc6b8e89db6a6159e24d43eea1c85f7d52ff38f62a2cc685335b3001b5d403ce1f53149d0aed611c3eb8a435374dbd WHIRLPOOL 43a43807eb80c24470204f38c20f6a9faf0d79af6eba38b6875bc12ef79c86ad6d145f22d584bd097d7fc81c1fdd971f9642c3f5d5e044db2eb8d9f68fccfe9d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPnz4UACgkQcaHudmEf86rr2wCeLuFjQQOj8U0axWIZPSuduGPs
-ofUAn38S19IIOz04NmvBVX1iXI+t1d9N
-=Zt2L
+iQEcBAEBCAAGBQJVXs89AAoJECo/aRed9267v7MH/j5w3/scN7/dsrH8QE9N6BAA
+HAOHCKBelEPyLwvmjM5ewnRBdP+SMDkokppvSmDy5E5j9EGBB4QOeBvb4qZBfbDF
+aMLru6VmwUx+m+2UZ0N0RhRLwF3JXX7FdeKHB1XMEY1I+BrzjlhG3LL8HA6PxbL/
+xctOJZ5SrLfYNZcW85JdGky0e/C2T+HYQkWWEOLL0vlnBWTk4EWOFy/SgdQFqLbm
+gA9yz5sner08jitMZgmAYUl7l32Y/WV0mZuEEg8w6lH287852r/y+GsCq8e/Znsb
+yL538UcUUTRXxxgfC9dPF9gdcRt2b4+EJzJ1z7rm+imuiQ4a1j5s4VtxAxQPR68=
+=K9Ux
 -----END PGP SIGNATURE-----
diff --git a/dev-db/libodbc++/libodbc++-0.2.5-r1.ebuild b/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild
index 93cae5e2663a..218f98b91079 100644
--- a/dev-db/libodbc++/libodbc++-0.2.5-r1.ebuild
+++ b/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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-r1.ebuild,v 1.3 2014/08/10 20:01:08 slyfox Exp $
+# $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=2
+EAPI=5
 inherit eutils flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
-
 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
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+
+IUSE="static-libs"
 
 DEPEND="dev-db/unixODBC
 		sys-libs/ncurses"
@@ -34,12 +35,17 @@ src_prepare() {
 
 	# 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} --enable-static --enable-shared"
+	commonconf="${commonconf} $(use_enable static-libs static) --enable-shared"
 	# " --enable-threads"
 
 	export ECONF_SOURCE="${S}"
@@ -94,7 +100,7 @@ src_install () {
 	for sd in ${buildlist}; do
 		einfo "Doing install pass for $sd"
 		cd ${sd}
-		emake DESTDIR="${D}" install || die "make install failed"
+		emake DESTDIR="${D}" install
 	done
 	if [[ "${P}" != "${PF}" ]]; then
 		mv "${D}"/usr/share/doc/${P}/* "${D}"/usr/share/doc/${PF}/