new revision to fix bug #29840

4 files changed, 130 insertions, 2 deletions

diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 1d69259c82d3..b2c02891927b 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -1,8 +1,8 @@
 MD5 6dd0d941d6260937526b27c0b1efd0c8 mysql++-1.7.9.ebuild 1412
 MD5 e4376fa3cd938e8a61dd9567dd8d0b51 mysql++-1.7.9-r2.ebuild 3531
 MD5 15684ec2c3fd52870f99f1406d7bf4cc mysql++-1.7.9-r1.ebuild 2725
-MD5 0f613f4574a6fa3628ea12cb6a0f4774 ChangeLog 2210
-MD5 86c8ff9a8cb216b4ed2072c59aa054af mysql++-1.7.9-r3.ebuild 3641
+MD5 7aca245a3b85bb27314320fe7b5fe2a2 ChangeLog 2392
+MD5 f0624ce16439b7f27d1fc8f7c85da9c8 mysql++-1.7.9-r3.ebuild 3641
 MD5 29dd283bdc19e7542a9f50501d4eda70 files/mysql++-1.7.9_example.patch 1203
 MD5 027947f703cc541c6b056955cf5606be files/mysql++-1.7.9-gcc_throw.patch 7310
 MD5 54b8d3ba432ce4cad6c23fa32ac17042 files/mysql++-1.7.9-mysql4-gcc295.patch 421
diff --git a/dev-db/mysql++/files/digest-mysql++-1.7.9-r3 b/dev-db/mysql++/files/digest-mysql++-1.7.9-r3
new file mode 100644
index 000000000000..350f469fb3e5
--- /dev/null
+++ b/dev-db/mysql++/files/digest-mysql++-1.7.9-r3
@@ -0,0 +1,6 @@
+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/mysql++-1.7.9-missing.patch b/dev-db/mysql++/files/mysql++-1.7.9-missing.patch
new file mode 100644
index 000000000000..473502c7e4ea
--- /dev/null
+++ b/dev-db/mysql++/files/mysql++-1.7.9-missing.patch
@@ -0,0 +1,22 @@
+--- mysql++-1.7.9/sqlplusint/Makefile.am.ori	2003-10-02 22:38:59.000000000 +0200
++++ mysql++-1.7.9/sqlplusint/Makefile.am	2003-10-02 22:39:22.000000000 +0200
+@@ -22,7 +22,7 @@
+ 	sql_query3.hh sql_string1.hh sql_string2.hh sql_string3.hh stream2string1.hh \
+ 	stream2string2.hh stream2string3.hh tiny_int1.hh tiny_int2.hh tiny_int3.hh \
+ 	type_info1.hh type_info2.hh type_info3.hh vallist1.hh vallist2.hh vallist3.hh \
+-	string_util.hh mysql++ exceptions.hh define_short defs 
++	string_util.hh mysql++ exceptions.hh define_short defs undef_short
+ 
+ all-local: custom.hh custom-macros.hh
+ 
+--- mysql++-1.7.9/sqlplusint/Makefile.in.ori	2003-10-02 22:39:09.000000000 +0200
++++ mysql++-1.7.9/sqlplusint/Makefile.in	2003-10-02 22:39:47.000000000 +0200
+@@ -92,7 +92,7 @@
+ 
+ libsqlplus_la_LDFLAGS = -version-info $(SQLPLUS_MAJOR_VERSION):$(SQLPLUS_MINOR_VERSION):$(SQLPLUS_MICRO_VERSION)
+ 
+-include_HEADERS = sqlplus.hh coldata1.hh coldata2.hh coldata3.hh coldata4.hh 	compare1.hh compare2.hh compare3.hh connection0.hh connection1.hh 	connection2.hh connection3.hh const_string1.hh const_string2.hh const_string3.hh 	convert1.hh convert2.hh convert3.hh custom-macros.hh custom.hh datetime1.hh 	datetime2.hh datetime3.hh field_names1.hh field_names2.hh field_names3.hh 	field_types1.hh field_types2.hh field_types3.hh fields1.hh fields2.hh 	manip1.hh manip2.hh manip3.hh null1.hh null2.hh null3.hh query1.hh query2.hh 	query3.hh resiter1.hh result1.hh result2.hh result3.hh row1.hh row2.hh 	row3.hh set1.hh set2.hh set3.hh sql_query0.hh sql_query1.hh sql_query2.hh 	sql_query3.hh sql_string1.hh sql_string2.hh sql_string3.hh stream2string1.hh 	stream2string2.hh stream2string3.hh tiny_int1.hh tiny_int2.hh tiny_int3.hh 	type_info1.hh type_info2.hh type_info3.hh vallist1.hh vallist2.hh vallist3.hh 	string_util.hh mysql++ exceptions.hh define_short defs 
++include_HEADERS = sqlplus.hh coldata1.hh coldata2.hh coldata3.hh coldata4.hh 	compare1.hh compare2.hh compare3.hh connection0.hh connection1.hh 	connection2.hh connection3.hh const_string1.hh const_string2.hh const_string3.hh 	convert1.hh convert2.hh convert3.hh custom-macros.hh custom.hh datetime1.hh 	datetime2.hh datetime3.hh field_names1.hh field_names2.hh field_names3.hh 	field_types1.hh field_types2.hh field_types3.hh fields1.hh fields2.hh 	manip1.hh manip2.hh manip3.hh null1.hh null2.hh null3.hh query1.hh query2.hh 	query3.hh resiter1.hh result1.hh result2.hh result3.hh row1.hh row2.hh 	row3.hh set1.hh set2.hh set3.hh sql_query0.hh sql_query1.hh sql_query2.hh 	sql_query3.hh sql_string1.hh sql_string2.hh sql_string3.hh stream2string1.hh 	stream2string2.hh stream2string3.hh tiny_int1.hh tiny_int2.hh tiny_int3.hh 	type_info1.hh type_info2.hh type_info3.hh vallist1.hh vallist2.hh vallist3.hh 	string_util.hh mysql++ exceptions.hh define_short defs undef_short
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h exceptions.hh
diff --git a/dev-db/mysql++/mysql++-1.7.9-r3.ebuild b/dev-db/mysql++/mysql++-1.7.9-r3.ebuild
new file mode 100644
index 000000000000..15c643a96d3e
--- /dev/null
+++ b/dev-db/mysql++/mysql++-1.7.9-r3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.9-r3.ebuild,v 1.1 2003/10/26 23:57:34 robbat2 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 ~arm ~sparc ~ppc"
+
+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
+
+	# add undef_short to list of include files for installation
+	epatch ${FILESDIR}/mysql++-1.7.9-missing.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++
+
+	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++"
+}