Version bump for 5.1 slot, now includes support for Qt Gui.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 155 insertions, 2 deletions

diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
index 56a747aa57e9..27f04002c896 100644
--- a/dev-db/myodbc/ChangeLog
+++ b/dev-db/myodbc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/myodbc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.20 2010/01/31 05:25:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.21 2010/01/31 06:26:53 robbat2 Exp $
+
+*myodbc-5.1.6 (31 Jan 2010)
+
+  31 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> +myodbc-5.1.6.ebuild,
+  +files/myodbc-5.1.6-qt4-includedir.patch:
+  Version bump for 5.1 slot, now includes support for Qt Gui.
 
 *myodbc-3.51.27_p695 (31 Jan 2010)
 
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 0e88e2cced9a..0d7cc4f3309c 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,3 +1,4 @@
+AUX myodbc-5.1.6-qt4-includedir.patch 580 RMD160 d0faeb6f224b22ed073a5216727d3d8fe11ca8f4 SHA1 27479b78074d9f6f504e451dbc15b074598015ae SHA256 ba1ccd551f87b6d19ddfdb6cfb6f88f61b23c7718a3ed415ef5d94db225373d2
 AUX odbc.ini.m4 517 RMD160 e613776d9bda626a6f9886b67971764a46bfbdd2 SHA1 13d5c9b91b58ab572f87857018d484b08ead1d15 SHA256 0f14bd8815aac8c75ff3b2b6e86b2883fbe4e2e6e3de153e772091c7a5c124e5
 AUX odbcinst.ini.m4 233 RMD160 83a5324626eb926c573d547c9ffee907876e4f04 SHA1 9fe75e6f1beed0ed1e78de931148be1162f1c2f9 SHA256 893011ec62a2631cf41521717cbebfddf48ae3a633c8ca1e7774f11930fe2537
 DIST MyODBC-3.51.06.tar.gz 322059 RMD160 4ddfdec5dfd9dcd9aa524839eab3b96a543b6134 SHA1 5fc915b4650cdb441b3ed959d0e3802574606e18 SHA256 e0beacd4fb6beae938d60d6c39dcca30e7bdb58d5e82d499a4fcbff805c129e9
@@ -6,6 +7,7 @@ DIST mysql-connector-odbc-3.51.12.tar.gz 979942 RMD160 295bdca51ad5fd7bf0a56ccb1
 DIST mysql-connector-odbc-3.51.26r1127.tar.gz 954125 RMD160 fec50270c8de0a6fe6324decedfd9d6705ffa807 SHA1 1800c13cb3394210b3b543e63284e125c8f6986f SHA256 78d6311946e92e72a40da6c6dfc06b0c4e7cb20d9431358351b2850c5e4a924a
 DIST mysql-connector-odbc-3.51.27r695.tar.gz 947116 RMD160 6eea1c49ec8f4b19ab7ddc2a83007eb0297b6eb7 SHA1 85a582f4cdfe45f73ca86f853fb5352f50d46ea8 SHA256 92031dc223da7fcb962276f091c843ac590f19dfba39a447dbc844afbe7d66c5
 DIST mysql-connector-odbc-5.1.5r1144.tar.gz 1044571 RMD160 022ad285d757942fe90e160443026761b1b76ae4 SHA1 a0bd0e64724e814835082301175d0c89c7dc7ce8 SHA256 1a2d377c21b8c80ea4fe6fe06dc43548a315eb8d335b07350f76dde305d35163
