Remove some broken old versions, and stabilize .26 on x86. Add metadata.

Package-Manager: portage-2.0.51-r12

14 files changed, 17 insertions, 473 deletions

diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog
index f4d90a23d7ed..8c6c721533c9 100644
--- a/dev-db/mysql++/ChangeLog
+++ b/dev-db/mysql++/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql++
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.26 2005/01/10 21:16:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.27 2005/01/15 00:01:57 robbat2 Exp $
+
+  14 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  -mysql++-1.7.9-r2.ebuild, -mysql++-1.7.9-r5.ebuild,
+  -mysql++-1.7.9-r6.ebuild, -mysql++-1.7.9.ebuild:
+  Remove some broken old versions, and stabilize .26 on x86.
 
 *mysql++-1.7.26 (10 Jan 2005)
 
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 9c7bd2e5ddfa..e508060dae71 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -1,24 +1,15 @@
-MD5 777a3563a47604d7343ad4d2817f2437 mysql++-1.7.9.ebuild 1413
-MD5 615ad0fdb9d1b37ef986cb0782a3c4d2 mysql++-1.7.9-r5.ebuild 3795
-MD5 7f2dba9e3baa3f696d8385ebae7e82bc mysql++-1.7.9-r2.ebuild 3551
 MD5 b18b162d91eb52060678dddf1f1a92af mysql++-1.7.9-r4.ebuild 3845
-MD5 2ec5be16755c4b597bc5aaf217db0bff mysql++-1.7.9-r6.ebuild 3803
-MD5 2920d65e67f47a20532a4a16a63f9af8 mysql++-1.7.9-r1.ebuild 2744
-MD5 7c59c7c30a15486539492aab97cef549 mysql++-1.7.26.ebuild 1732
-MD5 3b48ef3a6d7e3e0855d912913ddd0387 ChangeLog 4078
+MD5 a3e1c977b2f16bc7a769bec6dc777968 mysql++-1.7.26.ebuild 1730
+MD5 bb685339e70dea9371bfc2f272227e2f ChangeLog 4298
 MD5 fa18a351efc482c247d8b0ae972b43bf mysql++-1.7.9-r3.ebuild 3695
+MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
 MD5 29dd283bdc19e7542a9f50501d4eda70 files/mysql++-1.7.9_example.patch 1203
 MD5 027947f703cc541c6b056955cf5606be files/mysql++-1.7.9-gcc_throw.patch 7310
 MD5 526598f80750489676ac49881bba7a69 files/mysql++-1.7.9_gcc333.patch 1047
 MD5 54b8d3ba432ce4cad6c23fa32ac17042 files/mysql++-1.7.9-mysql4-gcc295.patch 421
-MD5 7a4351e2de9702b6fd505ea61e4eb899 files/digest-mysql++-1.7.9 133
 MD5 229dd0f10e6cee31e2f93df59b5f6742 files/mysql++-1.7.9-mysql4-gcc3.patch 426
 MD5 5ac32002d3e432c050e274928b7a1d78 files/mysql++-1.7.9-missing.patch 2922
 MD5 12c5b600d90bb67d1be6d702152e7d9f files/mysql++-1.7.9-r5_gcc333.patch 1047
-MD5 083796fbc1e79084808389a6e8237dc1 files/digest-mysql++-1.7.9-r1 200
-MD5 13b4cad28b5dfaa0f580276962effada files/digest-mysql++-1.7.9-r2 397
 MD5 13b4cad28b5dfaa0f580276962effada files/digest-mysql++-1.7.9-r3 397
 MD5 13b4cad28b5dfaa0f580276962effada files/digest-mysql++-1.7.9-r4 397
-MD5 13b4cad28b5dfaa0f580276962effada files/digest-mysql++-1.7.9-r5 397
-MD5 cf8006893dfe7612929c248704d83639 files/digest-mysql++-1.7.9-r6 402
 MD5 65084d7d1a78fed8de0e81c773c9eeab files/digest-mysql++-1.7.26 66
