Version bump, fix slotting of installer utility, and bump required mysql version. Remove old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

3 files changed, 27 insertions, 17 deletions

diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
index e1a6e5660d53..b70a1deee385 100644
--- a/dev-db/myodbc/ChangeLog
+++ b/dev-db/myodbc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/myodbc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.35 2014/05/05 03:03:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.36 2014/07/29 03:35:31 grknight Exp $
+
+*myodbc-5.2.7 (29 Jul 2014)
+
+  29 Jul 2014; Brian Evans <grknight@gentoo.org> +myodbc-5.2.7.ebuild,
+  -myodbc-5.2.6.ebuild:
+  Version bump, fix slotting of installer utility, and bump required mysql
+  version. Remove old
 
 *myodbc-5.2.6 (04 May 2014)
 
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index a69b7de5e65f..947e4c2ec16a 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -6,19 +6,19 @@ AUX myodbc-5.1.6-qt4-includedir.patch 580 SHA256 ba1ccd551f87b6d19ddfdb6cfb6f88f
 AUX odbc.ini.m4 517 SHA256 0f14bd8815aac8c75ff3b2b6e86b2883fbe4e2e6e3de153e772091c7a5c124e5 SHA512 60883bced4be275f9496910ecbf11d92e9d550e28c12eca8549546f3b5f5fd12322fabb81611bb4d951bab6d203ddd82aafe8ec8bdf0b6aa61a94eac6770fb3b WHIRLPOOL 2c12b3565efe6f92f8f43f9de84e667b066f6b82e17590b1c918540becc9554b1224c14f40dfa7c263818089208b7851b2ca6a6f881d77196564b57db49634fe
 AUX odbcinst.ini.m4 233 SHA256 893011ec62a2631cf41521717cbebfddf48ae3a633c8ca1e7774f11930fe2537 SHA512 d6a27b1915133e23ab4f16930446e6c623e3636490c1a772a531805d6abbaf8470fa59924f68f01faabf496be7b5f17294fe51a9f940dfa45f03a9abc120f953 WHIRLPOOL e8a10ae834eb97e63ed3dc637f534e556c9e13d11dc71ac0f9e3a0f16054d9e8a23be7bf6f68319817a9bdde7ae735b55be86728f80b7ec4d5ffe00d403c6536
 DIST mysql-connector-odbc-5.1.6.tar.gz 1041247 SHA256 1d53c3a20cf68b089535278d3e69c0e49f367a457640c5f8af25c1cbf4ffb02e SHA512 74fe41c09a6261e31475c17a6b96d3161737c792fec6b2774f51fa58adae592143e44d6a2bf5dc2ec445b5e19653aa6abc9e6d0d37cc478bb26137f2658766f9 WHIRLPOOL 573f942682581514adb94183c633eb38a0ab1c990ead1f7da1e90aedcff18da392480bfaa1216d3e9b0c8b261f963bd81c0ed5f7192c74a8294028783e6f85e9
-DIST mysql-connector-odbc-5.2.6-src.tar.gz 595963 SHA256 005bba26358819bb5db48d23e8eb4a94cc234dfa103dd47a6c2602e7e70ad17b SHA512 9732b3034bdeb24700d0369d066fb43ca6f0327c2d3a3f1fff77d51ab37a83139536a7caae377791d979132c9640d67fddb4040095478924f4c8139ec6f404a5 WHIRLPOOL d8f0fc2cc7ec0b7602a2e6434d2680174dd50fe1d16dd03e0370ba1ec7807b09a83411e62aca3d68d540c1a564c759cbfea63c2d3adb6b642286a49d4dfc1330
+DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 SHA256 0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9 SHA512 f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f WHIRLPOOL 928808ac5b623ec345c8c1b8495ca1de7f10e65f0d14720e9bee6ab154ccf818ca690745a57fa7fa1c008ba57b24705657398cd9146fbf2e385c178deca0e499
 EBUILD myodbc-5.1.6.ebuild 3351 SHA256 d4e3d271c2d8de85797fd497a9cebcbfbc66c6e511d3a7cd47d3b275f8257c42 SHA512 83bff8d93e2167db4a1f9b51fcd83ffcb91b5993962d99b1e894e7187db01275d8cd3dffc769b67a462b50b520714ae97e66d47792f0f7ac9c8dc5c1cd3a6fa2 WHIRLPOOL 53faa9b1ada3f2f8f57670952891995733cc7fc7d4f7174231f55b03294bb7e2e2edc8baed2e2e7a0cefc97b1cb681fda1951e430fd2f82863059c55ed70a5b6
