1 |
hanno 11/04/01 23:25:41 |
2 |
|
3 |
Modified: ChangeLog courier-0.65.2-r1.ebuild |
4 |
Log: |
5 |
courier: Fix various small warnings / issues with doc installation and webmail/webadmin use flags. |
6 |
|
7 |
(Portage version: 2.1.9.45/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.144 mail-mta/courier/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/courier/ChangeLog?rev=1.144&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/courier/ChangeLog?rev=1.144&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/courier/ChangeLog?r1=1.143&r2=1.144 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v |
19 |
retrieving revision 1.143 |
20 |
retrieving revision 1.144 |
21 |
diff -u -r1.143 -r1.144 |
22 |
--- ChangeLog 31 Mar 2011 20:40:01 -0000 1.143 |
23 |
+++ ChangeLog 1 Apr 2011 23:25:41 -0000 1.144 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for mail-mta/courier |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.143 2011/03/31 20:40:01 eras Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.144 2011/04/01 23:25:41 hanno Exp $ |
29 |
+ |
30 |
+ 01 Apr 2011; Hanno Boeck <hanno@g.o> courier-0.65.2-r1.ebuild: |
31 |
+ Fix various small warnings / issues with doc installation and |
32 |
+ webmail/webadmin use flags. |
33 |
|
34 |
31 Mar 2011; Eray Aslan <eras@g.o> courier-0.59.0.ebuild, |
35 |
courier-0.62.2.ebuild, courier-0.64.1.ebuild, courier-0.65.2.ebuild, |
36 |
|
37 |
|
38 |
|
39 |
1.10 mail-mta/courier/courier-0.65.2-r1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/courier/courier-0.65.2-r1.ebuild?rev=1.10&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/courier/courier-0.65.2-r1.ebuild?rev=1.10&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/courier/courier-0.65.2-r1.ebuild?r1=1.9&r2=1.10 |
44 |
|
45 |
Index: courier-0.65.2-r1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.65.2-r1.ebuild,v |
48 |
retrieving revision 1.9 |
49 |
retrieving revision 1.10 |
50 |
diff -u -r1.9 -r1.10 |
51 |
--- courier-0.65.2-r1.ebuild 31 Mar 2011 20:40:01 -0000 1.9 |
52 |
+++ courier-0.65.2-r1.ebuild 1 Apr 2011 23:25:41 -0000 1.10 |
53 |
@@ -1,8 +1,8 @@ |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.65.2-r1.ebuild,v 1.9 2011/03/31 20:40:01 eras Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.65.2-r1.ebuild,v 1.10 2011/04/01 23:25:41 hanno Exp $ |
58 |
|
59 |
-inherit eutils flag-o-matic |
60 |
+inherit eutils flag-o-matic multilib |
61 |
|
62 |
DESCRIPTION="An MTA designed specifically for maildirs" |
63 |
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" |
64 |
@@ -126,13 +126,19 @@ |
65 |
|
66 |
# Get rid of files we dont want |
67 |
if ! use webmail ; then |
68 |
- cd "${D}" |
69 |
- cat "${FILESDIR}/webmail_files" | xargs rm -rf |
70 |
+ rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \ |
71 |
+ "${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \ |
72 |
+ "${D}/usr/share/courier/sqwebmail/" \ |
73 |
+ "${D}/usr/sbin/webmaild" \ |
74 |
+ "${D}/usr/sbin/webgpg" \ |
75 |
+ "${D}/etc/courier/webmail.authpam" \ |
76 |
+ "${D}/var/lib/courier/webmail-logincache" \ |
77 |
+ "${D}"/etc/courier/sqwebmaild* |
78 |
fi |
79 |
|
80 |
if ! use web ; then |
81 |
- cd "${D}" |
82 |
- cat "${FILESDIR}/webadmin_files" | xargs rm -rf |
83 |
+ rm -rf "${D}/usr/share/courier/courierwebadmin/" \ |
84 |
+ "${D}/etc/courier/webadmin" |
85 |
fi |
86 |
|
87 |
for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do |
88 |
@@ -177,7 +183,6 @@ |
89 |
|
90 |
# Fix for a sandbox violation on subsequential merges |
91 |
# - ticho@g.o, 2005-07-10 |
92 |
- rm "${D}"/usr/sbin/{pop3d,imapd}{,-ssl} |
93 |
dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d |
94 |
dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl |
95 |
dosym /usr/share/courier/imapd /usr/sbin/courier-imapd |
96 |
@@ -188,7 +193,7 @@ |
97 |
use nls && cp unicode/README README.unicode |
98 |
dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt |
99 |
dodoc tcpd/README.couriertls |
100 |
- mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${P}/html" |
101 |
+ mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html" |
102 |
|
103 |
if use webmail ; then |
104 |
insinto /usr/$(get_libdir)/courier/courier |