Fix building with -ssl USE flag - bug #395855

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

diff --git a/net-mail/uw-imap/ChangeLog b/net-mail/uw-imap/ChangeLog
index f7ab6c20a16de5dca3ecc95c85707e60cfce3349..f1ae8e7e39773149535cd61fdf3546c09de59410 100644 (file)
--- a/net-mail/uw-imap/ChangeLog
+++ b/net-mail/uw-imap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/uw-imap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.130 2011/12/22 22:00:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.131 2011/12/24 10:27:02 eras Exp $
+
+  24 Dec 2011; Eray Aslan <eras@gentoo.org> uw-imap-2007f.ebuild:
+  Fix building with -ssl USE flag - bug #395855
 
   22 Dec 2011; Markus Meier <maekke@gentoo.org> uw-imap-2007f.ebuild:
   x86 stable, bug #391349

diff --git a/net-mail/uw-imap/uw-imap-2007f.ebuild b/net-mail/uw-imap/uw-imap-2007f.ebuild
index 2eda9c8436c19ff8b7801ca5c87699bb22ce17d9..479fbd1c6e2972ff8b61530b8054d622073db96e 100644 (file)
--- a/net-mail/uw-imap/uw-imap-2007f.ebuild
+++ b/net-mail/uw-imap/uw-imap-2007f.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2007f.ebuild,v 1.4 2011/12/22 22:00:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2007f.ebuild,v 1.5 2011/12/24 10:27:02 eras Exp $
 
 EAPI=4
 
@@ -48,6 +48,9 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-2004c-amd64-so-fix.patch
        epatch "${FILESDIR}/${PN}-ldflags.patch"
 
+       # no interactive build
+       sed -i -e "/read x; case/s/^/#/" Makefile || die
+
        # Now we must make all the individual Makefiles use different CFLAGS,
        # otherwise they would all use -fPIC
        sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \

diff --git a/net-mail/uw-mailutils/ChangeLog b/net-mail/uw-mailutils/ChangeLog
index 4f057e4f6ccd00fa00d7e4629e683206fcf65b70..0e10a300339d974d69231fe6adefa0fafd3af18b 100644 (file)
--- a/net-mail/uw-mailutils/ChangeLog
+++ b/net-mail/uw-mailutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/uw-mailutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-mailutils/ChangeLog,v 1.37 2011/12/17 18:26:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-mailutils/ChangeLog,v 1.38 2011/12/24 10:24:38 eras Exp $
+
+  24 Dec 2011; Eray Aslan <eras@gentoo.org> uw-mailutils-2007f.ebuild:
+  Fix building with -ssl USE flag - bug #395855
 
   17 Dec 2011; Raúl Porcel <armin76@gentoo.org> uw-mailutils-2007f.ebuild:
   alpha/ia64/sparc stable wrt #391353

diff --git a/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild b/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild
index d53ef2fb1e3714d1171f315039ce5104bd5bc26b..4caeea33acf2accf4e64c0aa8d6574338bd6f826 100644 (file)
--- a/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild
+++ b/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild
@@ -1,6 +1,6 @@
 # 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-2007f.ebuild,v 1.5 2011/12/17 18:26:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild,v 1.6 2011/12/24 10:24:38 eras Exp $
 
 EAPI=4
 
@@ -29,6 +29,9 @@ src_prepare() {
        epatch "${FILESDIR}/${PN}-2004g.patch"
        epatch "${FILESDIR}/${PN}-ssl.patch"
 
+       # no interactive build
+       sed -i -e "/read x; case/s/^/#/" Makefile || die
+
        sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" \
                src/mailutil/Makefile \
                src/mtest/Makefile || die "sed failed patching Makefile CFLAGS."