Make support for PKCS#11 optional with USE=gnutls, cleanup some legacy code

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 15 insertions, 26 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 47f947e8c6a8..7aee4d9199e5 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.268 2013/10/30 00:59:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.269 2013/11/01 19:55:09 grobian Exp $
+
+  01 Nov 2013; Fabian Groffen <grobian@gentoo.org> exim-4.82.ebuild,
+  metadata.xml:
+  Make support for PKCS#11 optional with USE=gnutls, cleanup some legacy code
 
   30 Oct 2013; Jeroen Roovers <jer@gentoo.org> exim-4.82.ebuild:
   Marked ~hppa (bug #489676).
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 67fbfe749ce6..ec93cb9a77f5 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX auth_conf.sub 790 SHA256 d0631d487f115c07a178d48bc7168cd16d7b22c8879b1e926923152cde95ba78 SHA512 c0799a44e0fabdd4eb33c9c4a009c7abed80d5b2ab773206b11d644e54bb79004c5741fc510df77fe9856bdff979a14f1cf9a58da19fb00aaae05c623da287b3 WHIRLPOOL 54a457732851ec3154b38e161728f932e52166e0a3debe3f4672208207eb3070056a473bd6b73977ecda2d8d6c7348cbaf4870ee3d4b3250e64f2da5f58c5153
 AUX exim-4.14-tail.patch 446 SHA256 74d1044bb94e167180fd8f8aba7449ca3d2b09b1ce170a1a2e4e54ca0cd660da SHA512 a0365b15f0a48076f9660ebc424d48f68995ac21bbf77f407bdca5103ca65758d7f2241d0151eb5c78476557e240b24a95c23d3b12cfffc1b34ab6f89f2c2110 WHIRLPOOL c6e7e1d183c7669a745b33643c61b672a2c2800a0f1eeff380afa5cafe6d97a91106a4f08273ed154a87cfc7ee807cef8308422b53092083fcc12030403786a5
 AUX exim-4.20-maildir.patch 478 SHA256 2704c4db67bb7c58c2421656d942f533d1eedf1df187e76297ab72d2c2a2fb4c SHA512 2c6f68e3c162a51e62ce6e391db8e79733f11bba20cc8778737650158203b88f9a77b7bbbd2a32b2cf8ae50f039b794fb0996f198acec6a50b94cad6a111f432 WHIRLPOOL 4cf3638b7c7b05badeebbb65151f5d8e847fe2324ca5f88bcca87b8bf7e01ae290a9deccb26dec6abec89f105d00625efe99874e9ea2edf4a557b3d831c3b9f0
@@ -32,13 +29,6 @@ DIST system_filter.exim.gz 3075 SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d7
 EBUILD exim-4.80.1-r2.ebuild 12083 SHA256 5ba65d2507f561a1adbc15091562209979f18bc90e2323580c935386101298a1 SHA512 b79d8688bf37316f9e94ad7870ca53b48cf56c7061bcfafd6741478da17a30d406e512293ac8bc47c5774a6cc5114a4ea7f372f61772dc9a26a8ebec9697e22c WHIRLPOOL 05ba7fd9947c8b35a9b1304d6ad474b03dd45c6fdf273cea8e8e839b8b73a407115d97e924bc36d112417d1eb180e9e18f998f3f7a3f23a42fdd3a92ef6287bd
 EBUILD exim-4.80.1-r3.ebuild 12094 SHA256 c505f9e7c21d1bbc663e21a5423ece90162e34dd2d26fe6c13f72b0ea0a68872 SHA512 6df242718bc1eb8ed62a5f07e3479422a1cc5d41ee61e4d2293ec5a7cf06c5e30b20b799656fb57157c555a0f985f0433cce75e970f357093a30274a2b40fde3 WHIRLPOOL d9ad58df38b60cf2d5194adacd1b75534c866c7efa6f739f39ea9329ef144848a1821fed7743662a0e349aeb83ae9b7a71f6d37b29db93596f4c7308c3ed8d4a
 EBUILD exim-4.80.1.ebuild 11556 SHA256 8630f221f92ddd17cf05891d308d5e1347b550f2c6df596916e289dc2129149f SHA512 1d96761c1a2705be3e21e675ac5ecbbb11a97b140f483fd1067552c5ce07f6e3f0266bfd1139525e43c4fbc7a2ecf5b6e444912c2c6d6bbe3618d7f08c31dd2e WHIRLPOOL 2c994828d448d3266f33f514c595c21b61517ceb4ac13a7c2de519945cd853f100f16a8f3d17a956412b8be4a2a80197a316947d81f1db512d33b09c9b3ecca5
-EBUILD exim-4.82.ebuild 12413 SHA256 a42eb32df8ac26155894d6d39a403edc3456336457b8a8091df4f97f6883e016 SHA512 2990b7b833855f80f8acd0ab7b8a15a720853f2f6fc35397d015c8f08de985d2d5a6708de2cbfd19317514436504aed93408abb2d612a3b172b3c1415218ec03 WHIRLPOOL ce5c976b1a7403495ea131d3b979380874d71556c498efb77db49e294eaff26b0a25b017a71390a0c7b433eb212e9763e450ab9f4e341faebd71752f27302e04
-MISC ChangeLog 51616 SHA256 9f2e4c06cb3684d29adffda9b6e518ca44c55fe816e55fb8b74f5c10c0928586 SHA512 505f7e104543d4a24fa4d1435e7c1b302a52b05a24c73ec3b3e085b1221bab943cefab706e0bb9c7997b1b6dc728ea7bba48225e6e54bf462e08f136e9201886 WHIRLPOOL 149c0cff1ff8b9c819e32d306e38e8f9804f3ae05f289c8f84b17fa2321430d6ed76cd5023fbf5d243c88191cd5dc5ebf303fcc97502a089c452e23936ca73e7
-MISC metadata.xml 1893 SHA256 4590b65d91a30a7bf959d0cdf26beec4b226e55d575f56891f78e6e4432f63e4 SHA512 d959cc25e476efc68eb2e2ea4698926ab57e9dd601195ff2742825e58468df091986590e0fb36b6a862164a923c09baed18862c14726ef94e9b56b8f836ded6f WHIRLPOOL 0e66fa63b808f97af0b1f764296935efcc91f34a89f326457601d6a44ab3f11469dd1eb9df0c4916cea7721eaaabc7644fb42f07f2561c0055479c54c5d63a7e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlJwWewACgkQVWmRsqeSphPoJgCeK3i8rf0xT1nGIJw25AcqKO2G
-rEgAnAnZapli41xT0nV1dIWDg0K7kEF/
-=uhtH
------END PGP SIGNATURE-----
+EBUILD exim-4.82.ebuild 12327 SHA256 7a35b1833cea53c3843d26f4e5528aab1091fa246344f5174441959e17f14b34 SHA512 d9d411cdf7ad934cddbd9a51199ab521161ece8c18c66dcd41f9f39573324af7ae555bb42867e2234c4a0e5366c5fce70c7efe0f5547fd1a0b7eec67c5215591 WHIRLPOOL 54aac6426ca5b3b00052f85fb3be39669bd66a25b1bb985e759b5b7aae76e3ca24c44b75cbb4e4102e6f0c07777a1d37de17d64e5cf7286b88683ab8bcc6afdc
+MISC ChangeLog 51784 SHA256 80f98d1671772775d541e91838e87c9160fe7a4491489276559b6aa61ca0ac21 SHA512 4a09c28ad10905e1bc955eff171d5a9c844dda5b5e2e3326d4814c076e424fdc3f561146a27b589482c5a10f7d5c608d852c8696d270451bece79701abeeb0f1 WHIRLPOOL 0f51de0e795999e770d78b6b26d644790471051f2905aebd62b69f3ba9e28dda5908cff64e2385d3ecf20d13d7098a81eafa8e6fc2b4f9d80ff4dadb28cd6ad7
+MISC metadata.xml 1991 SHA256 b50dad0c801f7918f1a97fb9026cf1717b3584de0cd5f1426c787f26231a8ec9 SHA512 8fe08de4895dffac66f69870e885b00912b77effe053ed29c49a0f6d56ae72e92a19f1eb7de40a89d4830f13c8fa5c195af985d0d1869579e4c7eed1ad36b9c7 WHIRLPOOL 018ec56b871c5b76d208efdcb868ddf8893c1f8032a46873c7ac33db28860dccd8fe81bd137d7a7827851f39355582f57d95399fa03783d2d1130973a1a2b730
diff --git a/mail-mta/exim/exim-4.82.ebuild b/mail-mta/exim/exim-4.82.ebuild
index bb12d27962f4..a91c872b46b7 100644
--- a/mail-mta/exim/exim-4.82.ebuild
+++ b/mail-mta/exim/exim-4.82.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.82.ebuild,v 1.2 2013/10/30 00:59:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.82.ebuild,v 1.3 2013/11/01 19:55:09 grobian Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils toolchain-funcs multilib pam systemd
 
-IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X nis selinux syslog spf srs gnutls sqlite doc dovecot-sasl radius maildir +dkim dcc dsn dlfunc dmarc"
-REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim )"
+IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl lmtp ipv6 sasl dnsdb perl mbx X nis selinux syslog spf srs gnutls pkcs11 sqlite doc dovecot-sasl radius maildir +dkim dcc dsn dlfunc dmarc"
+REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) pkcs11? ( gnutls )"
 
 DSN_EXIM_V=482  # local version patched by us
 DSN_V=1_3
