Fix --as-needed issue (#284924) and quote destination directories.

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

5 files changed, 439 insertions, 11 deletions

diff --git a/mail-mta/sendmail/ChangeLog b/mail-mta/sendmail/ChangeLog
index 6966dbddd673..2f0647b058ab 100644
--- a/mail-mta/sendmail/ChangeLog
+++ b/mail-mta/sendmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/sendmail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.84 2009/09/19 08:34:16 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.85 2009/09/20 09:26:19 mrness Exp $
+
+*sendmail-8.14.3-r2 (20 Sep 2009)
+
+  20 Sep 2009; Alin Năstac <mrness@gentoo.org> +sendmail-8.14.3-r2.ebuild,
+  files/libmilter-sharedlib.patch, +files/sendmail-build-system.patch:
+  Fix --as-needed issue (#284924) and quote destination directories.
 
   19 Sep 2009; Torsten Veller <tove@gentoo.org> sendmail-8.14.0.ebuild,
   sendmail-8.14.1.ebuild, sendmail-8.14.2.ebuild, sendmail-8.14.3-r1.ebuild:
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 2dc81700d360..e7d4873941b5 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libmilter-sharedlib.patch 2825 RMD160 ee9e9a58b704aa619ae8c2f96438cfe6f868f413 SHA1 930223b6289558caefb293911849378d9105be39 SHA256 3670dd0ae715b6ceb48525700943cf39d362144e80d6c8e6f5154de5d57fe721
+AUX libmilter-sharedlib.patch 2843 RMD160 fc25843bb7d9dd0f7ebddb87fd9e80839438b277 SHA1 ab100120cb86fe362cbd9fefefde8e54c3716bad SHA256 3a753b0881fe622814b471ee5f9037905c7cc3ed08ef74908464ab5307e59d5a
 AUX mailer.conf 1306 RMD160 7f752b3b88208eda71f96de6621e050a684b8fdb SHA1 a2704751d866367f969554841af8f637766db528 SHA256 f07e22401ff9fae449bfb093dfc608b6f8e71af1c7c3790d89a71af9a1411a44
 AUX sendmail 701 RMD160 991eb44041ac33d04693a838b7e976a7cca14e61 SHA1 ac6991b5d77b428ba58b6a3a4aa8ba0834ffbfaa SHA256 c95de55fbd5334ec54f17efe69a33c242a9ba28cd76f11cc3c7ff8418cf49acb
+AUX sendmail-build-system.patch 13019 RMD160 06819e163471c90f336162e9a6fbf11ecf3f1ea1 SHA1 d2b8ac723a63854fb4149111e5c8ead01bf65328 SHA256 90c8c20517dc253839094c439c23f42ee0472a1094635b6ab1ef12a223ddb50b
 AUX sendmail-delivered_hdr.patch 341 RMD160 a190574a57c643233c0d23e8b69dbf3cd3943f41 SHA1 17d034625524438dc98a2a7a14a7bfe2fb047420 SHA256 bfe354d1047c66ea857e56cb374f583eb779c8f4ccc92ea766e916ec358cd77c
 AUX sendmail-procmail.mc 357 RMD160 e912a3d2f91fc60e0856e1a537b9a9851788172f SHA1 536e5b842ef280f2abd86ee0f8f5987a885350b7 SHA256 8da4cc39758ff1668d7bf7c3713914cb44ef8d084ab822629316ee3caae90856
 AUX sendmail.mc 299 RMD160 cb659c515cc2b5de750b645fbcfb7a8a60ad60ae SHA1 c93483684c46356cd1d09899517539c5406b5bd0 SHA256 fbf4f2bf7826cabf2072f6c113b3616c1dffd580864d708e344b5f334f1a8a38
@@ -16,12 +17,13 @@ EBUILD sendmail-8.14.0.ebuild 6770 RMD160 a009273ffca47ac4b24f6d020f1a7cf88f3918
 EBUILD sendmail-8.14.1.ebuild 6780 RMD160 059a1ae2638fbafedf602bcabe6bc03958609e6e SHA1 feaacfc09585ba3f33c3a483cc662a60de4ef85e SHA256 6cbbbc7b66e1dbb733979d36e6a92c35efa059896981afd6d19ac439cc2b7f54
 EBUILD sendmail-8.14.2.ebuild 6780 RMD160 f13212d00222dd806029dcd0528baf84bc758df2 SHA1 53d43462e2c6559d4e758fff8bc8e641a2f87d31 SHA256 8d31f2c0431b10d571c0cba90beeff7d3083f5c462147752c9fade3e2c5087a5
 EBUILD sendmail-8.14.3-r1.ebuild 7506 RMD160 4e831f1cf6bbdd22642b8edd28f61dd5f2b7d224 SHA1 3eb176a66a60bc8864f38b9cf985d1c145a1fb1b SHA256 d9f2c449056055a54636c9abbee58a55746c92d36c1e80c742112e7b72983e5d
-MISC ChangeLog 19277 RMD160 f3649568fc34df2471fb60104d93c4eee48f4649 SHA1 04ce8ca7c83ed871bca70484b139ccc08c39f585 SHA256 4c47e71b071763ddf57d624761e199316b9b20981f907a8f194fe88c8ec9deb2
+EBUILD sendmail-8.14.3-r2.ebuild 7558 RMD160 71553a98f389260d52851182acc6d8ad03e14efd SHA1 f5927077560aedb1dae45cee0f9f05f79c3fc83d SHA256 4c9dca40d549b9c0457d1e2a4bcc66c7314983be6645d9782b504d8d968e1d6d
+MISC ChangeLog 19531 RMD160 cbbb0f38fbb5961522187f9ebd10d76ede547b4e SHA1 6f8a293edd0dfbef6739c01216e741fd79e3749d SHA256 f9d333734e920bf30d9d48c540337ac139166cb040662fa02e794bb062018332
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq0l44ACgkQV3J2n04EauwaZgCglSfBYWgpqRx1404hQk9lhGMj
-wY8AnR0jlbUS65LdPmJeq78W+D54mye1
-=S90z
+iEYEARECAAYFAkq19UUACgkQ9A5kJBGSrsvPQgCdHatQ9amsUZI04lJe5hJgelWs
+0lkAn0uNZEhN/QVewg5/7k3yNICGueez
+=w77U
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/sendmail/files/libmilter-sharedlib.patch b/mail-mta/sendmail/files/libmilter-sharedlib.patch
index 05f2e025e39a..43ec78612190 100644
--- a/mail-mta/sendmail/files/libmilter-sharedlib.patch
+++ b/mail-mta/sendmail/files/libmilter-sharedlib.patch
@@ -24,17 +24,17 @@ diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 sendmail-8.14.3
 +include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4')
 +divert(bldTARGETS_SECTION)
 +bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
-+	${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'} -lc
++	${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'} -lc ${LIBS}
 +bldCURRENT_PRODUCT.a: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
 +	${AR} ${AROPTS} bldCURRENT_PRODUCT.a ${bldCURRENT_PRODUCT`OBJS'}
 +	${RANLIB} ${RANLIBOPTS} bldCURRENT_PRODUCT.a
 +ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
 +
 +install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a
-+ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
-+	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${UBINMODE} bldCURRENT_PRODUCT.so ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER}
-+	${LN} ${LNOPTS} bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so
-+	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
++ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}"; else :; fi ')
++	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${UBINMODE} bldCURRENT_PRODUCT.so "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER}"
++	${LN} ${LNOPTS} bldCURRENT_PRODUCT.so.${MILTER_SOVER} "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so"
++	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
 +
 +bldCURRENT_PRODUCT-clean:
 +	rm -f ${OBJS} bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a ${MANPAGES}
diff --git a/mail-mta/sendmail/files/sendmail-build-system.patch b/mail-mta/sendmail/files/sendmail-build-system.patch
new file mode 100644
index 000000000000..9a41017d34ea
--- /dev/null
+++ b/mail-mta/sendmail/files/sendmail-build-system.patch
@@ -0,0 +1,212 @@
+diff -Nru sendmail-8.14.3.orig/cf/cf/Makefile sendmail-8.14.3/cf/cf/Makefile
+--- sendmail-8.14.3.orig/cf/cf/Makefile	2005-06-14 04:16:34.000000000 +0200
++++ sendmail-8.14.3/cf/cf/Makefile	2009-09-20 10:55:50.000000000 +0200
+@@ -80,10 +80,10 @@
+ install-cf:  install-sendmail-cf install-submit-cf
+ 
+ install-sendmail-cf: $(CF).cf
+-	$(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf ${DESTDIR}$(MAILDIR)/sendmail.cf
++	$(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(CF).cf "${DESTDIR}$(MAILDIR)/sendmail.cf"
+ 
+ install-submit-cf: $(SUBMIT).cf
+-	$(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf ${DESTDIR}$(MAILDIR)/submit.cf
++	$(INSTALL) -c -o $(CFOWN) -g $(CFGRP) -m $(CFMODE) $(SUBMIT).cf "${DESTDIR}$(MAILDIR)/submit.cf"
+ 
+ depend:
+ 
+diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/defines.m4 sendmail-8.14.3/devtools/M4/UNIX/defines.m4
+--- sendmail-8.14.3.orig/devtools/M4/UNIX/defines.m4	2006-10-06 07:44:44.000000000 +0200
++++ sendmail-8.14.3/devtools/M4/UNIX/defines.m4	2009-09-20 10:50:36.000000000 +0200
+@@ -26,7 +26,7 @@
+ CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
+ # Linker for libraries
+ LD=	ifdef(`confLD', `confLD', `confCC')
+-LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
++LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS')
+ LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
+ 
+ # Shell
+@@ -71,7 +71,7 @@
+ LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS') 
+ 
+ # libraries required on your system
+-LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') 
++LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST')  ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
+ 
+ # location of sendmail binary (usually /usr/sbin or /usr/lib)
+ BINDIR=	ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
+diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4 sendmail-8.14.3/devtools/M4/UNIX/executable.m4
+--- sendmail-8.14.3.orig/devtools/M4/UNIX/executable.m4	2006-10-06 07:44:44.000000000 +0200
++++ sendmail-8.14.3/devtools/M4/UNIX/executable.m4	2009-09-20 10:50:36.000000000 +0200
+@@ -30,12 +30,12 @@
+ 
+ ifdef(`bldNO_INSTALL', ,
+ `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP')
+-	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ')
+-	${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR}
++	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ')
++	${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"
+ ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')')
+ 
+ strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT
+-	${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT
++	${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT"
+ 
+ bldCURRENT_PRODUCT-clean:
+ 	rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES}
+diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4 sendmail-8.14.3/devtools/M4/UNIX/library.m4
+--- sendmail-8.14.3.orig/devtools/M4/UNIX/library.m4	2006-09-06 00:56:53.000000000 +0200
++++ sendmail-8.14.3/devtools/M4/UNIX/library.m4	2009-09-20 10:50:36.000000000 +0200
+@@ -27,8 +27,8 @@
+ ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
+ 
+ install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a
+-ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
+-	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
++ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ')
++	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"')
+ 
+ bldCURRENT_PRODUCT-clean:
+ 	rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES}
+diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/manpage.m4 sendmail-8.14.3/devtools/M4/UNIX/manpage.m4
+--- sendmail-8.14.3.orig/devtools/M4/UNIX/manpage.m4	2006-09-08 00:13:07.000000000 +0200
++++ sendmail-8.14.3/devtools/M4/UNIX/manpage.m4	2009-09-20 10:50:36.000000000 +0200
+@@ -68,11 +68,11 @@
+ ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl')
+ define(`bldMAN_INSTALL_CMD', 
+ `ifdef(`confDONT_INSTALL_CATMAN', `dnl', 
+-`	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}; else :; fi ')
+-	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'')
++`	ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ')
++	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''")
+ ifdef(`confINSTALL_RAWMAN', 
+-`	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ')
+-	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')'
++`	ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'"; else :; fi ')
++	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''", `dnl')'
+ )dnl
+ bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES')
+ ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl')
+diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4
+--- sendmail-8.14.3.orig/libmilter/Makefile.m4	2008-04-08 07:23:44.000000000 +0200
++++ sendmail-8.14.3/libmilter/Makefile.m4	2009-09-20 10:50:36.000000000 +0200
+@@ -32,9 +32,9 @@
+ MFAPI=	${SRCDIR}/inc`'lude/libmilter/mfapi.h
+ MFDEF=	${SRCDIR}/inc`'lude/libmilter/mfdef.h
+ install-mfapi: ${MFAPI}
+-	if [ ! -d ${DESTDIR}${INCLUDEDIR}/libmilter ]; then mkdir -p ${DESTDIR}${INCLUDEDIR}/libmilter; else :; fi
+-	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} ${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h
+-	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} ${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h
++	if [ ! -d "${DESTDIR}${INCLUDEDIR}/libmilter" ]; then mkdir -p "${DESTDIR}${INCLUDEDIR}/libmilter"; else :; fi
++	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFAPI} "${DESTDIR}${INCLUDEDIR}/libmilter/mfapi.h"
++	${INSTALL} -c -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} ${MFDEF} "${DESTDIR}${INCLUDEDIR}/libmilter/mfdef.h"
+ divert(0)
+ 
+ bldFINISH
+diff -Nru sendmail-8.14.3.orig/mail.local/Makefile.m4 sendmail-8.14.3/mail.local/Makefile.m4
+--- sendmail-8.14.3.orig/mail.local/Makefile.m4	2006-06-28 23:08:02.000000000 +0200
++++ sendmail-8.14.3/mail.local/Makefile.m4	2009-09-20 10:56:24.000000000 +0200
+@@ -30,7 +30,7 @@
+ force-install: install-mail.local ifdef(`confNO_MAN_BUILD',, `install-docs')
+ 
+ install-mail.local: mail.local
+-	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local ${DESTDIR}${EBINDIR}
++	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} mail.local "${DESTDIR}${EBINDIR}"
+ divert
+ 
+ bldFINISH
+diff -Nru sendmail-8.14.3.orig/rmail/Makefile.m4 sendmail-8.14.3/rmail/Makefile.m4
+--- sendmail-8.14.3.orig/rmail/Makefile.m4	2006-06-28 23:08:04.000000000 +0200
++++ sendmail-8.14.3/rmail/Makefile.m4	2009-09-20 10:55:29.000000000 +0200
+@@ -31,7 +31,7 @@
+ force-install: install-rmail ifdef(`confNO_MAN_BUILD',, `install-docs')
+ 
+ install-rmail: rmail
+-	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail ${DESTDIR}${UBINDIR}
++	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m ${UBINMODE} rmail "${DESTDIR}${UBINDIR}"
+ divert
+ 
+ bldFINISH
+diff -Nru sendmail-8.14.3.orig/sendmail/Makefile.m4 sendmail-8.14.3/sendmail/Makefile.m4
+--- sendmail-8.14.3.orig/sendmail/Makefile.m4.orig	2008-03-27 17:13:33.000000000 +0100
++++ sendmail-8.14.3/sendmail/Makefile.m4	2009-09-20 11:07:24.000000000 +0200
+@@ -14,9 +14,9 @@
+ 
+ dnl hack: /etc/mail is not defined as "location of .cf" in the build system
+ define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP',
+-`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl
++`"${DESTDIR}/etc/mail/submit.cf" "${DESTDIR}${MSPQ}"'))dnl
+ define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS',
+-`${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
++`"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
+ )dnl
+ 
+ # location of sendmail statistics file (usually /etc/mail/ or /var/log)
+@@ -43,21 +43,21 @@
+ statistics:
+ 	${CP} /dev/null statistics
+ 
+-${DESTDIR}/etc/mail/submit.cf:
++"${DESTDIR}/etc/mail/submit.cf":
+ 	@echo "Please read INSTALL if anything fails while installing the binary."
+ 	@echo "${DESTDIR}/etc/mail/submit.cf will be installed now."
+ 	cd ${SRCDIR}/cf/cf && make install-submit-cf
+ 
+ MSPQ=ifdef(`confMSP_QUEUE_DIR', `confMSP_QUEUE_DIR', `/var/spool/clientmqueue')
+ 
+-${DESTDIR}${MSPQ}:
++"${DESTDIR}${MSPQ}":
+ 	@echo "Please read INSTALL if anything fails while installing the binary."
+ 	@echo "You must have setup a new user ${MSPQOWN} and a new group ${GBINGRP}"
+ 	@echo "as explained in sendmail/SECURITY."
+-	mkdir -p ${DESTDIR}${MSPQ}
+-	chown ${MSPQOWN} ${DESTDIR}${MSPQ}
+-	chgrp ${GBINGRP} ${DESTDIR}${MSPQ}
+-	chmod 0770 ${DESTDIR}${MSPQ}
++	mkdir -p "${DESTDIR}${MSPQ}"
++	chown ${MSPQOWN} "${DESTDIR}${MSPQ}"
++	chgrp ${GBINGRP} "${DESTDIR}${MSPQ}"
++	chmod 0770 "${DESTDIR}${MSPQ}"
+ 
+ divert(0)
+ 
+@@ -68,30 +68,30 @@
+ divert(bldTARGETS_SECTION)
+ 
+ install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs')
+-	${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}
++	${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}"
+ 	for i in ${sendmailTARGET_LINKS}; do \
+ 		rm -f $$i; \
+ 		${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \
+ 	done
+ 
+-define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
++define(`confMTA_LINKS', `"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
+ install-sm-mta: bldCURRENT_PRODUCT
+-	${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta
++	${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}/sm-mta"
+ 	for i in confMTA_LINKS; do \
+ 		rm -f $$i; \
+ 		${LN} ${LNOPTS} ${M`'BINDIR}/sm-mta $$i; \
+ 	done
+ 
+ install-hf:
+-	if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi
+-	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile ${DESTDIR}${HFFILE}
++	if [ ! -d "${DESTDIR}${HFDIR}" ]; then mkdir -p "${DESTDIR}${HFDIR}"; else :; fi
++	${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile "${DESTDIR}${HFFILE}"
+ 
+ install-st: statistics
+-	if [ ! -d ${DESTDIR}${STDIR} ]; then mkdir -p ${DESTDIR}${STDIR}; else :; fi
+-	${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${STPATH}
++	if [ ! -d "${DESTDIR}${STDIR}" ]; then mkdir -p "${DESTDIR}${STDIR}"; else :; fi
++	${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${STPATH}"
+ 
+-install-submit-st: statistics ${DESTDIR}${MSPQ}
+-	${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${MSPQ}/${MSPSTFILE}
++install-submit-st: statistics "${DESTDIR}${MSPQ}"
++	${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${MSPQ}/${MSPSTFILE}"
+ 
+ divert(0)
+ bldPRODUCT_END
diff --git a/mail-mta/sendmail/sendmail-8.14.3-r2.ebuild b/mail-mta/sendmail/sendmail-8.14.3-r2.ebuild
new file mode 100644
index 000000000000..cc18a296da6d
--- /dev/null
+++ b/mail-mta/sendmail/sendmail-8.14.3-r2.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.3-r2.ebuild,v 1.1 2009/09/20 09:26:19 mrness Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
+HOMEPAGE="http://www.sendmail.org/"
+SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
+
+LICENSE="Sendmail"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ssl ldap sasl tcpd mbox mailwrapper ipv6 nis sockets"
+
+DEPEND="net-mail/mailbase
+	sys-devel/m4
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	>=sys-libs/db-3.2
+	!net-mail/vacation
+	"
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	!mailwrapper? ( !virtual/mta !net-mail/mailwrapper )
+	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
+PDEPEND="!mbox? ( mail-filter/procmail )"
+PROVIDE="virtual/mta"
+
+# libmilter library is part of sendmail, but it does not share the version number with it.
+# In order to find the right libmilter version number, check SMFI_VERSION definition
+# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines).
+# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001.
+LIBMILTER_VER=1.0.1
+
+pkg_setup() {
+	einfo "checking for smmsp group...    create if missing."
+	enewgroup smmsp 209 || die "problem adding group smmsp"
+	einfo "checking for smmsp user...     create if missing."
+	enewuser smmsp 209 -1 /var/spool/mqueue smmsp \
+		|| die "problem adding user smmsp"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/sendmail-build-system.patch
+	epatch "${FILESDIR}"/sendmail-delivered_hdr.patch
+	epatch "${FILESDIR}"/libmilter-sharedlib.patch
+
+	local confCC="$(tc-getCC)"
+	local confCCOPTS="${CFLAGS}"
+	local confLDOPTS="${LDFLAGS}"
+	local confMAPDEF="-DMAP_REGEX"
+	local conf_sendmail_LIBS=""
+	use sasl && confLIBS="${confLIBS} -lsasl2"  \
+		&& confENVDEF="${confENVDEF} -DSASL=2" \
+		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
+		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
+	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
+		&& confLIBS="${confLIBS} -lwrap"
+	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
+		&& confLIBS="${confLIBS} -lssl -lcrypto" \
+		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
+	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
+		&& confLIBS="${confLIBS} -lldap -llber"
+	use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
+	use nis && confENVDEF="${confENVDEF} -DNIS"
+	use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
+	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
+		-e "s/@@confLDOPTS@@/${confLDOPTS}/" \
+		-e "s/@@confCC@@/${confCC}/" \
+		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
+		-e "s/@@confENVDEF@@/${confENVDEF}/" \
+		-e "s/@@confLIBS@@/${confLIBS}/" \
+		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
+		"${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4
+}
+
+src_compile() {
+	sh Build || die "compilation failed in main Build script"
+	pushd libmilter
+	sh Build MILTER_SOVER=${LIBMILTER_VER} || die "libmilter compilation failed"
+	popd
+}
+
+src_install () {
+	local MY_LIBDIR=/usr/$(get_libdir)
+	local MY_OBJDIR="obj.`uname -s`.`uname -r`.`uname -m`"
+	dodir /usr/bin ${MY_LIBDIR} /usr/include/libmilter
+	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
+	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
+	keepdir /var/spool/{clientmqueue,mqueue}
+	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
+	do
+		make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
+			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
+			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
+			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
+			MSPQOWN=root CFOWN=root CFGRP=root \
+			install -C "${MY_OBJDIR}/${dir}" \
+			|| die "install failed"
+	done
+	for dir in rmail mail.local
+	do
+		make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
+			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
+			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
+			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
+			MSPQOWN=root CFOWN=root CFGRP=root \
+			force-install -C "${MY_OBJDIR}/${dir}" \
+			|| die "install failed"
+	done
+
+	make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
+		SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
+		MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
+		LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
+		MSPQOWN=root CFOWN=root CFGRP=root \
+		MILTER_SOVER=${LIBMILTER_VER} \
+		install -C "${MY_OBJDIR}/libmilter" \
+		|| die "install failed"
+
+	fowners root:smmsp /usr/sbin/sendmail
+	fperms 2555 /usr/sbin/sendmail
+	fowners smmsp:smmsp /var/spool/clientmqueue
+	fperms 770 /var/spool/clientmqueue
+	fperms 700 /var/spool/mqueue
+	dosym /usr/sbin/makemap /usr/bin/makemap
+	dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
+	newdoc sendmail/README README.sendmail
+	newdoc sendmail/SECURITY SECURITY
+	newdoc sendmail/TUNING TUNING
+	newdoc smrsh/README README.smrsh
+	newdoc libmilter/README README.libmilter
+
+	newdoc cf/README README.cf
+	newdoc cf/cf/README README.install-cf
+	cp -pPR cf/* "${D}"/usr/share/sendmail-cf
+	insinto /etc/mail
+	if use mbox
+	then
+		doins "${FILESDIR}"/sendmail.mc
+	else
+		newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc
+	fi
+	m4 "${D}"/usr/share/sendmail-cf/m4/cf.m4 "${D}"/etc/mail/sendmail.mc \
+		> "${D}"/etc/mail/sendmail.cf
+	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
+		> "${D}"/etc/mail/submit.mc
+	cat "${D}"/usr/share/sendmail-cf/cf/submit.mc >> "${D}"/etc/mail/submit.mc
+	echo "# local-host-names - include all aliases for your machine here" \
+		> "${D}"/etc/mail/local-host-names
+	cat <<- EOF > "${D}"/etc/mail/trusted-users
+		# trusted-users - users that can send mail as others without a warning
+		# apache, mailman, majordomo, uucp are good candidates
+	EOF
+	cat <<- EOF > "${D}"/etc/mail/access
+		# Check the /usr/share/doc/sendmail/README.cf file for a description
+		# of the format of this file. (search for access_db in that file)
+		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
+		# package.
+		#
+
+	EOF
+	cat <<- EOF > "${D}"/etc/conf.d/sendmail
+		# Config file for /etc/init.d/sendmail
+		# add start-up options here
+		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
+		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
+		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
+
+	EOF
+	doinitd "${FILESDIR}"/sendmail
+	keepdir /usr/adm/sm.bin
+
+	if use mailwrapper
+	then
+		mv "${D}"/usr/sbin/sendmail "${D}"/usr/sbin/sendmail.sendmail
+		insinto /etc/mail
+		doins "${FILESDIR}"/mailer.conf
+		rm "${D}"/usr/bin/mailq
+		rm "${D}"/usr/bin/newaliases
+		mv "${D}"/usr/share/man/man8/sendmail.8 \
+			"${D}"/usr/share/man/man8/sendmail-sendmail.8
+		mv "${D}"/usr/share/man/man1/mailq.1 \
+			"${D}"/usr/share/man/man1/mailq-sendmail.1
+		mv "${D}"/usr/share/man/man1/newaliases.1 \
+			"${D}"/usr/share/man/man1/newaliases-sendmail.1
+		mv "${D}"/usr/share/man/man5/aliases.5 \
+			"${D}"/usr/share/man/man5/aliases-sendmail.5
+		dosed 's/} sendmail/} sendmail.sendmail/' /etc/init.d/sendmail
+		dosed 's/sbin\/sendmail/sbin\/sendmail.sendmail/' /etc/init.d/sendmail
+	fi
+
+}
+
+pkg_postinst() {
+	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
+	then
+		elog
+		elog "Since you emerged sendmail without mailwrapper in USE,"
+		elog "you probably want to 'emerge -C mailwrapper' now."
+		elog
+	fi
+}