Add ipv6 USE flag (#178501).

(Portage version: 2.1.2.12)

3 files changed, 26 insertions, 18 deletions

diff --git a/mail-filter/dkim-milter/ChangeLog b/mail-filter/dkim-milter/ChangeLog
index 46dcbec464f7..2c67d5b20a3b 100644
--- a/mail-filter/dkim-milter/ChangeLog
+++ b/mail-filter/dkim-milter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/dkim-milter
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/ChangeLog,v 1.6 2007/10/11 13:29:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/ChangeLog,v 1.7 2007/10/12 14:06:36 mrness Exp $
+
+  12 Oct 2007; Alin Năstac <mrness@gentoo.org>
+  files/dkim-milter-2.3.0-gentoo.patch, dkim-milter-2.3.0-r2.ebuild:
+  Add ipv6 USE flag (#178501).
 
   11 Oct 2007; Alin Năstac <mrness@gentoo.org> metadata.xml,
   dkim-milter-2.3.0-r2.ebuild:
diff --git a/mail-filter/dkim-milter/dkim-milter-2.3.0-r2.ebuild b/mail-filter/dkim-milter/dkim-milter-2.3.0-r2.ebuild
index e6995aa56842..bdb71037d697 100644
--- a/mail-filter/dkim-milter/dkim-milter-2.3.0-r2.ebuild
+++ b/mail-filter/dkim-milter/dkim-milter-2.3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/dkim-milter-2.3.0-r2.ebuild,v 1.3 2007/10/11 13:29:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/dkim-milter-2.3.0-r2.ebuild,v 1.4 2007/10/12 14:06:36 mrness Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dkim-milter/${P}.tar.gz"
 LICENSE="Sendmail-Open-Source"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="diffheaders"
+IUSE="ipv6 diffheaders"
 
 RDEPEND="dev-libs/openssl
 	>=sys-libs/db-3.2
@@ -34,7 +34,10 @@ src_unpack() {
 	cp site.config.m4.dist devtools/Site/site.config.m4 || \
 		die "failed to generate site.config.m4"
 	epatch "${FILESDIR}/${P}-gentoo.patch"
-	sed -i -e "s:@@CFLAGS@@:${CFLAGS}:" \
+
+	local ENVDEF=""
+	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
+	sed -i -e "s:@@CFLAGS@@:${CFLAGS}:" -e "s:@@ENVDEF@@:${ENVDEF}:" \
 		devtools/Site/site.config.m4
 
 	use diffheaders && epatch "${FILESDIR}/${P}-diffheaders.patch"
diff --git a/mail-filter/dkim-milter/files/dkim-milter-2.3.0-gentoo.patch b/mail-filter/dkim-milter/files/dkim-milter-2.3.0-gentoo.patch
index 6a9dd2ce1e7a..8d10f4444834 100644
--- a/mail-filter/dkim-milter/files/dkim-milter-2.3.0-gentoo.patch
+++ b/mail-filter/dkim-milter/files/dkim-milter-2.3.0-gentoo.patch
@@ -1,10 +1,11 @@
 diff -Nru dkim-milter-2.3.0.orig/devtools/Site/site.config.m4 dkim-milter-2.3.0/devtools/Site/site.config.m4
---- dkim-milter-2.3.0.orig/devtools/Site/site.config.m4	2007-10-10 06:35:16.000000000 +0300
-+++ dkim-milter-2.3.0/devtools/Site/site.config.m4	2007-10-10 06:38:32.000000000 +0300
-@@ -6,18 +6,21 @@
+--- dkim-milter-2.3.0.orig/devtools/Site/site.config.m4	2007-10-12 17:01:00.000000000 +0300
++++ dkim-milter-2.3.0/devtools/Site/site.config.m4	2007-10-12 17:01:35.000000000 +0300
+@@ -6,18 +6,22 @@
  dnl values described in devtools/README by setting your preferred values
  dnl in this file.
  
++define(`confENVDEF', `@@ENVDEF@@')
 +dnl man build is broken
 +define(`confNO_MAN_BUILD',`')
 +
@@ -25,7 +26,7 @@ diff -Nru dkim-milter-2.3.0.orig/devtools/Site/site.config.m4 dkim-milter-2.3.0/
  dnl 
  dnl libar normally uses res_init() or res_ninit() to load the contents
  dnl of resolv.conf for its use.  If neither of these work on your system
-@@ -82,7 +85,7 @@
+@@ -82,7 +86,7 @@
  dnl APPENDDEF(`confENVDEF', `-D_FFR_REQUIRED_HEADERS ')
  dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ')
  dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_SIGN_HEADERS ')
@@ -36,8 +37,8 @@ diff -Nru dkim-milter-2.3.0.orig/devtools/Site/site.config.m4 dkim-milter-2.3.0/
  
 diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter-2.3.0/dkim-filter/dkim-filter.conf.sample
 --- dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample	2007-09-21 01:06:01.000000000 +0300
-+++ dkim-milter-2.3.0/dkim-filter/dkim-filter.conf.sample	2007-10-10 14:28:16.000000000 +0300
-@@ -20,13 +18,6 @@
++++ dkim-milter-2.3.0/dkim-filter/dkim-filter.conf.sample	2007-10-12 17:01:24.000000000 +0300
+@@ -20,13 +20,6 @@
  
  # AutoRestart		No
  
@@ -51,7 +52,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  ##  BodyLengths { yes | no }
  ##  	default "no"
  ##
-@@ -74,7 +65,7 @@
+@@ -74,7 +67,7 @@
  ##  Specify for which domain(s) signing should be done.  No default; must
  ##  be specified for signing.
  
@@ -60,7 +61,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  
  ##  ExternalIgnoreList filename
  ##
-@@ -89,7 +80,7 @@
+@@ -89,7 +82,7 @@
  ##  Specifies the path to the private key to use when signing.  Ignored if
  ##  Keylist is set.  No default; must be specified for signing.
  
@@ -69,7 +70,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  
  ##  KeyList filename
  ##
-@@ -106,7 +97,7 @@
+@@ -106,7 +99,7 @@
  ##  as the beginning of a comment.  See dkim-filter.conf(5) for more
  ##  information.
  
@@ -78,7 +79,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  
  ##  InternalHosts filename
  ##
-@@ -114,7 +105,7 @@
+@@ -114,7 +107,7 @@
  ##  hosts from which mail should be signed rather than verified.
  ##  Automatically contains 127.0.0.1.  See man page for file format.
  
@@ -87,7 +88,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  
  ##  MacroList macro[=value][,...]
  ##
-@@ -177,22 +168,6 @@
+@@ -177,22 +170,6 @@
  
  # PeerList		filename
  
@@ -110,7 +111,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  ##  Quarantine { yes | no }
  ##  	default "no"
  ##
-@@ -267,7 +242,7 @@
+@@ -267,7 +244,7 @@
  ##  inet:port			to listen on all interfaces
  ##  local:/path/to/socket	to listen on a UNIX domain socket
  
@@ -119,7 +120,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  
  ##  SubDomains { yes | no }
  ##  	default "no"
-@@ -296,7 +271,7 @@
+@@ -296,7 +273,7 @@
  ##  Change to user "userid" before starting normal operation?  May include
  ##  a group ID as well, separated from the userid by a colon.
  
@@ -128,7 +129,7 @@ diff -Nru dkim-milter-2.3.0.orig/dkim-filter/dkim-filter.conf.sample dkim-milter
  
  ##  UseSSPDeny { yes | no }
  ##  	default "no"
-@@ -314,3 +289,10 @@
+@@ -314,3 +291,10 @@
  ##  messages it has processed.
  
  # X-Header		No