add pam and ssl USE flags - bugs 129729 276401

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

4 files changed, 99 insertions, 3 deletions

diff --git a/net-mail/uw-mailutils/ChangeLog b/net-mail/uw-mailutils/ChangeLog
index a6f0c82c24d6..c0c9ef45755f 100644
--- a/net-mail/uw-mailutils/ChangeLog
+++ b/net-mail/uw-mailutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/uw-mailutils
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-mailutils/ChangeLog,v 1.30 2009/09/23 19:15:01 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-mailutils/ChangeLog,v 1.31 2011/05/06 21:00:09 eras Exp $
+
+*uw-mailutils-2007e-r1 (06 May 2011)
+
+  06 May 2011; Eray Aslan <eras@gentoo.org> +uw-mailutils-2007e-r1.ebuild,
+  +files/uw-mailutils-ssl.patch:
+  add pam and ssl USE flags - bugs 129729 276401
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> uw-mailutils-2007b.ebuild,
   uw-mailutils-2007e.ebuild:
diff --git a/net-mail/uw-mailutils/Manifest b/net-mail/uw-mailutils/Manifest
index 6f3f3be6c6de..97f34765c9dd 100644
--- a/net-mail/uw-mailutils/Manifest
+++ b/net-mail/uw-mailutils/Manifest
@@ -1,7 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX uw-mailutils-2004g.patch 1210 RMD160 43fdbc89e422c34a9e72c0c163d8d2bb8653afaf SHA1 8ccdbfeaeccfd05d50b15e46f9e42538fc97c7ac SHA256 4d2369c984ae1fc473feed94e3012e92b4c9dc4ea1d6cddf8a3d983115ff3113
+AUX uw-mailutils-ssl.patch 391 RMD160 d7a4b290d05fe2c6f468614577196f71c8984a2c SHA1 a3ad76a94f118c2c3f75032d83f30e614be84e96 SHA256 10a04c7b5f6bbd4e9033db679053289846fe6d4ef6bc1fb3e6130d19649799ee
 DIST imap-2007b.tar.Z 2789484 RMD160 8d0e88baa59c0cb78dc546b22a850ded57117c94 SHA1 08b4858334f45ffb198a5d2733be4ef160ddd467 SHA256 b3170bef59f416be1f710be58333f9b0c2c8b0fe137062accd4f5f13a3785cd0
 DIST imap-2007e.tar.Z 2789469 RMD160 7d6af203419975f763d7ec17b6a4544c94490b50 SHA1 24c63cad8d0e74aa76e4341fcfa54d24f23a8c70 SHA256 be648d0e1aa62d564d9dbe04b77ea948116ee96ed687cb5d169c99ae28286e59
 EBUILD uw-mailutils-2007b.ebuild 1151 RMD160 5ab87f1fad62ce6abd956211ec8f42b183b7bcc3 SHA1 c3e44cdb80acec3d907e766825f2ea7f8d1686a6 SHA256 04506412d1fab5aafddf42300818060bf4be3e0d61076cc5e41b58e6bdd1395a
+EBUILD uw-mailutils-2007e-r1.ebuild 1351 RMD160 26bdac1ec5318bba459395a4fabb6c21cbe6e7ec SHA1 1bb788a53afef5e0fcd72f65c1c04f91ed85543e SHA256 a95ab65a4e8c99b10f94770cf9a0478fcbbbb93eba1f722c42692d6507334d73
 EBUILD uw-mailutils-2007e.ebuild 1151 RMD160 25166fbcd7f9a715566fc1eb9a143a34b5fe02c0 SHA1 359b460165ee6c757ab95f6487357fc889d9e4c1 SHA256 59da3a1a81ee9f0fcc9335226184ca4c96eb68144e9d3bee04cae9abc91eff88
-MISC ChangeLog 4207 RMD160 b5ce88bbd850e7502e81200cd12670a4470ef6bc SHA1 699af096cec40ea96f2443c91d67b9f494737097 SHA256 b6c70c2ea8d80e764c494a28fa9c9d4a441a3aa6eb124795c46201ca2fdb9603
+MISC ChangeLog 4400 RMD160 a200ee9aac60cc7aa9a48cd24fede3d6cd72e0d7 SHA1 3043ab24a5a9fa851ef1dff10bc55988ba045845 SHA256 f526b169d9ea94f6e7c1ed2f8aa23ab531db2f491f5d91e2827bc10d9d1179e2
 MISC metadata.xml 272 RMD160 7c8df1c612701081856595fd1df8a1cf08245b98 SHA1 a0acd634bdbf0bf997fb9eb25bdafa8d684c997d SHA256 9abc9ed0695bca81616f283383dac21ac7fd207d35f558ddfc247a2cb6ef01b5
