From: Daniel Black <dragonheart@gentoo.org>
Date: Tue, 9 Mar 2010 00:43:13 +0000 (+0000)
Subject: fix for bug #308171 to enable compulation with USE=ldap,-lua. Thanks to Guillaume... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=243d3df04fccea572bcfb4a0b032fab08717fb8d;p=gentoo.git

fix for bug #308171 to enable compulation with USE=ldap,-lua. Thanks to Guillaume Castagnino
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
---

diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index c24e71613f27..dd31246cfa9f 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/opendkim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.9 2010/03/05 19:29:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.10 2010/03/09 00:43:12 dragonheart Exp $
+
+  09 Mar 2010; Daniel Black <dragonheart@gentoo.org> opendkim-2.0.0.ebuild,
+  +files/opendkim-2.0.0-lua-ldap.patch:
+  fix for bug #308171 to enable compulation with USE=ldap,-lua. Thanks to
+  Guillaume Castagnino
 
 *opendkim-2.0.0 (05 Mar 2010)
 
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 0c67c1371ae8..581c2b75e8dc 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,11 +1,12 @@
 AUX opendkim-1.1.2-test73.patch 309 RMD160 2caaf1bb4f1547c6f59c94733f4cc5cf6389ad52 SHA1 da98246f608c7bb3ed65bc327ee3ba039c66b29c SHA256 16084f7b5bccb3d82614d93fc43912009ca33c4bf2f471d9ab8352345cbdc2b0
 AUX opendkim-1.2.2-repcalc.patch 240 RMD160 ed9f5f87d51ef6deb622ebac3e83a7d3261357c1 SHA1 f4e1fd1076bdd2fee78649f2f427844b787051da SHA256 ca0ba7cedcfbf99bef753ae3d9eeb8ae67947e5ce15d02eab66b38c876345fd1
+AUX opendkim-2.0.0-lua-ldap.patch 909 RMD160 8715bdc5aec9a6903577f9d48411a998f5ec84ba SHA1 0d25a78d191be71142cb1e801aeae598fdca64a7 SHA256 7b905d3438ffa4371475ad09af6666d2ae59cafbce1007b3441689a79edcd82a
 AUX opendkim.init 1417 RMD160 df83c4df3b5a6eaa86ff21f8557bcb41fe5cbf2a SHA1 5d70122b00fd11f2a1b26537faca50bda7647f45 SHA256 a79ff9fed5ee3834aa905f6df613035b1121a3b3e264362a74558d315d3c30d9
 DIST opendkim-1.1.2.tar.gz 856455 RMD160 c79918192ed26f771286f1c88efe29ac71e66d73 SHA1 1609c6ffb201e0aa99ddb6c3194f252916074abd SHA256 5f11526c9a490b6649794b0e5910cb6e6c9b3fe815cf8b731dbed8ddb077d078
 DIST opendkim-1.2.2.tar.gz 879000 RMD160 662bd8abad2c798f0fc4b6769b82b953f1274f66 SHA1 daee04bf5e755c6e910068e56ea38caba16f67de SHA256 dc123a9e1546ec404535a57ecf717728e5cf89681f7cf749ad27ec0942857b06
 DIST opendkim-2.0.0.tar.gz 986884 RMD160 d85a88e4d493f86e0e14af8cec350f532b282aaf SHA1 bb33854bac14409a0b68539c38c2e5e2b9b07ccf SHA256 1d8b96760949821eaaae40aefa5a1b0b3194dfcd0cfaa76d630ff3d1488824ca
 EBUILD opendkim-1.1.2.ebuild 4978 RMD160 60f9c9d991c192797740c81d9ac886b954281bb8 SHA1 df683fb692d2ee36f9c5d031796f7498da9dc340 SHA256 9362279db968010a95e7e4ebc59646e480cbda64df5c723306936d7c70336f13
 EBUILD opendkim-1.2.2-r1.ebuild 5358 RMD160 d619d2d89ff7a4fc8c42f2a9d43ee84ae71bd67a SHA1 3ad33d92f77ef417765d500ffb2b1ebf5c66d392 SHA256 69e8898ff0b9a8d5afb15046244b5f4332677926133fe3b0f9926bf6ac75dd89
