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

Package-Manager: portage-2.2_rc42/cvs/Linux i686

4 files changed, 78 insertions, 2 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/Manifest b/net-mail/qmail-autoresponder/Manifest
index b00c0659cd8f..80b7bb7afe53 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -1,6 +1,8 @@
+AUX qmail-autoresponder-0.97-remove-mysql.h.diff 347 RMD160 cd448e18cf01de5b7920e5866ceac7b4e5612666 SHA1 104c55327e1d90653e8f9fd4b45a6c45f1ad38e2 SHA256 52fc2742320ee48d96f227861bde605073e163dae8f594c262fbaea0e93ff4dd
 DIST qmail-autoresponder-0.96.2.tar.gz 21110 RMD160 2f42a2e174f772be5c724eef15182e8b0ccf2a00 SHA1 15f2983a4209c046c9db16282d94cc3aedc9e860 SHA256 127329274dc20d524a29e7034469b1841100616129ca3d9c31f951a67698e40a
 DIST qmail-autoresponder-0.97.tar.gz 28158 RMD160 4c1b54a576bf2f4115ef7c02440b002d15034d08 SHA1 49d3a1f8fc960cb43229dff0e40f176b61a3b18b SHA256 445a36f10dd4c0af3608c9d546f3b2aad48870bffe35db31ea5dcb857abf699c
 EBUILD qmail-autoresponder-0.96.2.ebuild 1391 RMD160 5af60391361df05e677611d57a8396b79c2de69e SHA1 641bbed346e435a1661dabbefa2d35a575bc0638 SHA256 4c217de586ac7542ee39947c91ad8cbd1a347abafa5b7c658873577d991dac87
+EBUILD qmail-autoresponder-0.97-r1.ebuild 1516 RMD160 e22d5ec4f7d071a9110127d2e0d1ed4de047ab42 SHA1 d81fa3b9191bbf04231013c0659aa2778c10feda SHA256 0e9b978bade91c6dc3191307491ef24fd08157a689e0606fe3351a9196555de9
 EBUILD qmail-autoresponder-0.97.ebuild 1389 RMD160 6f29f3e8a6161f42324d76a064e08fc197e5ce76 SHA1 20ed40caec66030511b6886ed1671bcf0b32e158 SHA256 014e890a857d4d4c563ee01732c52ba81039bb1854682d5822024be0b8191b53
-MISC ChangeLog 5253 RMD160 1eb93ca12995ad9edc0c5233aba9aa2451dc37a2 SHA1 5f07ad4cea144252fbc681831109e7e26696d095 SHA256 e1321238e4f2b2e378ce2b6733d47af1bb725dfc656566df9849e20fb6c7fc92
+MISC ChangeLog 5525 RMD160 53af775e1795d733dc462c75e97974553f9a2a7d SHA1 279a3a4078919ad718455b97f6d7bcabaaa27f37 SHA256 18cab72c0f3fea0737f29453d134c47662e9db80cc203b39bb752430cf3cfc7c
 MISC metadata.xml 497 RMD160 ba5661ec44b869a28d4333d5e740a31f24a30c04 SHA1 d1d00193ef2f3e334d2898434cd8be96f9c961c7 SHA256 c96f4b6bc9323cffdc2ed37c760ab7d413f6863c4b9745e8260c8618feaa79de
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."
+}