diff --git a/dev-db/mysql++/files/digest-mysql++-1.7.9 b/dev-db/mysql++/files/digest-mysql++-1.7.9
deleted file mode 100644
index 1a2a98d09837..000000000000
--- a/dev-db/mysql++/files/digest-mysql++-1.7.9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1312fb4e33dcce07fac5fa9c2ac801f7 mysql++-1.7.9.tar.gz 749476
-MD5 118d30c7ffd7e5ad49b78415acaac0bb mysql++-gcc-3.0.patch.gz 21357
diff --git a/dev-db/mysql++/files/digest-mysql++-1.7.9-r1 b/dev-db/mysql++/files/digest-mysql++-1.7.9-r1
deleted file mode 100644
index 277270f70984..000000000000
--- a/dev-db/mysql++/files/digest-mysql++-1.7.9-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1312fb4e33dcce07fac5fa9c2ac801f7 mysql++-1.7.9.tar.gz 749476
-MD5 118d30c7ffd7e5ad49b78415acaac0bb mysql++-gcc-3.0.patch.gz 21357
-MD5 f7358e00675fde37caa7a4aa1baa48d1 mysql++-gcc-3.2.patch.gz 2451
diff --git a/dev-db/mysql++/files/digest-mysql++-1.7.9-r2 b/dev-db/mysql++/files/digest-mysql++-1.7.9-r2
deleted file mode 100644
index 350f469fb3e5..000000000000
--- a/dev-db/mysql++/files/digest-mysql++-1.7.9-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1312fb4e33dcce07fac5fa9c2ac801f7 mysql++-1.7.9.tar.gz 749476
-MD5 118d30c7ffd7e5ad49b78415acaac0bb mysql++-gcc-3.0.patch.gz 21357
-MD5 f7358e00675fde37caa7a4aa1baa48d1 mysql++-gcc-3.2.patch.gz 2451
-MD5 51ae8cfd340cdf4a2d08d04ee3e01296 mysql++-gcc-3.2.2.patch.gz 416
-MD5 c80d705e300b76ab07e10344eb8f19d3 patch_gcc_3.3.gz 19755
-MD5 de17e2c7f20b5bad69ea677ce614a1ca mysqlplus-gcc-3.4.patch.gz 3888
diff --git a/dev-db/mysql++/files/digest-mysql++-1.7.9-r5 b/dev-db/mysql++/files/digest-mysql++-1.7.9-r5
deleted file mode 100644
index 350f469fb3e5..000000000000
--- a/dev-db/mysql++/files/digest-mysql++-1.7.9-r5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1312fb4e33dcce07fac5fa9c2ac801f7 mysql++-1.7.9.tar.gz 749476
-MD5 118d30c7ffd7e5ad49b78415acaac0bb mysql++-gcc-3.0.patch.gz 21357
-MD5 f7358e00675fde37caa7a4aa1baa48d1 mysql++-gcc-3.2.patch.gz 2451
-MD5 51ae8cfd340cdf4a2d08d04ee3e01296 mysql++-gcc-3.2.2.patch.gz 416
-MD5 c80d705e300b76ab07e10344eb8f19d3 patch_gcc_3.3.gz 19755
-MD5 de17e2c7f20b5bad69ea677ce614a1ca mysqlplus-gcc-3.4.patch.gz 3888
diff --git a/dev-db/mysql++/files/digest-mysql++-1.7.9-r6 b/dev-db/mysql++/files/digest-mysql++-1.7.9-r6
deleted file mode 100644
index 543695cd36bd..000000000000
--- a/dev-db/mysql++/files/digest-mysql++-1.7.9-r6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1312fb4e33dcce07fac5fa9c2ac801f7 mysql++-1.7.9.tar.gz 749476
-MD5 118d30c7ffd7e5ad49b78415acaac0bb mysql++-gcc-3.0.patch.gz 21357
-MD5 f7358e00675fde37caa7a4aa1baa48d1 mysql++-gcc-3.2.patch.gz 2451
-MD5 51ae8cfd340cdf4a2d08d04ee3e01296 mysql++-gcc-3.2.2.patch.gz 416
-MD5 c80d705e300b76ab07e10344eb8f19d3 patch_gcc_3.3.gz 19755
-MD5 d7598a799d4a2103f90795f11ab84cad mysqlplus-gcc-3.4.patch-try2.gz 3892
diff --git a/dev-db/mysql++/metadata.xml b/dev-db/mysql++/metadata.xml
new file mode 100644
index 000000000000..dbfe84ca36cf
--- /dev/null
+++ b/dev-db/mysql++/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mysql-bugs</herd>
+</pkgmetadata>
diff --git a/dev-db/mysql++/mysql++-1.7.26.ebuild b/dev-db/mysql++/mysql++-1.7.26.ebuild
index 680a18adefa5..85729f2cf9b0 100644
--- a/dev-db/mysql++/mysql++-1.7.26.ebuild
+++ b/dev-db/mysql++/mysql++-1.7.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.26.ebuild,v 1.1 2005/01/10 21:16:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.26.ebuild,v 1.2 2005/01/15 00:01:57 robbat2 Exp $
 
 inherit gcc eutils gnuconfig
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~hppa ~mips ~sparc ~ppc ~amd64"
+KEYWORDS="x86 ~alpha ~hppa ~mips ~sparc ~ppc ~amd64"
 IUSE=""
 
 DEPEND=">=dev-db/mysql-4.0
