mime.types dependancy

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 2e192eabf70ff5e9329b7124bb83e54caec72e03..4c06053524a951583648e1487388feece1919d03 100644 (file)
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/courier
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.35 2004/12/06 04:11:03 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.36 2004/12/07 01:16:58 swtaylor Exp $
+
+  06 Dec 2004; Scott W Taylor <swtaylor@gentoo.org> courier-0.47-r1.ebuild,
+  courier-0.47.20041129.ebuild:
+  add mime.types dep
 
   05 Dec 2004; Scott W Taylor <swtaylor@gentoo.org> courier-0.47-r1.ebuild,
   courier-0.47.20041129.ebuild:

diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 588ceb9c93bc293726bd9127220840c03d1170ee..ac70c667d99f1fc41da805f4daf0712d0fa25c37 100644 (file)
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,11 +1,11 @@
 MD5 eae06bc935727a2243daae27af6fba24 courier-0.47.ebuild 10447
-MD5 7c9e96525d93738f4d1b172822daf1a9 courier-0.47.20041129.ebuild 8524
+MD5 02b6da1c10bf9df406b1eafc7dd15dd9 courier-0.47.20041129.ebuild 8652
 MD5 9482696d470d858a2e9331aed21191fa courier-0.46.ebuild 9766
 MD5 8169e6bebff6d078a1c11fad92e6ffbe courier-0.46.20040825.ebuild 10008
 MD5 7428e4492712d927ef9d824ed3e21d85 courier-0.46.20040902.ebuild 10010
-MD5 21f2d58bd28ee265cb41cdc739ef99d7 ChangeLog 15905
+MD5 9c219d6ec1992bacea04f1d231a39a09 ChangeLog 16035
 MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
-MD5 8c7530d45255dd68a6007e088bbda791 courier-0.47-r1.ebuild 10710
+MD5 86cc2389ac13cdf9f7423a0d960d7448 courier-0.47-r1.ebuild 11008
 MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
 MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
 MD5 1c43ee40b3a67f8c6f30fa0f08293211 files/digest-courier-0.46 66

diff --git a/mail-mta/courier/courier-0.47-r1.ebuild b/mail-mta/courier/courier-0.47-r1.ebuild
index 1e8fc92e21a2222abad20a9bddf172b20630516d..1db8c21dc9867acc291c8540b42383e0fa1f73d7 100644 (file)
--- a/mail-mta/courier/courier-0.47-r1.ebuild
+++ b/mail-mta/courier/courier-0.47-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47-r1.ebuild,v 1.2 2004/12/06 04:11:03 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47-r1.ebuild,v 1.3 2004/12/07 01:16:58 swtaylor Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ PROVIDE="virtual/mta
 DEPEND="virtual/libc
        >=dev-libs/openssl-0.9.6
        >=sys-libs/gdbm-1.8.0
+       || ( app-misc/mime-types net-www/apache )
        crypt? ( >=app-crypt/gnupg-1.0.4 )
        fax? (  >=media-libs/netpbm-9.12
                virtual/ghostscript
@@ -78,6 +79,13 @@ src_compile() {
                myconf="${myconf} --disable-unicode"
        fi
 
+       [ -e /etc/apache/conf/mime.types ] && \
+               myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
+       [ -e /etc/apache2/conf/mime.types ] && \
+               myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
+       [ -e /etc/mime.types ] && \
+               myconf="${myconf} --enable-mimetypes=/etc/mime.types"
+
        myconf="${myconf} debug=true"
 
        ./configure \
@@ -96,7 +104,6 @@ src_compile() {
                --with-paranoid-smtpext \
                --disable-autorenamesent \
                --with-db=gdbm \
-               --enable-mimetypes=/etc/apache/conf/mime.types \
                --enable-workarounds-for-imap-client-bugs \
                --host=${CHOST} ${myconf} || die "bad ./configure"
 

diff --git a/mail-mta/courier/courier-0.47.20041129.ebuild b/mail-mta/courier/courier-0.47.20041129.ebuild
index 1cafec55e3dfbd51ada3053cd086e8fb613f42a3..4b618cb31b6813a66c0f98b7311f9b6c74251b9f 100644 (file)
--- a/mail-mta/courier/courier-0.47.20041129.ebuild
+++ b/mail-mta/courier/courier-0.47.20041129.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47.20041129.ebuild,v 1.5 2004/12/06 04:11:03 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47.20041129.ebuild,v 1.6 2004/12/07 01:16:58 swtaylor Exp $
 
 inherit eutils
 
@@ -21,6 +21,7 @@ DEPEND="virtual/libc
        net-libs/courier-authlib
        >=dev-libs/openssl-0.9.6
        >=sys-libs/gdbm-1.8.0
+       || ( app-misc/mime-types net-www/apache )
        crypt? ( >=app-crypt/gnupg-1.0.4 )
        fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
        pam? ( >=sys-libs/pam-0.75 )
@@ -57,6 +58,8 @@ src_compile() {
                myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
        [ -e /etc/apache2/conf/mime.types ] && \
                myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
+       [ -e /etc/mime.types ] && \
+               myconf="${myconf} --enable-mimetypes=/etc/mime.types"
 
        einfo "Configuring courier: `echo ${myconf} | xargs echo`"
        ./configure \