Polish 2.2.2 ebuild for installing proper docs and headers that work with the binary mysql as well as the source mysql per bug #158171.

Package-Manager: portage-2.1.3_rc5

4 files changed, 78 insertions, 5 deletions

diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog
index 3edefb401c1e..c21d3de6114a 100644
--- a/dev-db/mysql++/ChangeLog
+++ b/dev-db/mysql++/ChangeLog
@@ -1,6 +1,13 @@
 # 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.41 2007/04/13 20:28:38 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.42 2007/07/11 10:18:58 robbat2 Exp $
+
+*mysql++-2.2.2-r1 (11 Jul 2007)
+
+  11 Jul 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +mysql++-2.2.2-r1.ebuild:
+  Polish 2.2.2 ebuild for installing proper docs and headers that work with
+  the binary mysql as well as the source mysql per bug #158171.
 
 *mysql++-2.2.2 (13 Apr 2007)
 
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index f7ca577804d2..3ef07fda336b 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -27,14 +27,18 @@ EBUILD mysql++-2.1.1-r2.ebuild 1386 RMD160 69cf33926a617d2e802759a9c83b52a1e52a3
 MD5 b74a6926a1397b09e6c245e447c221ae mysql++-2.1.1-r2.ebuild 1386
 RMD160 69cf33926a617d2e802759a9c83b52a1e52a385b mysql++-2.1.1-r2.ebuild 1386
 SHA256 8ef4ad6cf31be69faed04cf36610ad55fdb7970fb8aeda08a4fa278d1a9d8f3a mysql++-2.1.1-r2.ebuild 1386
+EBUILD mysql++-2.2.2-r1.ebuild 1588 RMD160 2c7db5bb5422f75b1bd9c6f09b403884140ea68b SHA1 62dce93aecb7ea40fb59520c6f2cf6d87d86ad65 SHA256 50e2ca139238763dab9f442b7f03411973e0abcfa948b808ccbb1cd3ce3f9507
+MD5 f9692d5cd8c9d404ee5dcc81fa5ab127 mysql++-2.2.2-r1.ebuild 1588
+RMD160 2c7db5bb5422f75b1bd9c6f09b403884140ea68b mysql++-2.2.2-r1.ebuild 1588
+SHA256 50e2ca139238763dab9f442b7f03411973e0abcfa948b808ccbb1cd3ce3f9507 mysql++-2.2.2-r1.ebuild 1588
 EBUILD mysql++-2.2.2.ebuild 1308 RMD160 b54be49fcb2dc8e84d0ad237dfeb7b4b6c6169ac SHA1 975bb822b008ee9b036946de30b186b00c2ea7dd SHA256 4692077a5686352d516faecc068ea6da145ad67c88b376177e6c7362c34123af
 MD5 9e445081a412a78d9f08e9996ff9ecbd mysql++-2.2.2.ebuild 1308
 RMD160 b54be49fcb2dc8e84d0ad237dfeb7b4b6c6169ac mysql++-2.2.2.ebuild 1308
 SHA256 4692077a5686352d516faecc068ea6da145ad67c88b376177e6c7362c34123af mysql++-2.2.2.ebuild 1308
-MISC ChangeLog 6608 RMD160 87bc99f685ab2d6280c59e3e8b704884e3face98 SHA1 a7ba8899b42903bca6acf7baba6dda1fa28caae6 SHA256 8ee29660d90e50a9b4e9cddb8b63dd4dba1623429740cd4a56b9a061f562916f
-MD5 a9c37e07236011e2832861674b3c1fbd ChangeLog 6608
-RMD160 87bc99f685ab2d6280c59e3e8b704884e3face98 ChangeLog 6608
-SHA256 8ee29660d90e50a9b4e9cddb8b63dd4dba1623429740cd4a56b9a061f562916f ChangeLog 6608
+MISC ChangeLog 6864 RMD160 1d8922bc2f7fcece5762bc22873a59c21fbf3c61 SHA1 2ba6cb7eba11a9bef783eebb42eb6becb1d3c174 SHA256 542b0228c139abf991fbf061fdf222b8a519ce8f105888e41a2b9fa42b7a543c
+MD5 4aed3b52ce05c90dfb7c34016bf1836f ChangeLog 6864
+RMD160 1d8922bc2f7fcece5762bc22873a59c21fbf3c61 ChangeLog 6864
+SHA256 542b0228c139abf991fbf061fdf222b8a519ce8f105888e41a2b9fa42b7a543c ChangeLog 6864
 MISC metadata.xml 158 RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 SHA1 e5826687b0a91fba71e62888faa74fe37f44045a SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
 RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 metadata.xml 158
@@ -54,3 +58,6 @@ SHA256 8b449a0fa4585918c8b261ce8bca475897aec0adc01943e7340b97733be86857 files/di
 MD5 7a922ab362694fbfe8659938c4ee5691 files/digest-mysql++-2.2.2 244
 RMD160 372b24b19e796f361974ce12641b6d8de83ed01c files/digest-mysql++-2.2.2 244
 SHA256 2d0da27d3b28007653b8622f32d3e3db739d40475835b25efd844a9154f2e13d files/digest-mysql++-2.2.2 244
+MD5 7a922ab362694fbfe8659938c4ee5691 files/digest-mysql++-2.2.2-r1 244
+RMD160 372b24b19e796f361974ce12641b6d8de83ed01c files/digest-mysql++-2.2.2-r1 244
+SHA256 2d0da27d3b28007653b8622f32d3e3db739d40475835b25efd844a9154f2e13d files/digest-mysql++-2.2.2-r1 244
diff --git a/dev-db/mysql++/files/digest-mysql++-2.2.2-r1 b/dev-db/mysql++/files/digest-mysql++-2.2.2-r1
new file mode 100644
index 000000000000..7a63e36f3a02
--- /dev/null
+++ b/dev-db/mysql++/files/digest-mysql++-2.2.2-r1
@@ -0,0 +1,3 @@
+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++/mysql++-2.2.2-r1.ebuild b/dev-db/mysql++/mysql++-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..e1b7a44b2dc0
--- /dev/null
+++ b/dev-db/mysql++/mysql++-2.2.2-r1.ebuild
@@ -0,0 +1,56 @@
+# 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-r1.ebuild,v 1.1 2007/07/11 10:18:58 robbat2 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}"
+	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() {
+	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* CREDITS ChangeLog HACKERS Wishlist
+	dodoc doc/*
+	cp -ra doc/html ${D}/usr/share/doc/${PF}/html
+	prepalldocs
+}