+DIST mysql-connector-odbc-5.1.6.tar.gz 1041247 RMD160 90eeefbfb0153a32dd7f0be5c2685fcf13036543 SHA1 c02e1c671fae60f7f7389dd2f963b07c3113ab35 SHA256 1d53c3a20cf68b089535278d3e69c0e49f367a457640c5f8af25c1cbf4ffb02e
 EBUILD myodbc-3.51.06.ebuild 2348 RMD160 b7f81e69c6b76839a970c8d116f1875c98c17583 SHA1 404bf73ee7f454fe3100ba24dd93d6b6d850cb5e SHA256 ea711214293d6d7b6b17d5032d51d9c9513124ae01877daa421637c5d09b823c
 EBUILD myodbc-3.51.11.ebuild 2421 RMD160 ddb332519e5d547dfd9b6b36f32e315d928ac930 SHA1 0553deeee858e3461479ae3296cb4742c973a45b SHA256 019c40976723853cf513ce51a13798b5123c4bdcdebed9a5c4034f47c9cf5935
 EBUILD myodbc-3.51.12.ebuild 2621 RMD160 028b9b4ead863c9abddb3d2f4848c22a36a6a4ba SHA1 7e3d13d2b83ef8adaf8caf6c692a63e16b1a93cd SHA256 bc0204c670678e3e90026f965ae978bc2cc35ae47cc1ce0ce3fb2081fcc8662d
@@ -13,5 +15,6 @@ EBUILD myodbc-3.51.26_p1127-r1.ebuild 3138 RMD160 16ce18087190a4c95cd0b2393b458a
 EBUILD myodbc-3.51.26_p1127.ebuild 2648 RMD160 763c2e627c17ae0643c5c15bb60e3bdaa29108d9 SHA1 0240152c2e59106dc2bc6d82c1356682f1af1ea6 SHA256 a8665e3cf03a20d83022d6dd7251a773b34f513fab571550258e2bd5a9bba896
 EBUILD myodbc-3.51.27_p695.ebuild 3134 RMD160 c7685070d18dcb2d10d72716ec143a1e9c8170f2 SHA1 380f0d8e55407dab4d98c558356908d01ee92754 SHA256 562231ab3dec2fd371a86e3fe106ad276b54283a3eb6f96d1f7f1a00091a2fae
 EBUILD myodbc-5.1.5_p1144.ebuild 3133 RMD160 0a82fdec7cc9bbef0c63ff3e606a52076beea115 SHA1 725dec6e3610c913ecfc5b30efd2e4f5d3b361f1 SHA256 27a206cd552d944c45fc7074f796b270433002037761b28ec5f05bcb2032a3b0
-MISC ChangeLog 3057 RMD160 fb639df211f4912f85d343726d4c119c6d036872 SHA1 2bfc5127e9337bc554cb16d578f28eea78248ef5 SHA256 ed8b38f1ce8cee67fb8e347fc7d7610c863f3c60f36ca56583590c753192b577
+EBUILD myodbc-5.1.6.ebuild 3387 RMD160 c337e6f2529e47734d167c57695adc632e16f681 SHA1 0d3ccf0e2f9f043a23438cc0129d400399041305 SHA256 c4e94b1bdc6e08c0cb465cd19970bf4866182f64eeeebd6fed839345b4ceabfa
+MISC ChangeLog 3268 RMD160 6a4e9641b290ffd69eedd24116992211944b6bc5 SHA1 2920fbb55a154d9f42446908b6ad53b818ba2cd9 SHA256 4dda3a5f1c62c7cb0a6285013c174a3fd34bca73e236e899bb1b1da5cf9908d8
 MISC metadata.xml 158 RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 SHA1 e5826687b0a91fba71e62888faa74fe37f44045a SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569
