commit brandy's patch for bug #28070

4 files changed, 100 insertions, 19 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 1e56edc7a72c..38ffbdb94b80 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.44 2003/10/02 08:34:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.45 2003/10/28 18:25:22 robbat2 Exp $
+
+  28 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-2.1.2-r1.ebuild, files/courier-imap-2.1.2-removerpm.patch:
+  commit brandy's patch for bug #28070
 
 *courier-imap-2.1.2-r1 (02 Oct 2003)
 
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index c46bb1eaae78..e9639f923fcf 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,23 +1,24 @@
-MD5 4a954fa34949e6fa137302342585e6a0 ChangeLog 7723
-MD5 df34e0b6e4ce8a55a3c3334b09bf2d32 courier-imap-2.1.2-r1.ebuild 7175
-MD5 2effbb953eeb00f2e0bb666d5992aa78 courier-imap-1.7.3-r1.ebuild 6870
+MD5 ce6207f0373a2a552a881d031199e239 courier-imap-2.1.2-r1.ebuild 7223
+MD5 d96b45f137d3819f51fb86f3788c61be courier-imap-1.7.3-r1.ebuild 6869
+MD5 09c75a6f00a06e204c910605232b9151 ChangeLog 7889
 MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
-MD5 e2b026fe60176521e97df76389366955 files/authdaemond.conf 457
-MD5 9249739b006f7f0daa345dd8ac6e6b5b files/authdaemond.rc6 977
-MD5 c5993255c6be57914cb943789f59931e files/courier-imapd-ssl.rc6 1208
-MD5 fc75e6af35eeaecec10d7276e9b61747 files/courier-imapd.rc6 953
-MD5 32bc690ac270adbfe95dbbeaab37904b files/courier-pop3d-ssl.rc6 1216
-MD5 572530bc373ee70a6f524d554b1d139c files/courier-pop3d.rc6 961
-MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
+MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
+MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
 MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
-MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
-MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
+MD5 6eabb1afe28900b3ed92bc9889116303 files/courier-imapd-ssl.rc6 1207
+MD5 420424625a31fa7dc9378e7877faba7a files/courier-imapd.rc6 952
 MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
-MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
+MD5 3dd72120d20476368b64811318e0b721 files/gentoo-pop3d-ssl-1.7.3-r1.rc 1010
+MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
+MD5 8518e782ded83266586160919806ec06 files/courier-imap-2.1.2-removerpm.patch 4308
 MD5 7f82274e3a25ba7ff6852f78d9eb2f69 files/digest-courier-imap-1.7.3-r1 72
-MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
+MD5 8df275b074ff61602d3c0e0bbfcc9750 files/authdaemond.conf 456
 MD5 58631496675a58dbb19ccd058088c6e1 files/gentoo-imapd-ssl-1.7.3-r1.rc 1034
-MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
-MD5 3dd72120d20476368b64811318e0b721 files/gentoo-pop3d-ssl-1.7.3-r1.rc 1010
-MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
+MD5 8f8fe760e10ffe35689d791e1d7b8d16 files/courier-pop3d-ssl.rc6 1215
+MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
+MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
+MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
 MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r1 72
