Old versions don't work on newer unixODBC, so clean them up. Latest is stable anyway.

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

9 files changed, 9 insertions, 718 deletions

diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
index 388c9c86121c..b7fb38f1c6c6 100644
--- a/dev-db/myodbc/ChangeLog
+++ b/dev-db/myodbc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.29 2010/06/26 15:14:45 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.30 2010/07/10 23:47:49 robbat2 Exp $
+
+  10 Jul 2010; Robin H. Johnson <robbat2@gentoo.org> -myodbc-3.51.06.ebuild,
+  -myodbc-3.51.11.ebuild, -myodbc-3.51.12.ebuild,
+  -myodbc-3.51.26_p1127.ebuild, -myodbc-3.51.26_p1127-r1.ebuild,
+  -myodbc-3.51.27_p695.ebuild, -myodbc-5.1.5_p1144.ebuild:
+  Old versions don't work on newer unixODBC, so clean them up. Latest is
+  stable anyway.
 
   26 Jun 2010; <nixnut@gentoo.org> myodbc-5.1.6.ebuild:
   ppc stable #322277
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 0b0ed7b59b46..5ef72a2a3fc3 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,20 +1,7 @@
 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
-DIST MyODBC-3.51.11.tar.gz 971989 RMD160 629dd12acdd85e15a04730aa00fec5b9134c67bf SHA1 f59b754a6249af2de057969f845ad9739b0ff3ac SHA256 a460e66f782080cb8c596192b62b21975782ae13861353260c99cc67abd8a441
-DIST mysql-connector-odbc-3.51.12.tar.gz 979942 RMD160 295bdca51ad5fd7bf0a56ccb161fe5a0463e71ef SHA1 c4a8de079b255d2aa745295f4121ec5e9091de59 SHA256 7a9c19bd4ee140e7afe77fdcaecee53b4ce4bbbeb35a158c9548aa7ab9482c74
-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
-EBUILD myodbc-3.51.26_p1127-r1.ebuild 3134 RMD160 d498064bf234fb3079164cff4fae2851fdb39174 SHA1 2ef416f1e338b5dd9802b414da28a7fbc155e14f SHA256 b5b26b957a65c055eb8de9318866d9b6848a0d6668fe1b0aa81b43e6291b8911
-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 3129 RMD160 19b91fc5fb6b4b3226a1bc729ad65678211af88f SHA1 a5aac218f4b89c1741d21602b5d93d35395d89f9 SHA256 5f0b928360b6c8eabd818f60ecbed6ecc6507a5e967ebb6a1bf1c322095b55cf
 EBUILD myodbc-5.1.6.ebuild 3382 RMD160 3cf4ecc79e7c137a05d772f09069c7f3adccf964 SHA1 bc09ae248f8631113da19bc5766f990553082667 SHA256 87d05e12148f4ee33abad45384547b25b08183102bc6355b0215d74894045853
-MISC ChangeLog 4034 RMD160 75ff963012961e2de13a29ab0078884350ce9036 SHA1 ff4d0817efc770249c57d6a84f5587f593b7213a SHA256 394e8adc3d57f7a753bc7aa8dee53f936a4ce57cca372192f94cf07eb726949e
+MISC ChangeLog 4377 RMD160 6d6df34928ada7109d79d3322d50c0ed9c188ee0 SHA1 283970eeb39fb4b7d148d18fb8f73ef6fc1c314c SHA256 f85a526fd57adb3b3ff2f00f65f95b67da864f8eb89bc4f20ca3c8ead5d94287
 MISC metadata.xml 158 RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 SHA1 e5826687b0a91fba71e62888faa74fe37f44045a SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569