diff --git a/dev-db/myodbc/files/myodbc-5.1.6-qt4-includedir.patch b/dev-db/myodbc/files/myodbc-5.1.6-qt4-includedir.patch
new file mode 100644
index 000000000000..a79ddc4fa201
--- /dev/null
+++ b/dev-db/myodbc/files/myodbc-5.1.6-qt4-includedir.patch
@@ -0,0 +1,15 @@
+diff -Nuar mysql-connector-odbc-5.1.6.orig/qt.m4 mysql-connector-odbc-5.1.6/qt.m4
+--- mysql-connector-odbc-5.1.6.orig/qt.m4	2009-11-05 13:34:53.000000000 -0800
++++ mysql-connector-odbc-5.1.6/qt.m4	2010-01-30 22:12:02.105400463 -0800
+@@ -91,6 +91,10 @@
+   AC_SUBST(QTVERSION)
+   AC_SUBST(MOC)
+   AC_SUBST(UIC)
++  if expr "$QTVERSION" '>=' "040000" > /dev/null ; then
++    QT_CXXFLAGS="-I$qt_includes -I$qt_includes/QtCore -I$qt_includes/QtGui"
++  else
++    QT_CXXFLAGS="-I$qt_includes"
++  fi
+-  QT_CXXFLAGS="-I$qt_includes"
+   AC_SUBST(QT_CXXFLAGS)
+   QT_LDFLAGS="-L$qt_libraries"
diff --git a/dev-db/myodbc/myodbc-5.1.6.ebuild b/dev-db/myodbc/myodbc-5.1.6.ebuild
new file mode 100644
index 000000000000..6b42bf7f1fbf
--- /dev/null
+++ b/dev-db/myodbc/myodbc-5.1.6.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.1.6.ebuild,v 1.1 2010/01/31 06:26:53 robbat2 Exp $
+
+EAPI=2
+inherit eutils versionator autotools
+
+MAJOR="$(get_version_component_range 1-2 $PV)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}"
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="http://www.mysql.com/products/myodbc/"
+SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
+RESTRICT="primaryuri"
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc static qt4"
+RDEPEND=">=virtual/mysql-4.0
+		 dev-db/unixODBC
+		 qt4? ( >=x11-libs/qt-gui-4 )"
+# perl is required for building docs
+DEPEND="${RDEPEND}
+		doc? ( dev-lang/perl )"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/myodbc-5.1.6-qt4-includedir.patch
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--enable-static"
+	use static \
+		&& myconf="${myconf} --disable-shared" \
+		|| myconf="${myconf} --enable-shared"
+
+	myconf="${myconf} $(use_with doc docs) $(use_with debug)"
+	#myconf="${myconf} --disable-gui"
+	#TODO: the configure test against qt 4 enter in an endless loop
+	myconf="${myconf}
+			$(use_enable qt4 gui) 
+			$(use_with qt4 qt-libraries /usr/$(get_libdir)/qt4/)"
+
+	econf \
+		--libexecdir=/usr/sbin \
+		--sysconfdir=/etc/myodbc \
+		--localstatedir=/var/lib/myodbc \
+		--with-mysql-libs=/usr/lib/mysql \
+		--with-mysql-includes=/usr/include/mysql \
+		--with-odbc-ini=/etc/unixODBC/odbc.ini \
+		--with-unixODBC=/usr \
+		--enable-myodbc3i \
+		--enable-myodbc3m \
+		--disable-test \
+		--without-samples \
+		${myconf} \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake \
+	|| die "emake failed"
+}
+
+src_install() {
+	into /usr
+	einstall \
+		libexecdir="${D}"/usr/sbin \
+		sysconfdir="${D}"/etc/myodbc \
+		localstatedir="${D}"/var/lib/myodbc \
+		pkgdatadir="${D}"/usr/share/doc/${PF}
+	dodoc INSTALL README
+	prepalldocs
+	dodir /usr/share/${PN}-${SLOT}
+	for i in odbc.ini odbcinst.ini; do
+		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" \
+			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
+			<"${FILESDIR}"/${i}.m4 \
+			|| die "Failed to build $i"
+	done;
+}
+
+pkg_config() {
+	[ "${ROOT}" != "/" ] && \
+	die 'Sorry, non-standard ROOT setting is not supported :-('
+
+	local msg='MySQL ODBC driver'
+	local drivers=$(/usr/bin/odbcinst -q -d)
+	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+
+	local sources=$(/usr/bin/odbcinst -q -s)
+	msg='sample MySQL ODBC DSN'
+	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+}
+
+pkg_postinst() {
+	elog "If this is a new install, please run the following command"
+	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."
+}