From 1e2d75b0f7939f2b73686f811027f914f747c6d7 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Fri, 18 Jun 2004 09:25:58 +0000 Subject: fix bug bug #54220, and bug #49823 hopefully. --- dev-db/mysql++/ChangeLog | 7 +- dev-db/mysql++/Manifest | 30 ++++---- dev-db/mysql++/files/digest-mysql++-1.7.9-r6 | 6 ++ dev-db/mysql++/mysql++-1.7.9-r6.ebuild | 104 +++++++++++++++++++++++++++ 4 files changed, 132 insertions(+), 15 deletions(-) create mode 100644 dev-db/mysql++/files/digest-mysql++-1.7.9-r6 create mode 100644 dev-db/mysql++/mysql++-1.7.9-r6.ebuild (limited to 'dev-db/mysql++') diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog index 70399ac7029e..d1bc3866fb36 100644 --- a/dev-db/mysql++/ChangeLog +++ b/dev-db/mysql++/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-db/mysql++ # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.18 2004/05/13 07:55:16 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.19 2004/06/18 09:25:58 robbat2 Exp $ + +*mysql++-1.7.9-r6 (18 Jun 2004) + + 18 Jun 2004; Robin H. Johnson mysql++-1.7.9-r6.ebuild: + fix bug bug #54220, and bug #49823 hopefully. *mysql++-1.7.9-r5 (13 May 2004) diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest index 93f23851427f..3a1aef992ff3 100644 --- a/dev-db/mysql++/Manifest +++ b/dev-db/mysql++/Manifest @@ -1,20 +1,22 @@ +MD5 b880485b6169b2a58a9c5f76da5bfc17 mysql++-1.7.9.ebuild 1413 +MD5 b5ddb83f9121590fbeb9071f5929f2f5 mysql++-1.7.9-r5.ebuild 3805 +MD5 86a7af46292ac5a88c7bf0c767b78590 mysql++-1.7.9-r2.ebuild 3549 +MD5 1b26cd8d7913a751747b0c9465056173 mysql++-1.7.9-r4.ebuild 3854 +MD5 710fe0eb8c1cdcb8b8882a62cbec181f mysql++-1.7.9-r6.ebuild 3813 +MD5 2422f0671c3cb4036c7775cb419db11a mysql++-1.7.9-r1.ebuild 2743 +MD5 6595b65826629c2f9952df085dccf4ac ChangeLog 3327 +MD5 e5b552e65d779b78a008bd5a19eb2c18 mysql++-1.7.9-r3.ebuild 3707 +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 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 29dd283bdc19e7542a9f50501d4eda70 files/mysql++-1.7.9_example.patch 1203 MD5 13b4cad28b5dfaa0f580276962effada files/digest-mysql++-1.7.9-r4 397 -MD5 526598f80750489676ac49881bba7a69 files/mysql++-1.7.9_gcc333.patch 1047 MD5 13b4cad28b5dfaa0f580276962effada files/digest-mysql++-1.7.9-r5 397 -MD5 12c5b600d90bb67d1be6d702152e7d9f files/mysql++-1.7.9-r5_gcc333.patch 1047 -MD5 985a23577fe9315e2184923491a74b53 ChangeLog 3168 -MD5 9c45a54e52d6144ec76e061939440dc6 mysql++-1.7.9-r1.ebuild 2744 -MD5 074016ffbf08927febdf4bad73414cbf mysql++-1.7.9-r2.ebuild 3550 -MD5 f07098e94790b886b8a36410812f0d61 mysql++-1.7.9-r3.ebuild 3708 -MD5 6cce77be405ee5d19aae8619d719e330 mysql++-1.7.9.ebuild 1414 -MD5 c81ba24bbc8fc6df0a3b3882be3c7a5f mysql++-1.7.9-r4.ebuild 3855 -MD5 809ba56da48a8eb453313c368130393a mysql++-1.7.9-r5.ebuild 3806 +MD5 cf8006893dfe7612929c248704d83639 files/digest-mysql++-1.7.9-r6 402 diff --git a/dev-db/mysql++/files/digest-mysql++-1.7.9-r6 b/dev-db/mysql++/files/digest-mysql++-1.7.9-r6 new file mode 100644 index 000000000000..543695cd36bd --- /dev/null +++ b/dev-db/mysql++/files/digest-mysql++-1.7.9-r6 @@ -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 d7598a799d4a2103f90795f11ab84cad mysqlplus-gcc-3.4.patch-try2.gz 3892 diff --git a/dev-db/mysql++/mysql++-1.7.9-r6.ebuild b/dev-db/mysql++/mysql++-1.7.9-r6.ebuild new file mode 100644 index 000000000000..5f11152b9e56 --- /dev/null +++ b/dev-db/mysql++/mysql++-1.7.9-r6.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2004 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-r6.ebuild,v 1.1 2004/06/18 09:25:58 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_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-try2.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~x86 ~alpha ~hppa ~mips ~sparc ~ppc ~amd64" + +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-try2.gz + fi + # Doesn't work for gcc-3.3 + EPATCH_SINGLE_MSG="Patching to fix some warnings and errors..." \ + epatch ${FILESDIR}/${P}-gcc_throw.patch + # This is included in mysql++-gcc-3.2.2.patch.gz + #EPATCH_SINGLE_MSG="Patch for const char* error" \ + #epatch ${FILESDIR}/${P}-mysql4-gcc3.patch + 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 + if [ `gcc-micro-version` -eq 3 ]; then + EPATCH_SINGLE_MSG="Patching for gcc 3.3.3..." \ + epatch ${FILESDIR}/${P}-r5_gcc333.patch + fi + fi + else + EPATCH_SINGLE_MSG="Patch for const char* error" \ + epatch ${FILESDIR}/${P}-mysql4-gcc295.patch + fi + EPATCH_SINGLE_MSG="Fixing examples directory bug..." \ + epatch ${FILESDIR}/${P}_example.patch + + # add undef_short to list of include files for installation + epatch ${FILESDIR}/${P}-missing.patch +} + +src_compile() { + use amd64 && 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="${CFLAGS} ${CXXFLAGS}" \ + econf \ + --enable-exceptions \ + --includedir=/usr/include/mysql++ || 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 + 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++" +} -- cgit v1.2.3-65-gdbad