get rid of completely broken mime type handling wrt #208033

(Portage version: 2.1.4)

5 files changed, 22 insertions, 38 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 813a764805dc..c9386cf679b0 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/courier
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.97 2007/08/15 23:49:20 dertobi123 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.98 2008/02/03 10:51:33 hollow Exp $
+
+  03 Feb 2008; Benedikt Böhm <hollow@gentoo.org> courier-0.53.2.ebuild,
+  courier-0.53.2-r1.ebuild, courier-0.55.1.ebuild, courier-0.55.1-r1.ebuild:
+  get rid of completely broken mime type handling wrt #208033
 
   15 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   courier-0.53.2-r1.ebuild:
diff --git a/mail-mta/courier/courier-0.53.2-r1.ebuild b/mail-mta/courier/courier-0.53.2-r1.ebuild
index 0e5e3359ed62..f9b2d57fc877 100644
--- a/mail-mta/courier/courier-0.53.2-r1.ebuild
+++ b/mail-mta/courier/courier-0.53.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.53.2-r1.ebuild,v 1.8 2007/08/15 23:49:20 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.53.2-r1.ebuild,v 1.9 2008/02/03 10:51:33 hollow Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -29,7 +29,7 @@ DEPEND="
 	>=dev-libs/openssl-0.9.6
 	>=sys-libs/gdbm-1.8.0
 	dev-libs/libpcre
-	|| ( app-misc/mime-types www-servers/apache )
+	app-misc/mime-types
 	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
 	pam? ( virtual/pam )
 	mysql? ( virtual/mysql )
@@ -79,12 +79,7 @@ src_compile() {
 	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
 	use spell || myconf="${myconf} --without-ispell"
 
-	[ -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} --enable-mimetypes=/etc/mime.types"
 
 	myconf="${myconf} $(use_with fam)"
 
diff --git a/mail-mta/courier/courier-0.53.2.ebuild b/mail-mta/courier/courier-0.53.2.ebuild
index d87b6ae29f89..54c3de668879 100644
--- a/mail-mta/courier/courier-0.53.2.ebuild
+++ b/mail-mta/courier/courier-0.53.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.53.2.ebuild,v 1.18 2007/07/29 16:58:58 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.53.2.ebuild,v 1.19 2008/02/03 10:51:33 hollow Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -29,7 +29,7 @@ DEPEND="
 	>=dev-libs/openssl-0.9.6
 	>=sys-libs/gdbm-1.8.0
 	dev-libs/libpcre
-	|| ( app-misc/mime-types www-servers/apache )
+	app-misc/mime-types
 	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
 	pam? ( >=sys-libs/pam-0.75 )
 	mysql? ( virtual/mysql )
@@ -77,12 +77,7 @@ src_compile() {
 	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
 	use spell || myconf="${myconf} --without-ispell"
 
-	[ -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} --enable-mimetypes=/etc/mime.types"
 
 	myconf="${myconf} $(use_with fam)"
 
diff --git a/mail-mta/courier/courier-0.55.1-r1.ebuild b/mail-mta/courier/courier-0.55.1-r1.ebuild
index 22dcc4db5810..7681f63f20cc 100644
--- a/mail-mta/courier/courier-0.55.1-r1.ebuild
+++ b/mail-mta/courier/courier-0.55.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.55.1-r1.ebuild,v 1.3 2007/07/29 16:58:58 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.55.1-r1.ebuild,v 1.4 2008/02/03 10:51:33 hollow Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -29,7 +29,7 @@ DEPEND="
 	>=dev-libs/openssl-0.9.6
 	>=sys-libs/gdbm-1.8.0
 	dev-libs/libpcre
-	|| ( app-misc/mime-types www-servers/apache )
+	app-misc/mime-types
 	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
 	pam? ( virtual/pam )
 	mysql? ( virtual/mysql )
@@ -79,12 +79,7 @@ src_compile() {
 	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
 	use spell || myconf="${myconf} --without-ispell"
 
-	[ -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} --enable-mimetypes=/etc/mime.types"
 
 	myconf="${myconf} $(use_with fam)"
 
diff --git a/mail-mta/courier/courier-0.55.1.ebuild b/mail-mta/courier/courier-0.55.1.ebuild
index a5c6cd25f5ff..038f268dbe9b 100644
--- a/mail-mta/courier/courier-0.55.1.ebuild
+++ b/mail-mta/courier/courier-0.55.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.55.1.ebuild,v 1.3 2007/07/29 16:58:58 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.55.1.ebuild,v 1.4 2008/02/03 10:51:33 hollow Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -29,7 +29,7 @@ DEPEND="
 	>=dev-libs/openssl-0.9.6
 	>=sys-libs/gdbm-1.8.0
 	dev-libs/libpcre
-	|| ( app-misc/mime-types www-servers/apache )
+	app-misc/mime-types
 	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
 	pam? ( >=sys-libs/pam-0.75 )
 	mysql? ( virtual/mysql )
@@ -77,12 +77,7 @@ src_compile() {
 	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
 	use spell || myconf="${myconf} --without-ispell"
 
-	[ -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} --enable-mimetypes=/etc/mime.types"
 
 	myconf="${myconf} $(use_with fam)"