Fixed bug reported in #41710.

4 files changed, 19 insertions, 12 deletions

diff --git a/net-mail/popa3d/ChangeLog b/net-mail/popa3d/ChangeLog
index 425519b4c187..bf408446cfaf 100644
--- a/net-mail/popa3d/ChangeLog
+++ b/net-mail/popa3d/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/popa3d
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/ChangeLog,v 1.5 2003/12/16 05:24:18 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/ChangeLog,v 1.6 2004/02/18 11:31:35 hhg Exp $
+
+  18 Feb 2004; Hallgrimur H. Gunnarsson <hhg@gentoo.org> popa3d-0.6.4.ebuild:
+  Maildir support was chosen as the default when neither the mbox nor the
+  maildir USE flags were set. This caused the build to fail, since maildir
+  support requires a patch which is only downloaded when the maildir USE flag is
+  set. Now, mailbox support is chosen as the default. This was reported in bug
+  #41710 by Skyler McCurdy <stupidlimits@yahoo.com>.
 
   16 Dec 2003; Ian Leitch <port001@gentoo.org> popa3d-0.6.3.ebuild,
   popa3d-0.6.4.ebuild:
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index b44351ef76ac..7666e24d6c0c 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -1,7 +1,7 @@
-MD5 6cbddf4f83e8c8c3d0eb6192d094bc4a ChangeLog 1140
+MD5 404f30001a4696996d9d98f06beb528e ChangeLog 1577
 MD5 dbb40cd6b37794fccc9251f434aa99ce metadata.xml 425
-MD5 0c1b672d216aea0b2232630a02c095b9 popa3d-0.6.3.ebuild 4276
-MD5 e54b117baf5c91383ab1ae6f8278349e popa3d-0.6.4.ebuild 4289
+MD5 36446d14c81b95527d92e062652c04b3 popa3d-0.6.3.ebuild 4272
+MD5 4830bd0c76693bd277d722d74d2aa627 popa3d-0.6.4.ebuild 4285
 MD5 a39dff3e063ffd11e322158dc3b18523 files/digest-popa3d-0.6.3 201
 MD5 6e6b9368bd2cafab8d90bde76f5011b7 files/pam 136
 MD5 dbeb5d9274a4b4e9093e94a1e8642d07 files/popa3d-initrc 385
diff --git a/net-mail/popa3d/popa3d-0.6.3.ebuild b/net-mail/popa3d/popa3d-0.6.3.ebuild
index f7db8e917cea..cd604c81797e 100644
--- a/net-mail/popa3d/popa3d-0.6.3.ebuild
+++ b/net-mail/popa3d/popa3d-0.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/popa3d-0.6.3.ebuild,v 1.4 2003/12/16 05:24:18 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/popa3d-0.6.3.ebuild,v 1.5 2004/02/18 11:31:35 hhg Exp $
 
 #
 # Mailbox format is determined by the 'mbox' and 'maildir'
diff --git a/net-mail/popa3d/popa3d-0.6.4.ebuild b/net-mail/popa3d/popa3d-0.6.4.ebuild
index 3e313e27350f..6249434a473d 100644
--- a/net-mail/popa3d/popa3d-0.6.4.ebuild
+++ b/net-mail/popa3d/popa3d-0.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/popa3d-0.6.4.ebuild,v 1.2 2003/12/16 05:24:18 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popa3d/popa3d-0.6.4.ebuild,v 1.3 2004/02/18 11:31:35 hhg Exp $
 
 #
 # Mailbox format is determined by the 'mbox' and 'maildir'
@@ -90,14 +90,14 @@ src_compile() {
 
 	epatch ${DISTDIR}/popa3d-0.6.3-vname-2.diff
 
-	if use mbox ; then
-		einfo "Mailbox format is: MAILBOX."
-	else
-		epatch ${DISTDIR}/popa3d-0.5.9-maildir-2.diff
+	if use maildir ; then
 		einfo "Mailbox format is: MAILDIR."
+		epatch ${DISTDIR}/popa3d-0.5.9-maildir-2.diff
 		if [ "${POPA3D_HOME_MAILBOX}" = "" ] ; then
 			POPA3D_HOME_MAILBOX=".maildir"
 		fi
+	else
+		einfo "Mailbox format is: MAILBOX."
 	fi
 
 	if [ "${POPA3D_HOME_MAILBOX}" != "" ] ; then