summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2003-05-08 21:13:27 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2003-05-08 21:13:27 +0000
commit211eecc890cc4c347df0d02ae3cc4ff0ea9380b4 (patch)
treefcafaa95940f924d30194d48d44f581c83fc7c3b /dev-db/mysql++
parentfixed a slight bug in the earlier update (diff)
downloadhistorical-211eecc890cc4c347df0d02ae3cc4ff0ea9380b4.tar.gz
historical-211eecc890cc4c347df0d02ae3cc4ff0ea9380b4.tar.bz2
historical-211eecc890cc4c347df0d02ae3cc4ff0ea9380b4.zip
fixed a slight bug in the earlier update
Diffstat (limited to 'dev-db/mysql++')
-rw-r--r--dev-db/mysql++/Manifest2
-rw-r--r--dev-db/mysql++/files/digest-mysql++-1.7.9-r11
-rw-r--r--dev-db/mysql++/mysql++-1.7.9-r1.ebuild43
3 files changed, 27 insertions, 19 deletions
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 9df9b3e28b31..811c4f5f10e2 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -1,6 +1,6 @@
MD5 fbdfacb7177f528d0e9f268d06c5b5c2 mysql++-1.7.9.ebuild 1518
MD5 efa9d28bfb9f662057ce1f82df1464b4 mysql++-1.7.9-r1.ebuild 2726
-MD5 5490886355b67fb83f1de91805e331e4 ChangeLog 1649
+MD5 e16882d3a186835b119b72e8d37873d5 ChangeLog 1649
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-r1 b/dev-db/mysql++/files/digest-mysql++-1.7.9-r1
index 1a2a98d09837..277270f70984 100644
--- a/dev-db/mysql++/files/digest-mysql++-1.7.9-r1
+++ b/dev-db/mysql++/files/digest-mysql++-1.7.9-r1
@@ -1,2 +1,3 @@
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++/mysql++-1.7.9-r1.ebuild b/dev-db/mysql++/mysql++-1.7.9-r1.ebuild
index c353bf5f7fec..48733d055304 100644
--- a/dev-db/mysql++/mysql++-1.7.9-r1.ebuild
+++ b/dev-db/mysql++/mysql++-1.7.9-r1.ebuild
@@ -11,7 +11,8 @@ 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.0.patch.gz
+ mirror://gentoo/mysql++-gcc-3.2.patch.gz"
# This is the download page but includes links to other places
HOMEPAGE="http://www.mysql.org/downloads/api-mysql++.html"
@@ -22,23 +23,27 @@ KEYWORDS="~x86"
LICENSE="LGPL-2"
DEPEND=">=dev-db/mysql-3.23.49"
-src_compile() {
-
- if [[ "${COMPILER}" == "gcc3" ]];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..."
+src_unpack() {
+ unpack "${A}"
+ EPATCH_OPTS="-p1 -d ${S}"
+ if [[ "${COMPILER}" == "gcc3" ]];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
@@ -49,7 +54,8 @@ src_compile() {
# 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 \
+ CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS} ${CXXFLAGS}" \
+ econf \
--enable-exceptions \
--includedir=/usr/include/mysql++
@@ -62,6 +68,7 @@ src_install () {
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++"
}