-EBUILD myodbc-5.2.6.ebuild 2877 SHA256 6eb746376d879b47e3a2ff16c382903ee326c0f447b397b4a084fcbdb50f2627 SHA512 afcf587d62800daa1b8453c14f14ca8df5a3891d7ec4a512382a4943f07d1b5454728f51a7db8c3eb84825fb684aaa8fb9e334c9da91bfa256e37dda542d59f0 WHIRLPOOL 04187435de5574c341363e4d1bc9723c9916189cd5626dcb0a02ab0c5dfab1127068dc91821fd6a1e279700d6417f10940bb53fc7f55beaae80804953d5afc6a
-MISC ChangeLog 4906 SHA256 457771779d0761041eb61548ab50c3b73b05293e01ad2d1a982790b1b8268ff6 SHA512 8dd2765c683c42f0ea0372d860cd5817ebb248b8eb62c97426069d1d41de2bb95f75d5a7c7b4b233e2f8180a017c6c828ee9cde69f95e3281737088e300790ee WHIRLPOOL f79ed9ee3ea9ce4d7b70f1a2633533f3c4a4cb4edb767d6779fc0673f842957a1db161e07fdb0aa3e63680a9290f630a4fb0901cbfb37370588bef02d8f6be78
+EBUILD myodbc-5.2.7.ebuild 3050 SHA256 ada1515f9c67b5addd015466dd49d7dab44a9a6e3df7cd3a9153df26fa6147c2 SHA512 2de6ae4e71564e9828999850f0f7462aaa476c553cdb36962cdb7cd47f82c623b5a09c877293c0b0604fcb8f47176b5b720ebda7ce83eb6eb7b6969c98f1bd36 WHIRLPOOL 3adfb0cf83492fa0f56165cd2dd149fae16af3b45b50e12cbda407ef55ca90d6ab807f2d401b3976b97b86fa816f9435fea4d77bb784e0fb6c9abb3a5435b1ad
+MISC ChangeLog 5128 SHA256 0859efc2bd34de3e4a0d69ba70a05202060f1d9478c8ba99ce736cb827a0249c SHA512 60db7e8b6af589c60e40746a83f23ebfb07019fe44adaac7c068bd59d10c9090de350c8b6adcb1dd4c28105f44cb1d4ec0d382e413b0f45089cc1b974d289a17 WHIRLPOOL f1bc25a41501f640cd895b923d0ea46fe16764c3b87c9cb66de179017137b0bc7c2be3c0b5e8ca503cc3cf7cb8741e0e0726d68afb8b7e081d26d96fff259627
 MISC metadata.xml 158 SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569 SHA512 538b01075e7bf3f429546654620fa773f3926594d7747d778ce6250263a7ba32fd7e63e14232fd89d503780b783fb7ab401ff2a0040a8d36c99c5c232609ca56 WHIRLPOOL 1739fa77f8bf21977b25d7c05d8da902f0a30335da5fcaca2b35200e504199c645d4115b8d2b4790ccdb692d7010c7a2cc09b27994679af8be6164f1c007e964
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTZv+XAAoJEE4V4vFnx44dZg4IAK3Rn43ivLvMlVtxkTZOgvc0
-PbXAfum/NAGe+kSppdC8/wnsOlKAxX+2tYW4kUt+O1CmDi7VIryTIPFg4TDkk0fh
-3hJXTXbOn56ZcBGnnIC8fYswVm9Ml9ErnzChDxOHeBiVPsTftMCOKVEKTTx9ho5d
-JyDvm0pZxjDJWYFugxGAniqpvlNVdDnv6h+80Okjj/oD+QXowKtFUIxMbUXLF1o6
-ViDNxezc6UEN5b6AEXqdTLDxcQbYvWyypTz5Wfq7L3IX17Zjm0TYPp2IDIQy7taN
-f1dkI0OHjyaGRqBp6mJgBiDIjMvNn1QOoNSIQKATeIYCqp83pK2zB2+PhQMa6Gw=
-=/bRw
+iQEcBAEBCAAGBQJT1xaEAAoJEE4V4vFnx44d9PsH/RxLkyiDy+xrAtRpzEg/hacC
+XtwhU3yA51pzFpaXYrcQPA2zkCBfOrEyH5q2BqnqUq7RCG+Y0Ifs02EktzmTr6AD
+UyRLnGYnYkyDaHzxHyNbA7iOlhbYRm/p7FhwrT/RYdS/A0xDKwbXyqIQF4FPOeHN
+g/+ml0vxeEWbW4cyn9szbNLGIE+vM0gWO0CDOJKTsa2BWPhIzUfzgLogKVhMZYET
+iZgX58y6XbPGW1MBq/GCNT4XD7rU48wi7Mdf4dwbxXsQF2xqiAYoNiiQc+1fImcO
+5Mucu3k617ypA5XcFU08V7WYZce2ZLrA/n4xjPKuPg0+Tes4Fi66d8g5gWzPVV8=
+=hEe0
 -----END PGP SIGNATURE-----