+MD5 12b60a6d075d607adf99f90af1a300e3 files/authdaemond.rc6 976
+MD5 70a104ae9721e2f5d86a8f7c326d9f1d files/courier-pop3d.rc6 960
+MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
diff --git a/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild b/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild
index 64ba09a50b00..7bc3292b6424 100644
--- a/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild,v 1.2 2003/10/28 14:01:41 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.1.2-r1.ebuild,v 1.3 2003/10/28 18:25:22 robbat2 Exp $
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -51,6 +51,8 @@ src_unpack() {
 
 	# Fix a bug with where the password change module is installed. Upstream bug in configure file.
 	sed -i -e 's,--with-authchangepwdir=/var/tmp/dev/null,--with-authchangepwdir=$libexecdir/authlib,' configure
+
+	epatch ${FILESDIR}/${PN}-2.1.2-removerpm.patch
 }
 
 src_compile() {
diff --git a/net-mail/courier-imap/files/courier-imap-2.1.2-removerpm.patch b/net-mail/courier-imap/files/courier-imap-2.1.2-removerpm.patch
new file mode 100644
index 000000000000..9a4dafbe6328
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-2.1.2-removerpm.patch
@@ -0,0 +1,74 @@
+--- courier-imap-2.1.1/configure	2003-08-20 03:50:03.000000000 +1200
++++ courier-imap-2.1.1-gentoo/configure	2003-09-12 17:21:06.000000000 +1200
+@@ -2802,71 +2802,6 @@
+ fi
+ 
+ 
+-# Check whether --with-redhat or --without-redhat was given.
+-if test "${with_redhat+set}" = set; then
+-  withval="$with_redhat"
+-   redhat=$withval
+-else
+-  redhat=no
+-fi;
+-
+-if test "$srcdir" = "."
+-then
+-	case `./config.guess` in
+-	*-linux-*)
+-		if rpm -q redhat-release >/dev/null 2>/dev/null && test "$redhat" = "no"
+-		then
+-			hash='#'
+-			{ echo "$as_me:$LINENO: WARNING: === I think you are trying to run this configure script" >&5
+-echo "$as_me: WARNING: === I think you are trying to run this configure script" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === on Red Hat Linux.  You're doing too much work!" >&5
+-echo "$as_me: WARNING: === on Red Hat Linux.  You're doing too much work!" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === It's much faster to create installable binary RPMs" >&5
+-echo "$as_me: WARNING: === It's much faster to create installable binary RPMs" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === like this: http://www.courier-mta.org/FAQ.html${hash}rpm" >&5
+-echo "$as_me: WARNING: === like this: http://www.courier-mta.org/FAQ.html${hash}rpm" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === When you do this you may find that RPM will tell you" >&5
+-echo "$as_me: WARNING: === When you do this you may find that RPM will tell you" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === to install some other software first, before trying to" >&5
+-echo "$as_me: WARNING: === to install some other software first, before trying to" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === build this one, and even tell you the name of RPMs you" >&5
+-echo "$as_me: WARNING: === build this one, and even tell you the name of RPMs you" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === need to install from the distribution CD.  That's much" >&5
+-echo "$as_me: WARNING: === need to install from the distribution CD.  That's much" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === easier than trying to figure out the same from some" >&5
+-echo "$as_me: WARNING: === easier than trying to figure out the same from some" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === cryptic error message." >&5
+-echo "$as_me: WARNING: === cryptic error message." >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: " >&5
+-echo "$as_me: WARNING: " >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === Even if you don't intend to use everything you need to" >&5
+-echo "$as_me: WARNING: === Even if you don't intend to use everything you need to" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === have in order to build via RPM, you should still do as" >&5
+-echo "$as_me: WARNING: === have in order to build via RPM, you should still do as" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === you're told.  All the extra stuff (LDAP, SQL, etc...)" >&5
+-echo "$as_me: WARNING: === you're told.  All the extra stuff (LDAP, SQL, etc...)" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === goes into RPM sub-packages, which do not need to be" >&5
+-echo "$as_me: WARNING: === goes into RPM sub-packages, which do not need to be" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === installed." >&5
+-echo "$as_me: WARNING: === installed." >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === But, if you insist, you can simply add '--with-redhat'" >&5
+-echo "$as_me: WARNING: === But, if you insist, you can simply add '--with-redhat'" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === parameter to this configure script and not see this" >&5
+-echo "$as_me: WARNING: === parameter to this configure script and not see this" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === error message.  You should also do this when upgrading" >&5
+-echo "$as_me: WARNING: === error message.  You should also do this when upgrading" >&2;}
+-			{ echo "$as_me:$LINENO: WARNING: === and you didn't use RPM with the older version." >&5
+-echo "$as_me: WARNING: === and you didn't use RPM with the older version." >&2;}
+-			{ { echo "$as_me:$LINENO: error: ... in either case you better know what you're doing!" >&5
+-echo "$as_me: error: ... in either case you better know what you're doing!" >&2;}
+-   { (exit 1); exit 1; }; }
+-		fi
+-		;;
+-	*)
+-		;;
+-	esac
+-fi
+-
+ if test x$prefix = xNONE
+ then
+ 	prefix="$defaultprefix"