Restore auth_conf.sub support, instead of blindly nuking it, just find that's in FILESDIR

Package-Manager: portage-2.2.00.13755-prefix/cvs/Darwin powerpc

4 files changed, 16 insertions, 7 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 8fc3227aa9d5..2f59376e462a 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.137 2009/07/02 20:32:24 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.138 2009/07/02 20:45:12 grobian Exp $
+
+  02 Jul 2009; Fabian Groffen <grobian@gentoo.org> exim-4.69.ebuild,
+  exim-4.69-r2.ebuild:
+  Restore auth_conf.sub support, instead of blindly nuking it, just find
+  that's in FILESDIR
 
   02 Jul 2009; Fabian Groffen <grobian@gentoo.org>
   files/exim-4.69-r1.27021.patch:
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index f174c75afcaf..815b21e76ec2 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -14,7 +14,7 @@ AUX system_filter.exim 8120 RMD160 267545af6dd333e0e5f05e1d4d02a0e8ee638d45 SHA1
 DIST exim-4.69.tar.bz2 1658939 RMD160 ae97c807c63f858ba4a0ab402677225da9337d05 SHA1 321e238b6e6b32498110511ce72a911538305a39 SHA256 18e856cfdb682ba8e8ccb943ab538734d34d0ecefd63465ecc5430bc15915069
 DIST exiscan.conf 22113 RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 SHA1 74dc6e30f49402f5e6fefc280ea325d17f6af8c4 SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964
 DIST system_filter.exim.gz 3075 RMD160 47bcc6de402d896b73fd01d7f0d3c3ecbad9cf0b SHA1 384d138d8612f3a80b2b68f272b43cd69bc4411a SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437
-EBUILD exim-4.69-r2.ebuild 10071 RMD160 522039e5373409746698eb43719901c464c8c741 SHA1 a98b71ce8c9e817917108fbb6bac7f85b5ba9d94 SHA256 7fb33e10fc36887a9ea590e4f37d96c1d076767ab1aaaaa1c216013dd85af687
-EBUILD exim-4.69.ebuild 9707 RMD160 7d0775c192fd1bd51f2ba7642e944dde80e08ea8 SHA1 aa946a1ffe48dd02b77c9c707341116cab091a82 SHA256 d314869c014941a9b838bc4cae00814fbb0af61c04d7f71bc461f76de51c96d2
-MISC ChangeLog 30919 RMD160 f78515794929df84770cdc9643f595cc9366e934 SHA1 f8b71095da736dae1600d43897d4a9484b315411 SHA256 a85b4c7edab7ac5b15be67ac70b898e884eb00695cf07b94d4a52453a5e14fb4
+EBUILD exim-4.69-r2.ebuild 10193 RMD160 7a6d510c3c0d6ed3394e75114d6cb8b893a1e61a SHA1 412f6aef42ba750659cfa5389d1a21472b086c9f SHA256 e7a2e9efa3ffe7e2a101abb0787bc4be071ab31cca7fc3dc4c8b3af9d2d12a8b
+EBUILD exim-4.69.ebuild 9827 RMD160 9b07bb21c704f209f2baf7ea9d4c837cb9bf94cb SHA1 aba951c803e39c022bfc516b83ff480edd9b832c SHA256 e1352ad51d6228e3df78d438d7fd5d7cab7b433a420604af1b8d4fdc428f09d7
+MISC ChangeLog 31106 RMD160 68048f1e85d45d2b9794a832fab29ecddb708cad SHA1 d842c08a494fed4b5b829ddbc56fdea3eedf471f SHA256 dfbf91be2749ba53c54c95325522980e28e83f7f93bb3d07b67e32a66102e932
 MISC metadata.xml 1586 RMD160 c9b4546115c6db062a7fb9370039bb7e3b44ebd5 SHA1 933e217c55a4ee72b166119ab4f0dde986cc9825 SHA256 40a3ea558abbab45d65e7b79df9c56280be359e5bafca10195bd9d4b30e3c60d
diff --git a/mail-mta/exim/exim-4.69-r2.ebuild b/mail-mta/exim/exim-4.69-r2.ebuild
index 77e6a6ef8142..caef03edca16 100644
--- a/mail-mta/exim/exim-4.69-r2.ebuild
+++ b/mail-mta/exim/exim-4.69-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r2.ebuild,v 1.4 2009/07/02 20:29:38 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69-r2.ebuild,v 1.5 2009/07/02 20:45:12 grobian Exp $
 
 inherit eutils toolchain-funcs
 
@@ -286,7 +286,8 @@ src_install () {
 	if use exiscan-acl; then
 		newins "${S}"/src/configure.default exim.conf.exiscan-acl
 	fi
-	doins "$WORKDIR"/system_filter.exim
+	doins "${WORKDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
 	if use exiscan; then
 		newins "${S}"/src/configure.default exim.conf.exiscan
 		doins "${DISTDIR}"/exiscan.conf
@@ -315,6 +316,7 @@ src_install () {
 
 pkg_postinst() {
 	einfo "/etc/exim/system_filter.exim is a sample system_filter."
+	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 
 	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
diff --git a/mail-mta/exim/exim-4.69.ebuild b/mail-mta/exim/exim-4.69.ebuild
index 9c7bb3a228c7..41ccc1ef0d28 100644
--- a/mail-mta/exim/exim-4.69.ebuild
+++ b/mail-mta/exim/exim-4.69.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69.ebuild,v 1.12 2009/07/02 20:16:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.69.ebuild,v 1.13 2009/07/02 20:45:12 grobian Exp $
 
 inherit eutils toolchain-funcs
 
@@ -281,6 +281,7 @@ src_install () {
 		newins "${S}"/src/configure.default exim.conf.exiscan-acl
 	fi
 	doins "${FILESDIR}"/system_filter.exim
+	doins "${FILESDIR}"/auth_conf.sub
 	if use exiscan; then
 		newins "${S}"/src/configure.default exim.conf.exiscan
 		doins "${FILESDIR}"/exiscan.conf
@@ -303,6 +304,7 @@ src_install () {
 
 pkg_postinst() {
 	einfo "/etc/exim/system_filter.exim is a sample system_filter."
+	einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
 	einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist."
 
 	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]