Update mail-filter/opendkim-2.10.3

2 files changed, 23 insertions, 18 deletions

diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 5525f73c..14d724bd 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -3,5 +3,5 @@ AUX opendkim.init.r3 1479 SHA256 b2daa1749672a81bebad1af9ff03e300e6937a70cf06023
 AUX opendkim.service 439 SHA256 8636aee39d924067d1f1673291d1501cec3e6fdee0de16533a1e3616471b35ed SHA512 308edc70fdb0bd57b424e739412217fd8017b017e9b27bc0954dec55294d10d8b7713f6f191836b94aa49bf578bfb391dca748af0c8d9b72e14ebe1eae21e834 WHIRLPOOL 4b7c42b130a31120efba7aa04f90cacd8c6b760204577e2914901eddc6cb425b1c06253d60f43673d28f9992e4b078010f444a390569544573601b3fdbf66e76
 DIST opendkim-2.10.3.tar.gz 1210224 SHA256 43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8 WHIRLPOOL 36bbf0f3e81fa291f31123d3614ba113b893d4ba76a5fe017cc9a393888c1ea95525b85e6042bc1db96e9a00e52aa13a251c38438cd03b0fd92b47d17036d680
 DIST opendkim-2.9.2.tar.gz 1229383 SHA256 1f0c66afbe48f6223d2ab985b2c27594ae45035e3e81eba887d8ec6e5e1282c0 SHA512 f6fe77897927a93c9f57d09e5e9f43b1e73e2b21a586461b5665fb430eee1362b33d9601c8643d50d5a53c8e01b03c7af331f28cd992c9163f959723f21ebf63 WHIRLPOOL b61212d272d07c367c7d9ecb951466b66759b6d449047c10947681ea6889a1f2b2c12986e6c11a59620fb8ace3c0a177235f65f58c54c993909f61dee5cf3c3a
-EBUILD opendkim-2.10.3.ebuild 7442 SHA256 d5e18b653e0b1daec3e1b8c9a78af5861b2eec847aa26abb0fa72e412c851c81 SHA512 f491f7a7b42397a5712515c1b0adf58d2d00192e3fe3c3e271f7ac96c8d2a7444e24ee416c1e641851a1ed898a57331418f040fdcaabfcce0b1e789fb4542bed WHIRLPOOL 27c1157112fb484da3d3a3869d193742cf88f3ffb74ba4b675a81cd17797405dd24de11b6de8a0a25bd78234294cb0b8855a0eb4c95c6836043e44bfd325d83d
+EBUILD opendkim-2.10.3.ebuild 7625 SHA256 d4859f78c458cacd1816aea37949897a256789c1ed6109f27cc1e5b5c39c7fe6 SHA512 fe8f96e4a6cecc9533ba364f6197227c15b3ebde9dd5a9b53f5773e9fbd688fa5a849bd475a9ae3f89a8e6024012614c236b246ee48ade96c13036001c4c3374 WHIRLPOOL 5adc29f9893eabf13fda6e03af66f1f8092aaab58f9851826614bc213feea363578c302e416b3adfaeb72dc7d24a7c62c5f89fbce872752ca3a8e9407fe28ac9
 EBUILD opendkim-2.9.2-r1.ebuild 6214 SHA256 4831dbc0e720f4ddee0c63a578e8d01c6351e269dbff9c62c445bd8bfcc3ec93 SHA512 ae3ed334fdc86a5adffb09a39968bd9defdcb4ca89e07609870290b97669c1f565fb5c4716c7d70718e37be508522eb24fef057e3a990140face5801d8fae9f8 WHIRLPOOL 0a0561faa3b981b0be2020b8f2cc9da0404e55bb19c71eca1be949f87079c758d622cb5ece569cd1cff914d6a0e75ae64eb756e663d93bb8953c34f39468bb86
