Bug #72069, a new upstream version finally (after 3 years), and we can now rip out all of the nasty patching.

4 files changed, 87 insertions, 13 deletions

diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog
index 412d1686c974..f4d90a23d7ed 100644
--- a/dev-db/mysql++/ChangeLog
+++ b/dev-db/mysql++/ChangeLog
@@ -1,6 +1,12 @@
 # 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.25 2005/01/01 17:37:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.26 2005/01/10 21:16:53 robbat2 Exp $
+
+*mysql++-1.7.26 (10 Jan 2005)
+
+  10 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> +mysql++-1.7.26.ebuild:
+  Bug #72069, a new upstream version finally (after 3 years), and we can now
+  rip out all of the nasty patching.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 531291811133..9c7bd2e5ddfa 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -1,22 +1,24 @@
-MD5 02b45452b5cce85dc6d175b8e8b22a68 ChangeLog 3858
-MD5 2920d65e67f47a20532a4a16a63f9af8 mysql++-1.7.9-r1.ebuild 2744
+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 fa18a351efc482c247d8b0ae972b43bf mysql++-1.7.9-r3.ebuild 3695
 MD5 b18b162d91eb52060678dddf1f1a92af mysql++-1.7.9-r4.ebuild 3845
-MD5 615ad0fdb9d1b37ef986cb0782a3c4d2 mysql++-1.7.9-r5.ebuild 3795
-MD5 777a3563a47604d7343ad4d2817f2437 mysql++-1.7.9.ebuild 1413
 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 fa18a351efc482c247d8b0ae972b43bf mysql++-1.7.9-r3.ebuild 3695
+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 027947f703cc541c6b056955cf5606be files/mysql++-1.7.9-gcc_throw.patch 7310
-MD5 5ac32002d3e432c050e274928b7a1d78 files/mysql++-1.7.9-missing.patch 2922
-MD5 54b8d3ba432ce4cad6c23fa32ac17042 files/mysql++-1.7.9-mysql4-gcc295.patch 421
-MD5 229dd0f10e6cee31e2f93df59b5f6742 files/mysql++-1.7.9-mysql4-gcc3.patch 426
-MD5 12c5b600d90bb67d1be6d702152e7d9f files/mysql++-1.7.9-r5_gcc333.patch 1047
-MD5 29dd283bdc19e7542a9f50501d4eda70 files/mysql++-1.7.9_example.patch 1203
-MD5 526598f80750489676ac49881bba7a69 files/mysql++-1.7.9_gcc333.patch 1047
 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.26 b/dev-db/mysql++/files/digest-mysql++-1.7.26
new file mode 100644
index 000000000000..53e1e85f23c8
--- /dev/null
+++ b/dev-db/mysql++/files/digest-mysql++-1.7.26
@@ -0,0 +1 @@
+MD5 2e425b1a334523723aadd86c9a3185bc mysql++-1.7.26.tar.gz 920002
diff --git a/dev-db/mysql++/mysql++-1.7.26.ebuild b/dev-db/mysql++/mysql++-1.7.26.ebuild
new file mode 100644
index 000000000000..680a18adefa5
--- /dev/null
+++ b/dev-db/mysql++/mysql++-1.7.26.ebuild
@@ -0,0 +1,65 @@
+# 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 $
+
+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="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~hppa ~mips ~sparc ~ppc ~amd64"
+IUSE=""
+
+DEPEND=">=dev-db/mysql-4.0
+		>=sys-devel/gcc-3"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+}
+
+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="${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
+	warning_movedir
+}
+
+pkg_postinst() {
+	warning_movedir
+}
+
+warning_movedir() {
+	ewarn "The MySQL++ include directory has changed compared to previous"
+	ewarn "versions.  It was previously /usr/include, but now it is"
+	ewarn "/usr/include/mysql++"
+}
+
+