-EBUILD opendkim-2.0.0.ebuild 5658 RMD160 a729fb5402140fd05dc813991670ecff5024e458 SHA1 0a2128e0322246db46f77510636eda46fc0c9fcb SHA256 bec6780218c628e02bae7f6aa87a09a875a4e7e7a74f1849b66d28984a1888b9
-MISC ChangeLog 2435 RMD160 984b972593c8d42f078b1ef91a3eec88a4cfa3a0 SHA1 7729df35d3c16e51830a0eb3324c852ae7dde799 SHA256 dce342bb65a4c5d71756044739a39cf0e9c64dae8b6ab9148dcab74c050c7898
+EBUILD opendkim-2.0.0.ebuild 5723 RMD160 d14dd7631481a5b8d07a2d686c74908b34801029 SHA1 cee3415fa8020e4fb0275fbbba2a1094d8a0015a SHA256 ab319dd3ebc8d4f9fbdacf88263aedc2ededad17207cf99c185cee4e26438921
+MISC ChangeLog 2650 RMD160 14757441b4a5e56f05c0904df5f2ccf3ad9431db SHA1 841ae75fe2c6ed8ca4978306d93afe3590221094 SHA256 281989d017b8965df24ca7429cca50ec15636d476aa8f3658425cf0576e72faa
 MISC metadata.xml 1536 RMD160 d79b495319a3dbd055605591c2038fc1cdc4cc00 SHA1 e0ca8fd4345d31bbf6049fcb7c4101d95353b413 SHA256 7b2afa62ff1ebfb509298c51f5c13be598a29fe8123c01546ee20dd1b280282a
diff --git a/mail-filter/opendkim/files/opendkim-2.0.0-lua-ldap.patch b/mail-filter/opendkim/files/opendkim-2.0.0-lua-ldap.patch
new file mode 100644
index 000000000000..c80884d8870d
--- /dev/null
+++ b/mail-filter/opendkim/files/opendkim-2.0.0-lua-ldap.patch
@@ -0,0 +1,25 @@
+Index: configure.ac
+===================================================================
+RCS file: /cvsroot/opendkim/configure.ac,v
+retrieving revision 1.139
+retrieving revision 1.140
+diff -u -b -B -r1.139 -r1.140
+--- configure.ac	3 Mar 2010 16:32:55 -0000	1.139
++++ configure.ac	7 Mar 2010 17:17:57 -0000	1.140
+@@ -3,7 +3,7 @@
+ #
+ # Copyright (c) 2009, 2010  The OpenDKIM Project.  All rights reserved.
+ # 
+-# $Id: opendkim-2.0.0-lua-ldap.patch,v 1.1 2010/03/09 00:43:13 dragonheart Exp $
++# $Id: opendkim-2.0.0-lua-ldap.patch,v 1.1 2010/03/09 00:43:13 dragonheart Exp $
+ 
+ #
+ # Setup
+@@ -1063,7 +1063,6 @@
+ 				AC_MSG_RESULT([ok]), 
+ 				AC_MSG_ERROR([OpenLDAP version 2.1.3 or later required]))
+ 	CPPFLAGS="$saved_CPPFLAGS"
+-	AC_DEFINE([USE_LUA], 1, [support for Lua scripting])
+ 	AC_DEFINE([USE_LDAP], 1, [OpenLDAP support for datasets enabled])
+ fi
+ AM_CONDITIONAL(USE_LDAP, test x"$ldap_found" = x"yes")
diff --git a/mail-filter/opendkim/opendkim-2.0.0.ebuild b/mail-filter/opendkim/opendkim-2.0.0.ebuild
index 238574cfc653..c371a1c1a4f8 100644
--- a/mail-filter/opendkim/opendkim-2.0.0.ebuild
+++ b/mail-filter/opendkim/opendkim-2.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.0.ebuild,v 1.1 2010/03/05 19:29:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.0.0.ebuild,v 1.2 2010/03/09 00:43:12 dragonheart Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit eutils autotools
 
 # for betas
 #MY_P=${P/_b/.B}
@@ -46,6 +46,8 @@ src_prepare() {
 	sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \
 	       -e 's:/etc/mail:/etc/opendkim:g' \
 		   opendkim/opendkim.conf.sample
+	epatch "${FILESDIR}"/${P}-lua-ldap.patch
+	eautoreconf
 }
 
 src_configure() {