diff --git a/dev-db/myodbc/myodbc-3.51.06.ebuild b/dev-db/myodbc/myodbc-3.51.06.ebuild
deleted file mode 100644
index 05956b16cd37..000000000000
--- a/dev-db/myodbc/myodbc-3.51.06.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-3.51.06.ebuild,v 1.11 2007/01/31 13:46:14 genone Exp $
-
-MY_PN="MyODBC"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="http://www.mysql.com/products/myodbc/"
-SRC_URI="mirror://mysql/Downloads/MyODBC3/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="debug doc static"
-RDEPEND=">=virtual/mysql-4.0 dev-db/unixODBC sys-devel/m4"
-# perl is required for building docs
-DEPEND="${RDEPEND} doc? ( dev-lang/perl )"
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	local myconf="--enable-static"
-	use static \
-		&& myconf="${myconf} --disable-shared" \
-		|| myconf="${myconf} --enable-shared"
-
-	myconf="${myconf} `use_with doc docs` `use_with debug`"
-
-	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 \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	into /usr
-	einstall \
-		libexecdir=${D}/usr/sbin \
-		sysconfdir=${D}/etc/myodbc \
-		localstatedir=${D}/var/lib/myodbc
-	dodoc INSTALL RELEASE-NOTES README
-}
-
-pkg_config() {
-	[ "${ROOT}" != "/" ] && \
-	die "Sorry, non-standard \$ROOT setting is not supported :-("
-
-	for i in odbc.ini odbcinst.ini; do
-		einfo "Building $i"
-		/usr/bin/m4 -D__PN__=${PN} -D__PF__=${PF} ${FILESDIR}/${i}.m4 >${T}/${i}
-	done;
-
-	local msg='MySQL ODBC driver'
-	local drivers=$(/usr/bin/odbcinst -q -d)
-	if echo $drivers | grep -vq "^\[${PN}\]$" ; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -d -f ${T}/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 "^\[${PN}-test\]$"; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -s -l -f ${T}/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}"
-}
diff --git a/dev-db/myodbc/myodbc-3.51.11.ebuild b/dev-db/myodbc/myodbc-3.51.11.ebuild
deleted file mode 100644
index 688899be1a62..000000000000
--- a/dev-db/myodbc/myodbc-3.51.11.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-3.51.11.ebuild,v 1.8 2007/01/31 13:46:14 genone Exp $
-
-MY_PN="MyODBC"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="http://www.mysql.com/products/myodbc/"
-SRC_URI="mirror://mysql/Downloads/MyODBC3/${MY_P}.tar.gz"
-RESTRICT="primaryuri"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug doc static"
-RDEPEND=">=virtual/mysql-4.0 dev-db/unixODBC sys-devel/m4"
-# perl is required for building docs
-DEPEND="${RDEPEND} doc? ( dev-lang/perl )"
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	local myconf="--enable-static"
-	use static \
-		&& myconf="${myconf} --disable-shared" \
-		|| myconf="${myconf} --enable-shared"
-
-	myconf="${myconf} `use_with doc docs` `use_with debug`"
-
-	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 \
-		--disable-test \
-		--without-samples \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	into /usr
-	einstall \
-		libexecdir=${D}/usr/sbin \
-		sysconfdir=${D}/etc/myodbc \
-		localstatedir=${D}/var/lib/myodbc
-	dodoc INSTALL RELEASE-NOTES README
-}
-
-pkg_config() {
-	[ "${ROOT}" != "/" ] && \
-	die "Sorry, non-standard \$ROOT setting is not supported :-("
-
-	for i in odbc.ini odbcinst.ini; do
-		einfo "Building $i"
-		/usr/bin/m4 -D__PN__=${PN} -D__PF__=${PF} ${FILESDIR}/${i}.m4 >${T}/${i}
-	done;
-
-	local msg='MySQL ODBC driver'
-	local drivers=$(/usr/bin/odbcinst -q -d)
-	if echo $drivers | grep -vq "^\[${PN}\]$" ; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -d -f ${T}/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 "^\[${PN}-test\]$"; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -s -l -f ${T}/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}"
-}
diff --git a/dev-db/myodbc/myodbc-3.51.12.ebuild b/dev-db/myodbc/myodbc-3.51.12.ebuild
deleted file mode 100644
index 4e668a996908..000000000000
--- a/dev-db/myodbc/myodbc-3.51.12.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-3.51.12.ebuild,v 1.6 2009/02/26 15:46:04 josejx Exp $
-
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="http://www.mysql.com/products/myodbc/"
-SRC_URI="mirror://mysql/Downloads/MyODBC3/${MY_P}.tar.gz"
-RESTRICT="primaryuri"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug doc static"
-RDEPEND=">=virtual/mysql-4.0 dev-db/unixODBC sys-devel/m4"
-# perl is required for building docs
-DEPEND="${RDEPEND} doc? ( dev-lang/perl )"
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	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 qt gui)"
-
-	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"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	into /usr
-	einstall \
-		libexecdir=${D}/usr/sbin \
-		sysconfdir=${D}/etc/myodbc \
-		localstatedir=${D}/var/lib/myodbc
-	dodoc INSTALL RELEASE-NOTES README
-}
-
-pkg_config() {
-	[ "${ROOT}" != "/" ] && \
-	die "Sorry, non-standard \$ROOT setting is not supported :-("
-
-	for i in odbc.ini odbcinst.ini; do
-		einfo "Building $i"
-		/usr/bin/m4 -D__PN__=${PN} -D__PF__=${PF} ${FILESDIR}/${i}.m4 >${T}/${i}
-	done;
-
-	local msg='MySQL ODBC driver'
-	local drivers=$(/usr/bin/odbcinst -q -d)
-	if echo $drivers | grep -vq "^\[${PN}\]$" ; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -d -f ${T}/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 "^\[${PN}-test\]$"; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -s -l -f ${T}/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}"
-}
diff --git a/dev-db/myodbc/myodbc-3.51.26_p1127-r1.ebuild b/dev-db/myodbc/myodbc-3.51.26_p1127-r1.ebuild
deleted file mode 100644
index 902946818aac..000000000000
--- a/dev-db/myodbc/myodbc-3.51.26_p1127-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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-3.51.26_p1127-r1.ebuild,v 1.4 2010/04/11 12:33:35 nixnut Exp $
-
-inherit eutils versionator
-
-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"
-RDEPEND=">=virtual/mysql-4.0
-		 dev-db/unixODBC"
-# perl is required for building docs
-DEPEND="${RDEPEND}
-		doc? ( dev-lang/perl )"
-S=${WORKDIR}/${MY_P}
-
-# Careful!
-DRIVER_NAME="${PN}-${SLOT}"
-
-src_compile() {
-	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 qt gui)"
-
-	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"
-
-	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."
-}
diff --git a/dev-db/myodbc/myodbc-3.51.26_p1127.ebuild b/dev-db/myodbc/myodbc-3.51.26_p1127.ebuild
deleted file mode 100644
index 0aa6787209b6..000000000000
--- a/dev-db/myodbc/myodbc-3.51.26_p1127.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-3.51.26_p1127.ebuild,v 1.1 2008/11/01 09:15:25 robbat2 Exp $
-
-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/3.51/${MY_P}.tar.gz"
-RESTRICT="primaryuri"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc static"
-RDEPEND=">=virtual/mysql-4.0 dev-db/unixODBC sys-devel/m4"
-# perl is required for building docs
-DEPEND="${RDEPEND} doc? ( dev-lang/perl )"
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	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 qt gui)"
-
-	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"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	into /usr
-	einstall \
-		libexecdir=${D}/usr/sbin \
-		sysconfdir=${D}/etc/myodbc \
-		localstatedir=${D}/var/lib/myodbc
-	dodoc INSTALL RELEASE-NOTES README
-}
-
-pkg_config() {
-	[ "${ROOT}" != "/" ] && \
-	die "Sorry, non-standard \$ROOT setting is not supported :-("
-
-	for i in odbc.ini odbcinst.ini; do
-		einfo "Building $i"
-		/usr/bin/m4 -D__PN__=${PN} -D__PF__=${PF} ${FILESDIR}/${i}.m4 >${T}/${i}
-	done;
-
-	local msg='MySQL ODBC driver'
-	local drivers=$(/usr/bin/odbcinst -q -d)
-	if echo $drivers | grep -vq "^\[${PN}\]$" ; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -d -f ${T}/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 "^\[${PN}-test\]$"; then
-		ebegin "Installing ${msg}"
-		/usr/bin/odbcinst -i -s -l -f ${T}/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}"
-}
diff --git a/dev-db/myodbc/myodbc-3.51.27_p695.ebuild b/dev-db/myodbc/myodbc-3.51.27_p695.ebuild
deleted file mode 100644
index 1601ee1de352..000000000000
--- a/dev-db/myodbc/myodbc-3.51.27_p695.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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-3.51.27_p695.ebuild,v 1.1 2010/01/31 05:25:46 robbat2 Exp $
-
-inherit eutils versionator
-
-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"
-RDEPEND=">=virtual/mysql-4.0
-		 dev-db/unixODBC"
-# perl is required for building docs
-DEPEND="${RDEPEND}
-		doc? ( dev-lang/perl )"
-S=${WORKDIR}/${MY_P}
-
-# Careful!
-DRIVER_NAME="${PN}-${SLOT}"
-
-src_compile() {
-	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 qt gui)"
-
-	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"
-
-	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."
-}
diff --git a/dev-db/myodbc/myodbc-5.1.5_p1144.ebuild b/dev-db/myodbc/myodbc-5.1.5_p1144.ebuild
deleted file mode 100644
index 014cbce25e71..000000000000
--- a/dev-db/myodbc/myodbc-5.1.5_p1144.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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.5_p1144.ebuild,v 1.4 2010/04/11 12:33:35 nixnut Exp $
-
-inherit eutils versionator
-
-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"
-RDEPEND=">=virtual/mysql-4.0
-		 dev-db/unixODBC"
-# perl is required for building docs
-DEPEND="${RDEPEND}
-		doc? ( dev-lang/perl )"
-S=${WORKDIR}/${MY_P}
-
-# Careful!
-DRIVER_NAME="${PN}-${SLOT}"
-
-src_compile() {
-	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 qt gui)"
-
-	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"
-
-	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."
-}