Update mail-filter/opendkim-2.10.3-r3

2 files changed, 32 insertions, 29 deletions

diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index eab114cf..630725cd 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -5,6 +5,6 @@ AUX opendkim.init.r3 1430 SHA256 0054940f1d1d562829c0094b2e440f10b175f0c4de20c3d
 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-r3.ebuild 7400 SHA256 1711da24f3ae41f36de124bc5bc5c8cd899ef2680faf14eeed289443edb58af4 SHA512 dcd43d740ec58aa9a0936006c5add6057d18693f3ce0817a1ab8d184bae990e217982d20ca0f8d5966953a923d87ed5fd7573a59f2e375e50a29105e8d83c866 WHIRLPOOL bee1007127eb755a613ed699be6624526bada87f0f91503d47a67cf6d3997489dd49e794340133d4ff6dcef9670f9865a85a77312d5c7084ac9f3aad9e09bbb6
+EBUILD opendkim-2.10.3-r3.ebuild 7430 SHA256 246d7d491cfb5274d6265b861c2332f8d69f829b979732b5c50e02f599d45a36 SHA512 7386686da43b546ce9536a39a5a44aac19736f2905190df38f8602ba846f3ca97ab727b1452d36498cc535a6e53809b632d7db59693f4703f5468e63255f0ca3 WHIRLPOOL 6257d993f97df5d913ba73d9899d690676d9f22c23c3db3e9ccbabdcbdfecb4d2912c3ce677a0e987452fad82e1ef7ae5e5c7df046792838b263d19737b04216
 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-r3.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
index a7cb36d2..28431c9d 100644
--- a/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
+++ b/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild
@@ -29,22 +29,25 @@ DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
 	diffheaders? ( dev-libs/tre )
 	erlang? ( dev-lang/erlang )
 	experimental? ( dev-libs/jansson net-analyzer/rrdtool net-misc/curl )
-	gnutls? ( >=net-libs/gnutls-3.3 )
+	opendbx? ( >=dev-db/opendbx-1.4.0 )
+	lua? ( dev-lang/lua:* )
 	ldap? ( net-nds/openldap )
 	lmdb? ( dev-db/lmdb )
-	lua? ( dev-lang/lua:* )
 	memcached? ( dev-libs/libmemcached )
-	opendbx? ( >=dev-db/opendbx-1.4.0 )
 	sasl? ( dev-libs/cyrus-sasl )
 	unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root libevent? ( dev-libs/libevent ) )
-	!unbound? ( net-libs/ldns )"
+	!unbound? ( net-libs/ldns )
+	gnutls? ( >=net-libs/gnutls-3.3 )"
 
 RDEPEND="${DEPEND}
 	sys-process/psmisc
 	selinux? ( sec-policy/selinux-dkim )
 "
 
-REQUIRED_USE="sasl? ( ldap )"
+REQUIRED_USE="
+	sasl? ( ldap )
+	libevent? ( unbound )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.9.2-safekeys.patch"
@@ -92,14 +95,14 @@ src_prepare() {
 }
 
 src_configure() {
-	local -a myconf
+	local -a myconf=()
 	local dbinc
 
 	# Not featured:
 	# --enable-socketdb						arbitrary socket data sets
 	# --enable-postgresql_reconnect_hack	hack to overcome PostgreSQL connection error detection bug
 
-	if use berkdb; then
+	if use berkdb ; then
 		dbinc="$(db_includedir)"
 		myconf+=(
 			--with-db-incdir=${dbinc#-I}
@@ -120,10 +123,6 @@ src_configure() {
 			--enable-reputation
 		)
 	fi
-	if use ldap; then
-		#myconf+=( --enable-ldap_caching ) # - Prevents LDAP changes from being immediately seen
-		myconf+=( $(use_with sasl) )
-	fi
 	if use unbound; then
 		myconf+=( --with-unbound )
 		if use libevent; then
@@ -132,31 +131,35 @@ src_configure() {
 	else
 		myconf+=( --with-ldns )
 	fi
+	if use ldap; then
+		#myconf+=( --enable-ldap_caching ) # - Prevents LDAP changes from being immediately seen
+		myconf+=( $(use_with sasl) )
+	fi
 	econf \
-		"${myconf[@]}" \
-		--enable-atps \
-		--enable-default_sender \
+		$(use_with berkdb db) \
 		$(use_enable diffheaders) \
+		$(use_with diffheaders tre) \
+		$(use_with erlang) \
+		$(use_with opendbx odbx) \
+		$(use_with lua) \
+		$(use_enable lua rbl) \
+		$(use_with ldap openldap) \
+		$(use_with lmdb) \
+		$(use_enable poll) \
+		$(use_enable static-libs static) \
+		$(use_with gnutls) \
+		$(use_with memcached libmemcached) \
+		"${myconf[@]}" \
 		--enable-filter \
+		--enable-atps \
 		--enable-identity_header \
-		$(use_enable poll) \
 		--enable-rate_limit \
-		$(use_enable lua rbl) \
-		--enable-replace_rules \
 		--enable-resign \
+		--enable-replace_rules \
+		--enable-default_sender \
 		--enable-sender_macro \
-		$(use_enable static-libs static) \
 		--enable-vbr \
-		--disable-live-testing \
-		$(use_with berkdb db) \
-		$(use_with erlang) \
-		$(use_with gnutls) \
-		$(use_with memcached libmemcached) \
-		$(use_with lmdb) \
-		$(use_with lua) \
-		$(use_with opendbx odbx) \
-		$(use_with ldap openldap) \
-		$(use_with diffheaders tre)
+		--disable-live-testing
 		#--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S
 		#--disable-rpath
 }