Version bump, remove old versions.

(Portage version: 2.1.3.9)

6 files changed, 21 insertions, 66 deletions

diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog
index 80621f79d606..a6a37feef30b 100644
--- a/dev-db/mysql++/ChangeLog
+++ b/dev-db/mysql++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql++
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.47 2007/08/16 00:02:30 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.48 2007/10/18 22:05:36 hansmi Exp $
+
+*mysql++-2.3.2 (18 Oct 2007)
+
+  18 Oct 2007; Michael Hanselmann <hansmi@gentoo.org>
+  -mysql++-2.1.1-r2.ebuild, -mysql++-2.2.2.ebuild, +mysql++-2.3.2.ebuild:
+  Version bump, remove old versions.
 
   16 Aug 2007; Christoph Mende <angelos@gentoo.org> mysql++-2.2.2-r1.ebuild:
   Stable on amd64 wrt bug #184939
diff --git a/dev-db/mysql++/files/digest-mysql++-2.1.1-r2 b/dev-db/mysql++/files/digest-mysql++-2.1.1-r2
deleted file mode 100644
index 5fc16a885b3d..000000000000
--- a/dev-db/mysql++/files/digest-mysql++-2.1.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3a42b3422b37c65f88be9162a969d164 mysql++-2.1.1.tar.gz 1855521
-RMD160 bfeeade2be22e761c494e26f46059df2fbc858ac mysql++-2.1.1.tar.gz 1855521
-SHA256 fcd05ac5b4ef0b7b196636907f0ab14860a4b889bd3b3e4f2acc919e2bb05a53 mysql++-2.1.1.tar.gz 1855521
diff --git a/dev-db/mysql++/files/digest-mysql++-2.2.2 b/dev-db/mysql++/files/digest-mysql++-2.2.2
deleted file mode 100644
index 7a63e36f3a02..000000000000
--- a/dev-db/mysql++/files/digest-mysql++-2.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a3484c53eb86e04d430053de150b756d mysql++-2.2.2.tar.gz 1709697
-RMD160 87c6c5ddfe45f2607c1256d8e15aefa3ddd91d9a mysql++-2.2.2.tar.gz 1709697
-SHA256 a13b798c4082d663610c6457ee41a2e949ec4740c7fd9faafc33411d92d59565 mysql++-2.2.2.tar.gz 1709697
diff --git a/dev-db/mysql++/files/digest-mysql++-2.3.2 b/dev-db/mysql++/files/digest-mysql++-2.3.2
new file mode 100644
index 000000000000..cc26f540857e
--- /dev/null
+++ b/dev-db/mysql++/files/digest-mysql++-2.3.2
@@ -0,0 +1,3 @@
+MD5 e3b839b17872f1e0f2ddbf7cf407b395 mysql++-2.3.2.tar.gz 1627115
+RMD160 3f713ec5311dc791a328310c43bfb0174dc2d8d9 mysql++-2.3.2.tar.gz 1627115
+SHA256 3544b964964bc8981118119e82e4883dc9d1de8a72861a19e6687719ed3efce9 mysql++-2.3.2.tar.gz 1627115
diff --git a/dev-db/mysql++/mysql++-2.1.1-r2.ebuild b/dev-db/mysql++/mysql++-2.1.1-r2.ebuild
deleted file mode 100644
index 0407eaa60553..000000000000
--- a/dev-db/mysql++/mysql++-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-2.1.1-r2.ebuild,v 1.1 2006/11/28 20:50:37 hansmi Exp $
-
-inherit 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="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~hppa ~mips ~sparc ~ppc ~amd64"
-IUSE=""
-
-DEPEND=">=sys-devel/gcc-3"
-RDEPEND="${DEPEND}
-		>=virtual/mysql-4.0"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	epatch "${FILESDIR}/mysql++-signed-char-fix-try2.diff"
-}
-
-src_compile() {
-	gnuconfig_update
-	local myconf
-	# we want C++ exceptions turned on
-	myconf="--enable-exceptions"
-	# give threads a try
-	myconf="${myconf} --enable-thread-check"
-	# 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}" \
-	econf ${myconf} || 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
-}
diff --git a/dev-db/mysql++/mysql++-2.2.2.ebuild b/dev-db/mysql++/mysql++-2.3.2.ebuild
index 17729fbf65e8..172628bd63f0 100644
--- a/dev-db/mysql++/mysql++-2.2.2.ebuild
+++ b/dev-db/mysql++/mysql++-2.3.2.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-2.2.2.ebuild,v 1.1 2007/04/13 20:28:38 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-2.3.2.ebuild,v 1.1 2007/10/18 22:05:36 hansmi Exp $
 
 inherit 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"
+HOMEPAGE="http://tangentsoft.net/mysql++/"
 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="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=sys-devel/gcc-3"
@@ -21,6 +20,12 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack "${A}"
 	cd "${S}"
+	for i in ${S}/lib/*.h ; do
+		sed -i \
+			-e '/#include </s,mysql.h,mysql/mysql.h,g' \
+			-e '/#include </s,mysql_version.h,mysql/mysql_version.h,g' \
+			"${i}" || die "Failed to sed ${i} for fixing MySQL includes"
+	done
 }
 
 src_compile() {
@@ -43,8 +48,8 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die
 	# install the docs and HTML pages
-	dodoc README LGPL
+	dodoc README* CREDITS ChangeLog HACKERS Wishlist
 	dodoc doc/*
-	dohtml doc/man-html/*
+	cp -ra doc/html ${D}/usr/share/doc/${PF}/html
 	prepalldocs
 }