summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorMartin Holzer <mholzer@gentoo.org>2003-04-09 18:38:27 +0000
committerMartin Holzer <mholzer@gentoo.org>2003-04-09 18:38:27 +0000
commit65264b86c8b4ed656b5b3a9e064c766a905c6f79 (patch)
tree69c461f091882dc5cb1cc38d1cd824008faf041b /dev-db
parent Patching only if gcc3. Closes #12773. (diff)
downloadgentoo-2-65264b86c8b4ed656b5b3a9e064c766a905c6f79.tar.gz
gentoo-2-65264b86c8b4ed656b5b3a9e064c766a905c6f79.tar.bz2
gentoo-2-65264b86c8b4ed656b5b3a9e064c766a905c6f79.zip
Patching only if gcc3. Closes #12773.
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mysql++/ChangeLog6
-rw-r--r--dev-db/mysql++/Manifest5
-rw-r--r--dev-db/mysql++/files/digest-mysql++-1.7.92
-rw-r--r--dev-db/mysql++/mysql++-1.7.9.ebuild7
4 files changed, 13 insertions, 7 deletions
diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog
index d756f5981497..15160b13476c 100644
--- a/dev-db/mysql++/ChangeLog
+++ b/dev-db/mysql++/ChangeLog
@@ -1,9 +1,13 @@
# ChangeLog for dev-db/mysql++
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.4 2003/03/16 18:44:36 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.5 2003/04/09 18:37:45 mholzer Exp $
*mysql++-1.7.9 (11 Dec 2002)
+ 09 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+ mysql++-1.7.9.ebuild:
+ Patching only if gcc3. Closes #12773.
+
16 Mar 2003; <rac@gentoo.org> mysql++-1.7.9.ebuild:
Change DISTFILES to DISTDIR for gcc 3.0 patch - fix bug #17640
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 0a6d328365dc..f58b54f7b39e 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -1,6 +1,5 @@
-MD5 da09be5b667366019db93ea42670c02c ChangeLog 554
-MD5 50887df9dae488f9721a7791af0810bb mysql++-1.7.9.ebuild 1543
-MD5 1ae3ec3d9b5337f7805820b0f2d4338c mysql++-1.7.9.ebuild.org 1540
+MD5 e670074a93c9d8bd9695be8f5ffb927b ChangeLog 683
+MD5 2354cbbbdbcf099af10de13ae02e671c mysql++-1.7.9.ebuild 1562
MD5 bfb4832312c6add08412a9367bab5d19 files/digest-mysql++-1.7.9 133
MD5 29dd283bdc19e7542a9f50501d4eda70 files/mysql++-1.7.9_example.patch 1203
MD5 f4467c7ece50c1e366a80887cc2618b1 files/mysql++-gcc-3.2.patch 12811
diff --git a/dev-db/mysql++/files/digest-mysql++-1.7.9 b/dev-db/mysql++/files/digest-mysql++-1.7.9
index 8e4c6c38cbdd..fff7d0239001 100644
--- a/dev-db/mysql++/files/digest-mysql++-1.7.9
+++ b/dev-db/mysql++/files/digest-mysql++-1.7.9
@@ -1,2 +1,2 @@
MD5 1312fb4e33dcce07fac5fa9c2ac801f7 mysql++-1.7.9.tar.gz 749476
-MD5 06faeaa749ea9e83e1ce4bd6b45422a4 mysql++-gcc-3.0.patch 154545
+MD5 f0fe100dd755078d9348365002889ec8 mysql++-gcc-3.0.patch.gz 21357
diff --git a/dev-db/mysql++/mysql++-1.7.9.ebuild b/dev-db/mysql++/mysql++-1.7.9.ebuild
index fc2e17acce6b..c5e5b00e9cda 100644
--- a/dev-db/mysql++/mysql++-1.7.9.ebuild
+++ b/dev-db/mysql++/mysql++-1.7.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mysql.he.net/Downloads/mysql++/mysql++-1.7.9.tar.gz
http://mysql.adgrafix.com/Downloads/mysql++/mysql++-1.7.9.tar.gz
http://mysql.fastmirror.com/Downloads/mysql++/mysql++-1.7.9.tar.gz
http://mysql.oms-net.nl/Downloads/mysql++/mysql++-1.7.9.tar.gz
- mirror://gentoo/mysql++-gcc-3.0.patch"
+ mirror://gentoo/mysql++-gcc-3.0.patch.gz"
# This is the download page but includes links to other places
HOMEPAGE="http://www.mysql.org/downloads/api-mysql++.html"
@@ -22,11 +22,14 @@ KEYWORDS="~x86"
LICENSE="LGPL-2"
# Depends on MySQL being installed, duh! :-)
-DEPEND="mysql ( >=mysql-3.23.49 )"
+DEPEND="<dev-db/mysql-4.0.0
+ >=dev-db/mysql-3.23.49"
src_compile() {
+ if [[ "${COMPILER}" == "gcc3" ]];then
patch -p1 < ${DISTDIR}/mysql++-gcc-3.0.patch || die
patch -p1 < ${FILESDIR}/mysql++-gcc-3.2.patch || die
+ fi
patch -p1 < ${FILESDIR}/mysql++-1.7.9_example.patch || die
# not including the directives to where MySQL is because it seems to find it