+MISC uw-mailutils-2007e.ebuild.orig 1151 RMD160 25166fbcd7f9a715566fc1eb9a143a34b5fe02c0 SHA1 359b460165ee6c757ab95f6487357fc889d9e4c1 SHA256 59da3a1a81ee9f0fcc9335226184ca4c96eb68144e9d3bee04cae9abc91eff88
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNxGFnAAoJEHfx8XVYajsfGQcP/3ApbLsrJElvtnI01fDVvyFx
+DTeieT6RG3zGLpUOzOJRft7K8AROpmjVI7RuveWofV1UHWpolJtoG5agOnjbQ6PY
+G4GZiaKwEmcqaEgy+LuuoFL/JG/d8Sgt9Kpwqxvw/bNj5fISCkmXgQB9EnYkHPky
+Wx1Cf2PiLFMuRsL2mnGKoXb97HCxLjS5+rcOUQDoqcb4ASReednPjzBeWOg0xLQY
+oO1sQjaHoAzLpvedrXCirEhfdc5yg9C1DOrBNKAXGnsgLBQXE3M+EtIxXRoGXXPu
+ro9AFW/Sy41uIQfwMqfvKLJjOirI2oX4SO9Ki8x/O5ZOqQpaR8YcyaLfBSS55wu/
+06uJvfDWEg2h48H+xReyYYfusO6/AFqAvGXtTW71UAMntK7y11V0yEbVRSV4qeLh
+dMMMEPDeL37YUCkr9DtJ9evHX5dGPzgnkXw1Fw/BZILqzJO2/tu9DPGtSDtPn0NX
+Uo/qqHjKuMySIFFKOH0VZkayKWjnMw5i5c7Erpo9kea7EDNOAmYempSWqzWnWKhP
+J/cSCFlTANCYkSLh3K8ClryC5k+eIdVkSPv85KZ+X5r3R1GlSJXcGMl1ww7KnzUm
+D17AEJOpkm8FvPWCj3czPZol+1oRq2Yx3UOVrwesrLllHXlj00Hge3HyjI1d7EuJ
+LD4wIvxEcdVpGL1scIoy
+=/75K
+-----END PGP SIGNATURE-----
diff --git a/net-mail/uw-mailutils/files/uw-mailutils-ssl.patch b/net-mail/uw-mailutils/files/uw-mailutils-ssl.patch
new file mode 100644
index 000000000000..0214030e3ffa
--- /dev/null
+++ b/net-mail/uw-mailutils/files/uw-mailutils-ssl.patch
@@ -0,0 +1,13 @@
+--- imap-2007e/src/osdep/unix/Makefile	2009-07-05 10:00:54.000000000 +0300
++++ imap-2007e/src/osdep/unix/Makefile	2009-07-05 10:04:42.000000000 +0300
+@@ -54,8 +54,8 @@
+ 
+ # Extended flags needed for SSL.  You may need to modify.
+ 
+-SSLDIR=/usr/local/ssl
+-SSLCERTS=$(SSLDIR)/certs
++SSLDIR=/usr
++SSLCERTS=/etc/ssl/certs
+ SSLKEYS=$(SSLCERTS)
+ SSLINCLUDE=$(SSLDIR)/include
+ SSLLIB=$(SSLDIR)/lib
diff --git a/net-mail/uw-mailutils/uw-mailutils-2007e-r1.ebuild b/net-mail/uw-mailutils/uw-mailutils-2007e-r1.ebuild
new file mode 100644
index 000000000000..9976006ced2a
--- /dev/null
+++ b/net-mail/uw-mailutils/uw-mailutils-2007e-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-mailutils/uw-mailutils-2007e-r1.ebuild,v 1.1 2011/05/06 21:00:09 eras Exp $
+
+inherit eutils flag-o-matic
+
+MY_P="imap-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Mail utilities from the UW"
+HOMEPAGE="http://www.washington.edu/imap/"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="pam ssl"
+
+DEPEND="!<mail-client/pine-4.64-r1
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+	!<net-mail/uw-imap-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	chmod -R ug+w "${S}"
+
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-2004g.patch" || die "epatch failed"
+	epatch "${FILESDIR}/${PN}-ssl.patch" || die "epatch failed"
+
+	sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" \
+		src/mailutil/Makefile \
+		src/mtest/Makefile || die "sed failed patching Makefile CFLAGS."
+
+	append-flags -fPIC
+}
+
+src_compile() {
+	local port=slx
+	use elibc_FreeBSD && port=bsf
+	use pam && port=lnp
+	local ssltype=none
+	use ssl && ssltype=nopwd
+	yes | make "${port}" EXTRACFLAGS="${CFLAGS}" SSLTYPE="${ssltype}" || die
+}
+
+src_install() {
+	into /usr
+	dobin mailutil/mailutil mtest/mtest
+	doman src/mailutil/mailutil.1
+}