@@ -31,7 +31,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	pam? ( virtual/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 	ssl? ( dev-libs/openssl )
-	gnutls? ( net-libs/gnutls[pkcs11]
+	gnutls? ( net-libs/gnutls[pkcs11?]
 			  dev-libs/libtasn1 )
 	ldap? ( >=net-nds/openldap-2.0.7 )
 	mysql? ( virtual/mysql )
@@ -95,13 +95,6 @@ src_prepare() {
 		epatch "${FILESDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
 	fi
 
-	if use ipv6 ; then
-		# set a sensible default, bug #448314
-		sed -i \
-			-e '/^hostlist\s\+relay_from_hosts/s/\(127.0.0.1\)/\1 : ::::1/' \
-			src/configure.default || die
-	fi
-
 	# user Exim believes it should be
 	MAILUSER=mail
 	MAILGROUP=mail
@@ -215,6 +208,7 @@ src_configure() {
 		if use gnutls; then
 			echo "USE_GNUTLS=yes" >> Makefile
 			echo "USE_GNUTLS_PC=gnutls" >> Makefile
+			use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
 		else
 			echo "USE_OPENSSL_PC=openssl" >> Makefile
 		fi
diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index ea108d678bca..e7809e9adbc8 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/metadata.xml
@@ -35,6 +35,7 @@
 		<flag name='mbx'>Adds support for UW's mbx format</flag>
 		<flag name='spf'>Adds support for Sender Policy Framework</flag>
 		<flag name='srs'>Adds support for Sender Rewriting Scheme</flag>
+		<flag name='pkcs11'>Require pkcs11 support in <pkg>net-libs/gnutls</pkg> with USE=gnutls</flag>
 	</use>
 	<upstream>
 		<bugs-to>http://bugs.exim.org/</bugs-to>