diff --git a/mail-filter/opendkim/opendkim-2.10.3.ebuild b/mail-filter/opendkim/opendkim-2.10.3.ebuild
index 5aa61e17..bce98ba0 100644
--- a/mail-filter/opendkim/opendkim-2.10.3.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3.ebuild
@@ -17,26 +17,23 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 LICENSE="Sendmail-Open-Source BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
-IUSE="+berkdb curl diffheaders erlang experimental gnutls jansson ldap libevent lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound"
+IUSE="+berkdb diffheaders erlang experimental gnutls ldap libevent lmdb lua -memcached opendbx poll sasl selinux static-libs unbound"
 
 DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
 	dev-libs/libbsd
 	berkdb? ( >=sys-libs/db-3.2:* )
-	curl? ( net-misc/curl )
 	diffheaders? ( dev-libs/tre )
 	erlang? ( dev-lang/erlang )
-	experimental? ( net-analyzer/rrdtool )
+	experimental? ( dev-libs/jansson net-analyzer/rrdtool net-misc/curl )
 	gnutls? ( >=net-libs/gnutls-2.11.7 )
-	jansson? ( dev-libs/jansson )
+	!gnutls? ( >=dev-libs/openssl-0.9.8:* )
 	ldap? ( net-nds/openldap )
-	libevent? ( dev-libs/libevent )
 	lmdb? ( dev-db/lmdb )
 	lua? ( dev-lang/lua:* )
 	memcached? ( dev-libs/libmemcached )
 	opendbx? ( >=dev-db/opendbx-1.4.0 )
 	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( >=dev-libs/openssl-0.9.8:* )
-	unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root )
+	unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root libevent? ( dev-libs/libevent ) )
 	!unbound? ( net-libs/ldns )"
 
 RDEPEND="${DEPEND}
@@ -52,6 +49,13 @@ pkg_setup() {
 	# For consistency reasons, milter user must be created here with this home directory
 	# even though this package doesn't need a home directory for this user (#280571)
 	enewuser milter -1 -1 /var/lib/milter milter
+
+	if use libevent && ! use unbound; then
+		ewarn "USE='libevent' requires USE='unbound' - libevent support will not be built"
+	fi
+	if use memcached; then
+		ewarn "memcached support in ${PN} is thought to be unstable"
+	fi
 }
 
 src_prepare() {
@@ -98,22 +102,24 @@ src_configure() {
 	fi
 	if use experimental; then
 		#myconf+=" --enable-atps" # Despite being experimental, included as standard below...
-		myconf+=" --enable-db_handle_pools"
+		myconf+=" $(use_enable opendbx db_handle_pools)"
+
+		myconf+=" --with-librrd"
 		myconf+=" --enable-reprrd"
+
+		myconf+=" --with-curl"
+		myconf+=" --with-jansson"
 		myconf+=" --enable-reputation"
-		myconf+=" --with-librrd"
 	fi
 	if use ldap; then
-		#myconf+=" --enable-ldap_caching" # - Prevents LDAP changes from being immediately picked-up
+		#myconf+=" --enable-ldap_caching" # - Prevents LDAP changes from being immediately seen
 		myconf+=" $(use_with sasl)"
 	fi
-	if use libevent; then
-		myconf+=" $(use_with libevent)"
-	else
-		myconf+=" $(use_enable poll)"
-	fi
 	if use unbound; then
 		myconf+=" --with-unbound"
+		if use libevent; then
+			myconf+=" --with-libevent"
+		fi
 	else
 		myconf+=" --with-ldns"
 	fi
@@ -127,6 +133,7 @@ src_configure() {
 		$(use_enable diffheaders) \
 		--enable-filter \
 		--enable-identity_header \
+		$(use_enable poll) \
 		--enable-rate_limit \
 		$(use_enable lua rbl) \
 		--enable-replace_rules \
@@ -136,10 +143,8 @@ src_configure() {
 		--enable-vbr \
 		--disable-live-testing \
 		$(use_with berkdb db) \
-		$(use_with curl) \
 		$(use_with erlang) \
 		$(use_with gnutls) \
-		$(use_with jansson) \
 		$(use_with memcached libmemcached) \
 		$(use_with lmdb) \
 		$(use_with lua) \