fix building with no mysql installed - found by Tobias Klausmann - bug #276912

(Portage version: 2.2_rc42/cvs/Linux i686)

3 files changed, 75 insertions, 1 deletions

diff --git a/net-mail/qmail-autoresponder/ChangeLog b/net-mail/qmail-autoresponder/ChangeLog
index aa4f1ce1fa32..160cb1b82964 100644
--- a/net-mail/qmail-autoresponder/ChangeLog
+++ b/net-mail/qmail-autoresponder/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/qmail-autoresponder
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-autoresponder/ChangeLog,v 1.34 2009/09/23 19:09:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-autoresponder/ChangeLog,v 1.35 2009/09/26 21:32:08 bangert Exp $
+
+*qmail-autoresponder-0.97-r1 (26 Sep 2009)
+
+  26 Sep 2009; Thilo Bangert <bangert@gentoo.org>
+  +qmail-autoresponder-0.97-r1.ebuild,
+  +files/qmail-autoresponder-0.97-remove-mysql.h.diff:
+  fix building with no mysql installed - found by Tobias Klausmann - bug
+  #276912
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org>
   qmail-autoresponder-0.96.2.ebuild, qmail-autoresponder-0.97.ebuild:
diff --git a/net-mail/qmail-autoresponder/files/qmail-autoresponder-0.97-remove-mysql.h.diff b/net-mail/qmail-autoresponder/files/qmail-autoresponder-0.97-remove-mysql.h.diff
new file mode 100644
index 000000000000..be33e047b16a
--- /dev/null
+++ b/net-mail/qmail-autoresponder/files/qmail-autoresponder-0.97-remove-mysql.h.diff
@@ -0,0 +1,8 @@
+diff -Naur qmail-autoresponder-0.97.orig/options.c qmail-autoresponder-0.97/options.c
+--- qmail-autoresponder-0.97.orig/options.c	2009-09-26 22:45:17.000000000 +0200
++++ qmail-autoresponder-0.97/options.c	2009-09-26 22:46:07.000000000 +0200
+@@ -1,4 +1,3 @@
+-#include <mysql/mysql.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <str/str.h>
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild
new file mode 100644
index 000000000000..98ee9dbc25d4
--- /dev/null
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild,v 1.1 2009/09/26 21:32:08 bangert Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Rate-limited autoresponder for qmail."
+HOMEPAGE="http://untroubled.org/qmail-autoresponder/"
+SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="mysql"
+
+DEPEND=">=dev-libs/bglibs-1.022
+	mysql? ( virtual/mysql )"
+RDEPEND="
+	${DEPEND}
+	virtual/qmail
+	mysql? ( virtual/mysql )
+"
+
+src_prepare() {
+	use mysql || epatch	"${FILESDIR}/${PN}-0.97-remove-mysql.h.diff"
+}
+
+src_configure() {
+	echo "/usr/include/bglibs" > conf-bgincs
+	echo "/usr/lib/bglibs" > conf-bglibs
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_compile() {
+	# fails on parallel builds!
+	make qmail-autoresponder || die "Failed to make qmail-autoresponder"
+	if use mysql; then
+		make qmail-autoresponder-mysql || die "Failed to make qmail-autoresponder-mysql"
+	fi
+}
+
+src_install () {
+	dobin qmail-autoresponder || die
+	doman qmail-autoresponder.1
+	if use mysql; then
+		dobin qmail-autoresponder-mysql || die
+		dodoc schema.mysql
+	fi
+
+	dodoc ANNOUNCEMENT NEWS README TODO ChangeLog procedure.txt
+}
+
+pkg_postinst() {
+	elog "Please see the README file in /usr/share/doc/${PF}/ for per-user configurations."
+}