@@ -33,7 +33,7 @@ src_compile() {
 	myconf="${myconf} --includedir=/usr/include/mysql++"
 	# not including the directives to where MySQL is because it seems to
 	# find it just fine without
-	
+
 	# force the cflags into place otherwise they get totally ignored by
 	# configure
 	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
diff --git a/dev-db/mysql++/mysql++-1.7.9-r1.ebuild b/dev-db/mysql++/mysql++-1.7.9-r1.ebuild
deleted file mode 100644
index 5bd7d4412297..000000000000
--- a/dev-db/mysql++/mysql++-1.7.9-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.9-r1.ebuild,v 1.15 2005/01/01 17:37:25 eradicator Exp $
-
-inherit gcc eutils
-
-DESCRIPTION="C++ API interface to the MySQL database"
-# This is the download page but includes links to other places
-HOMEPAGE="http://www.mysql.org/downloads/api-mysql++.html"
-SRC_URI="http://mysql.he.net/Downloads/${PN}/${P}.tar.gz
-	http://mysql.adgrafix.com/Downloads/${PN}/${P}.tar.gz
-	http://mysql.fastmirror.com/Downloads/${PN}/${P}.tar.gz
-	http://mysql.oms-net.nl/Downloads/${PN}/${P}.tar.gz
-	mirror://gentoo/mysql++-gcc-3.0.patch.gz
-	mirror://gentoo/mysql++-gcc-3.2.patch.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ~alpha ~hppa ~mips ~sparc ppc"
-IUSE=""
-
-DEPEND=">=dev-db/mysql-3.23.49"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-p1 -d ${S}"
-	if [ `gcc-major-version` -eq 3 ] ; then
-		EPATCH_SINGLE_MSG="Patching for gcc 3.0..."
-		epatch ${DISTDIR}/mysql++-gcc-3.0.patch.gz
-		EPATCH_SINGLE_MSG="Patching for gcc 3.2..."
-		epatch ${DISTDIR}/mysql++-gcc-3.2.patch.gz
-		EPATCH_SINGLE_MSG="Patching to fix some warnings and errors..."
-		epatch ${FILESDIR}/mysql++-1.7.9-gcc_throw.patch
-		EPATCH_SINGLE_MSG="Patch for const char* error"
-		epatch ${FILESDIR}/mysql++-1.7.9-mysql4-gcc3.patch
-	else
-		EPATCH_SINGLE_MSG="Patch for const char* error"
-		epatch ${FILESDIR}/mysql++-1.7.9-mysql4-gcc295.patch
-	fi
-	EPATCH_SINGLE_MSG="Fixing examples directory bug..."
-	epatch ${FILESDIR}/mysql++-1.7.9_example.patch
-}
-
-src_compile() {
-	local myconf
-	# we want C++ exceptions turned on
-	myconf="--enable-exceptions"
-	# We do this because of the large number of header files installed to the include directory
-	# This is a breakage compared to previous versions that installed straight to /usr/include
-	myconf="${myconf} --includedir=/usr/include/mysql++"
-	# not including the directives to where MySQL is because it seems to find it
-	# just fine without
-	# force the cflags into place otherwise they get totally ignored by configure
-	CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS} ${CXXFLAGS}" \
-	econf \
-		--enable-exceptions \
-		--includedir=/usr/include/mysql++ || die "econf failed"
-
-	emake || die "unable to make"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	# install the docs and HTML pages
-	dodoc README LGPL
-	dodoc doc/*
-	dohtml doc/man-html/*
-	prepalldocs
-	ewarn "The MySQL++ include directory has changed compared to previous versions"
-	ewarn "It was previously /usr/include, but now it is /usr/include/mysql++"
-}
-
-pkg_postinst() {
-	ewarn "The MySQL++ include directory has changed compared to previous versions"
-	ewarn "It was previously /usr/include, but now it is /usr/include/mysql++"
-}
diff --git a/dev-db/mysql++/mysql++-1.7.9-r2.ebuild b/dev-db/mysql++/mysql++-1.7.9-r2.ebuild
deleted file mode 100644
index 4a057f6c9226..000000000000
--- a/dev-db/mysql++/mysql++-1.7.9-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.9-r2.ebuild,v 1.10 2005/01/01 17:37:25 eradicator Exp $
-
-inherit gcc eutils
-
-DESCRIPTION="C++ API interface to the MySQL database"
-# This is the download page but includes links to other places
-HOMEPAGE="http://www.mysql.org/downloads/api-mysql++.html"
-SRC_URI_BASE="mirror://mysql/Downloads/${PN}"
-SRC_URI="
-	${SRC_URI_BASE}/${P}.tar.gz
-	${SRC_URI_BASE}/${PN}-gcc-3.0.patch.gz
-	${SRC_URI_BASE}/${PN}-gcc-3.2.patch.gz
-	${SRC_URI_BASE}/${PN}-gcc-3.2.2.patch.gz
-	${SRC_URI_BASE}/patch_gcc_3.3.gz
-	${SRC_URI_BASE}/mysqlplus-gcc-3.4.patch.gz
-	"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ~alpha ~hppa ~mips ~sparc ppc"
-IUSE=""
-
-DEPEND=">=dev-db/mysql-3.23.49"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	EPATCH_OPTS="-p1 -d ${S}"
-	if [ `gcc-major-version` -eq 3 ] ; then
-		if [ `gcc-minor-version` -ne 3 ] ; then
-			EPATCH_SINGLE_MSG="Patching for gcc 3.0..." \
-			epatch ${DISTDIR}/mysql++-gcc-3.0.patch.gz
-			if [ `gcc-minor-version` -eq 2 ] ; then
-				EPATCH_SINGLE_MSG="Patching for gcc 3.2..." \
-				epatch ${DISTDIR}/mysql++-gcc-3.2.patch.gz
-				if [ `gcc-micro-version` -ge 2 ] ; then
-					EPATCH_SINGLE_MSG="Patching for gcc >=3.2.2..." \
-					epatch ${DISTDIR}/mysql++-gcc-3.2.2.patch.gz
-				fi
-			elif [ `gcc-minor-version` -eq 4 ] ; then
-				EPATCH_SINGLE_MSG="Patching for gcc 3.4 (patch for 3.2 needed first)..." \
-				epatch ${DISTDIR}/mysql++-gcc-3.2.patch.gz
-				EPATCH_SINGLE_MSG="Patching for gcc 3.4..." \
-				epatch ${DISTDIR}/mysqlplus-gcc-3.4.patch.gz
-			fi
-		# Doesn't work for gcc-3.3
-		EPATCH_SINGLE_MSG="Patching to fix some warnings and errors..." \
-		epatch ${FILESDIR}/mysql++-1.7.9-gcc_throw.patch
-		# This is included in mysql++-gcc-3.2.2.patch.gz
-		#EPATCH_SINGLE_MSG="Patch for const char* error" \
-		elif [ `gcc-minor-version` -eq 3 ] ; then
-			mv ${S}/sqlplusint/Makefile.in ${S}/sqlplusint/Makefile.in.old
-			EPATCH_SINGLE_MSG="Patching for gcc 3.3..." \
-			epatch ${DISTDIR}/patch_gcc_3.3.gz
-		fi
-		#epatch ${FILESDIR}/mysql++-1.7.9-mysql4-gcc3.patch
-	else
-		EPATCH_SINGLE_MSG="Patch for const char* error" \
-		epatch ${FILESDIR}/mysql++-1.7.9-mysql4-gcc295.patch
-	fi
-	EPATCH_SINGLE_MSG="Fixing examples directory bug..." \
-	epatch ${FILESDIR}/mysql++-1.7.9_example.patch
-}
-
-src_compile() {
-	local myconf
-	# we want C++ exceptions turned on
-	myconf="--enable-exceptions"
-	# We do this because of the large number of header files installed to the include directory
-	# This is a breakage compared to previous versions that installed straight to /usr/include
-	myconf="${myconf} --includedir=/usr/include/mysql++"
-	# not including the directives to where MySQL is because it seems to find it
-	# just fine without
-	# force the cflags into place otherwise they get totally ignored by configure
-	CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS} ${CXXFLAGS}" \
-	econf \
-		--enable-exceptions \
-		--includedir=/usr/include/mysql++ || die "econf failed"
-
-	emake || die "unable to make"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	# install the docs and HTML pages
-	dodoc README LGPL
-	dodoc doc/*
-	dohtml doc/man-html/*
-	prepalldocs
-	ewarn "The MySQL++ include directory has changed compared to previous versions"
-	ewarn "It was previously /usr/include, but now it is /usr/include/mysql++"
-}
-
-pkg_postinst() {
-	ewarn "The MySQL++ include directory has changed compared to previous versions"
-	ewarn "It was previously /usr/include, but now it is /usr/include/mysql++"
-}
diff --git a/dev-db/mysql++/mysql++-1.7.9-r5.ebuild b/dev-db/mysql++/mysql++-1.7.9-r5.ebuild
deleted file mode 100644
index 4c4218a4c5ab..000000000000
--- a/dev-db/mysql++/mysql++-1.7.9-r5.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.9-r5.ebuild,v 1.5 2005/01/01 17:37:25 eradicator Exp $
-
-inherit gcc eutils gnuconfig
-
-DESCRIPTION="C++ API interface to the MySQL database"
-# This is the download page but includes links to other places
-HOMEPAGE="http://www.mysql.org/downloads/api-mysql++.html"
-SRC_URI_BASE="mirror://mysql/Downloads/${PN}"
-SRC_URI="
-	${SRC_URI_BASE}/${P}.tar.gz
-	${SRC_URI_BASE}/${PN}-gcc-3.0.patch.gz
-	${SRC_URI_BASE}/${PN}-gcc-3.2.patch.gz
-	${SRC_URI_BASE}/${PN}-gcc-3.2.2.patch.gz
-	${SRC_URI_BASE}/patch_gcc_3.3.gz
-	${SRC_URI_BASE}/mysqlplus-gcc-3.4.patch.gz
-	"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~hppa ~mips ~sparc ~ppc ~amd64"
-IUSE=""
-
-DEPEND=">=dev-db/mysql-3.23.49"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	EPATCH_OPTS="-p1 -d ${S}"
-	if [ `gcc-major-version` -eq 3 ] ; then
-		if [ `gcc-minor-version` -ne 3 ] ; then
-			EPATCH_SINGLE_MSG="Patching for gcc 3.0..." \
-			epatch ${DISTDIR}/mysql++-gcc-3.0.patch.gz
-			if [ `gcc-minor-version` -eq 2 ] ; then
-				EPATCH_SINGLE_MSG="Patching for gcc 3.2..." \
-				epatch ${DISTDIR}/mysql++-gcc-3.2.patch.gz
-				if [ `gcc-micro-version` -ge 2 ] ; then
-					EPATCH_SINGLE_MSG="Patching for gcc >=3.2.2..." \
-					epatch ${DISTDIR}/mysql++-gcc-3.2.2.patch.gz
-				fi
-			elif [ `gcc-minor-version` -eq 4 ] ; then
-				EPATCH_SINGLE_MSG="Patching for gcc 3.4 (patch for 3.2 needed first)..." \
-				epatch ${DISTDIR}/mysql++-gcc-3.2.patch.gz
-				EPATCH_SINGLE_MSG="Patching for gcc 3.4..." \
-				epatch ${DISTDIR}/mysqlplus-gcc-3.4.patch.gz
-			fi
-		# Doesn't work for gcc-3.3
-		EPATCH_SINGLE_MSG="Patching to fix some warnings and errors..." \
-		epatch ${FILESDIR}/${P}-gcc_throw.patch
-		# This is included in mysql++-gcc-3.2.2.patch.gz
-		#EPATCH_SINGLE_MSG="Patch for const char* error" \
-		elif [ `gcc-minor-version` -eq 3 ]; then
-			mv ${S}/sqlplusint/Makefile.in ${S}/sqlplusint/Makefile.in.old
-			EPATCH_SINGLE_MSG="Patching for gcc 3.3..." \
-			epatch ${DISTDIR}/patch_gcc_3.3.gz
-			if [ `gcc-micro-version` -eq 3 ]; then
-				EPATCH_SINGLE_MSG="Patching for gcc 3.3.3..." \
-				epatch ${FILESDIR}/${P}-r5_gcc333.patch
-			fi
-		fi
-		#epatch ${FILESDIR}/${P}-mysql4-gcc3.patch
-	else
-		EPATCH_SINGLE_MSG="Patch for const char* error" \
-		epatch ${FILESDIR}/${P}-mysql4-gcc295.patch
-	fi
-	EPATCH_SINGLE_MSG="Fixing examples directory bug..." \
-	epatch ${FILESDIR}/${P}_example.patch
-
-	# add undef_short to list of include files for installation
-	epatch ${FILESDIR}/${P}-missing.patch
-}
-
-src_compile() {
-	gnuconfig_update
-	local myconf
-	# we want C++ exceptions turned on
-	myconf="--enable-exceptions"
-	# We do this because of the large number of header files installed to the include directory
-	# This is a breakage compared to previous versions that installed straight to /usr/include
-	myconf="${myconf} --includedir=/usr/include/mysql++"
-	# not including the directives to where MySQL is because it seems to find it
-	# just fine without
-	# force the cflags into place otherwise they get totally ignored by configure
-	CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS} ${CXXFLAGS}" \
-	econf \
-		--enable-exceptions \
-		--includedir=/usr/include/mysql++ || die "econf failed"
-
-	emake || die "unable to make"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	# install the docs and HTML pages
-	dodoc README LGPL
-	dodoc doc/*
-	dohtml doc/man-html/*
-	prepalldocs
-	ewarn "The MySQL++ include directory has changed compared to previous versions"
-	ewarn "It was previously /usr/include, but now it is /usr/include/mysql++"
-}
-
-pkg_postinst() {
-	ewarn "The MySQL++ include directory has changed compared to previous versions"
-	ewarn "It was previously /usr/include, but now it is /usr/include/mysql++"
-}
diff --git a/dev-db/mysql++/mysql++-1.7.9-r6.ebuild b/dev-db/mysql++/mysql++-1.7.9-r6.ebuild
deleted file mode 100644
index dc5439c90f56..000000000000
--- a/dev-db/mysql++/mysql++-1.7.9-r6.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.9-r6.ebuild,v 1.5 2005/01/01 17:37:25 eradicator Exp $
-
-inherit gcc eutils gnuconfig
-
-DESCRIPTION="C++ API interface to the MySQL database"
-# This is the download page but includes links to other places
-HOMEPAGE="http://www.mysql.org/downloads/api-mysql++.html"
-SRC_URI_BASE="mirror://mysql/Downloads/${PN}"
-SRC_URI="
-	${SRC_URI_BASE}/${P}.tar.gz
-	${SRC_URI_BASE}/${PN}-gcc-3.0.patch.gz
-	${SRC_URI_BASE}/${PN}-gcc-3.2.patch.gz
-	${SRC_URI_BASE}/${PN}-gcc-3.2.2.patch.gz
-	${SRC_URI_BASE}/patch_gcc_3.3.gz
-	${SRC_URI_BASE}/mysqlplus-gcc-3.4.patch-try2.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~hppa ~mips ~sparc ~ppc ~amd64"
-IUSE=""
-
-DEPEND=">=dev-db/mysql-3.23.49"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	EPATCH_OPTS="-p1 -d ${S}"
-	if [ `gcc-major-version` -eq 3 ] ; then
-		if [ `gcc-minor-version` -ne 3 ] ; then
-			EPATCH_SINGLE_MSG="Patching for gcc 3.0..." \
-			epatch ${DISTDIR}/mysql++-gcc-3.0.patch.gz
-			if [ `gcc-minor-version` -eq 2 ] ; then
-				EPATCH_SINGLE_MSG="Patching for gcc 3.2..." \
-				epatch ${DISTDIR}/mysql++-gcc-3.2.patch.gz
-				if [ `gcc-micro-version` -ge 2 ] ; then
-					EPATCH_SINGLE_MSG="Patching for gcc >=3.2.2..." \
-					epatch ${DISTDIR}/mysql++-gcc-3.2.2.patch.gz
-				fi
-			elif [ `gcc-minor-version` -eq 4 ] ; then
-				EPATCH_SINGLE_MSG="Patching for gcc 3.4 (patch for 3.2 needed first)..." \
-				epatch ${DISTDIR}/mysql++-gcc-3.2.patch.gz
-				EPATCH_SINGLE_MSG="Patching for gcc 3.4..." \
-				epatch ${DISTDIR}/mysqlplus-gcc-3.4.patch-try2.gz
-			fi
-		# Doesn't work for gcc-3.3
-		EPATCH_SINGLE_MSG="Patching to fix some warnings and errors..." \
-		epatch ${FILESDIR}/${P}-gcc_throw.patch
-		# This is included in mysql++-gcc-3.2.2.patch.gz
-		#EPATCH_SINGLE_MSG="Patch for const char* error" \
-		#epatch ${FILESDIR}/${P}-mysql4-gcc3.patch
-		elif [ `gcc-minor-version` -eq 3 ]; then
-			mv ${S}/sqlplusint/Makefile.in ${S}/sqlplusint/Makefile.in.old
-			EPATCH_SINGLE_MSG="Patching for gcc 3.3..." \
-			epatch ${DISTDIR}/patch_gcc_3.3.gz
-			if [ `gcc-micro-version` -eq 3 ]; then
-				EPATCH_SINGLE_MSG="Patching for gcc 3.3.3..." \
-				epatch ${FILESDIR}/${P}-r5_gcc333.patch
-			fi
-		fi
-	else
-		EPATCH_SINGLE_MSG="Patch for const char* error" \
-		epatch ${FILESDIR}/${P}-mysql4-gcc295.patch
-	fi
-	EPATCH_SINGLE_MSG="Fixing examples directory bug..." \
-	epatch ${FILESDIR}/${P}_example.patch
-
-	# add undef_short to list of include files for installation
-	epatch ${FILESDIR}/${P}-missing.patch
-}
-
-src_compile() {
-	gnuconfig_update
-	local myconf
-	# we want C++ exceptions turned on
-	myconf="--enable-exceptions"
-	# We do this because of the large number of header files installed to the include directory
-	# This is a breakage compared to previous versions that installed straight to /usr/include
-	myconf="${myconf} --includedir=/usr/include/mysql++"
-	# not including the directives to where MySQL is because it seems to find it
-	# just fine without
-	# force the cflags into place otherwise they get totally ignored by configure
-	CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS} ${CXXFLAGS}" \
-	econf \
-		--enable-exceptions \
-		--includedir=/usr/include/mysql++ || die "econf failed"
-
-	emake || die "unable to make"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	# install the docs and HTML pages
-	dodoc README LGPL
-	dodoc doc/*
-	dohtml doc/man-html/*
-	prepalldocs
-	ewarn "The MySQL++ include directory has changed compared to previous versions"
-	ewarn "It was previously /usr/include, but now it is /usr/include/mysql++"
-}
-
-pkg_postinst() {
-	ewarn "The MySQL++ include directory has changed compared to previous versions"
-	ewarn "It was previously /usr/include, but now it is /usr/include/mysql++"
-}
diff --git a/dev-db/mysql++/mysql++-1.7.9.ebuild b/dev-db/mysql++/mysql++-1.7.9.ebuild
deleted file mode 100644
index 028407c3d4d1..000000000000
--- a/dev-db/mysql++/mysql++-1.7.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.9.ebuild,v 1.15 2005/01/01 17:37:25 eradicator Exp $
-
-inherit gcc eutils
-
-DESCRIPTION="C++ API interface to the MySQL database"
-# This is the download page but includes links to other places
-HOMEPAGE="http://www.mysql.org/downloads/api-mysql++.html"
-SRC_URI="http://mysql.he.net/Downloads/${PN}/${P}.tar.gz
-	http://mysql.adgrafix.com/Downloads/${PN}/${P}.tar.gz
-	http://mysql.fastmirror.com/Downloads/${PN}/${P}.tar.gz
-	http://mysql.oms-net.nl/Downloads/${PN}/${P}.tar.gz
-	mirror://gentoo/mysql++-gcc-3.0.patch.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-# Depends on MySQL being installed, duh! :-)
-DEPEND="<dev-db/mysql-4.0.0
-	>=dev-db/mysql-3.23.49"
-
-src_compile() {
-	if [ `gcc-major-version` -eq 3 ] ; then
-		epatch ${DISTDIR}/mysql++-gcc-3.0.patch
-		epatch ${DISTDIR}/mysql++-gcc-3.2.patch
-	fi
-	epatch ${FILESDIR}/mysql++-1.7.9_example.patch
-
-	# not including the directives to where MySQL is because it seems to find it
-	# just fine without
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--enable-exceptions \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-
-	emake || die "unable to make"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc doc/*
-	dohtml doc/man-html/*
-}