diff --git a/dev-db/myodbc/myodbc-5.2.6.ebuild b/dev-db/myodbc/myodbc-5.2.7.ebuild
index b279c58cd85a..1c5fb94da4ef 100644
--- a/dev-db/myodbc/myodbc-5.2.6.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.6.ebuild,v 1.1 2014/05/04 19:37:13 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.7.ebuild,v 1.1 2014/07/29 03:35:31 grknight Exp $
 
 EAPI=5
 inherit cmake-utils eutils flag-o-matic versionator
@@ -21,7 +21,7 @@ IUSE=""
 
 RDEPEND="
 	dev-db/unixODBC
-	>=virtual/mysql-4.1
+	>=virtual/mysql-5.5
 "
 DEPEND="${DEPEND} ${RDEPEND}"
 S=${WORKDIR}/${MY_P}
@@ -48,7 +48,7 @@ src_configure() {
 		-DMYSQL_CXX_LINKAGE=0
 		-DWITH_UNIXODBC=1
 		-DRPM_BUILD=1
-		-DMYSQL_LIB="$(mysql_config --variable=pkglibdir)/libmysqlclient_r.so"
+		-DMYSQLCLIENT_LIB_NAME="libmysqlclient_r.so"
 	)
 
 	cmake-utils_src_configure
@@ -62,12 +62,14 @@ src_install() {
 		einfo "Building $i"
 			sed \
 			-e "s,__PN__,${DRIVER_NAME},g" \
-			-e "s,__PF__,${PF},g" \
-			-e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}.so,g" \
+			-e "s,__PF__,${MAJOR},g" \
+			-e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \
 			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
 			<"${FILESDIR}"/${i}.m4 \
 			|| die "Failed to build $i"
 	done;
+	mv "${D}/usr/bin/myodbc-installer" \
+		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
 }
 
 pkg_config() {
@@ -107,4 +109,5 @@ pkg_postinst() {
 	elog "to configure the MySQL ODBC drivers and sources:"
 	elog "emerge --config =${CATEGORY}/${PF}"
 	elog "Please note that the driver name used to form the DSN now includes the SLOT."
+	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
 }