courier ebuild sync mit portage
Hanno Böck

Hanno Böck commited on 2009-12-07 15:55:46
Zeige 2 geänderte Dateien mit 15 Einfügungen und 28 Löschungen.

... ...
@@ -13,6 +13,6 @@ AUX shorter-tarpit.patch 352 RMD160 0ae5f50145085f03213ac130b9b796781eb0a023 SHA
13 13
 DIST courier-0.61.2.tar.bz2 7268675 RMD160 a738e534df69fee51aec50a53ce6e5d799f0eecd SHA1 aff9b418c84912832a81295ff4592a76fbe36853 SHA256 c240f2cfb96c0c94811152ea1495f41f72507bdef4e69806771f7203db0d1202
14 14
 DIST courier-0.63.0.tar.bz2 7133009 RMD160 bb47bf049c831756b5352ad1df5f7f4a67a8d52b SHA1 79d8b3b2e4cdcc07cc54308bac689255816ef9e6 SHA256 3a52363605f75f4156105aefa6bd375626f742033fbf09b5592179f274322044
15 15
 EBUILD courier-0.61.2.ebuild 9877 RMD160 34545f9de67aee93bd2d19561325d84d71bf02e5 SHA1 0b9e037bab2beb2777c4b5a4a26eca8e2bdd75f8 SHA256 e50fe99e65cb63bf36e19be9cb6965316dbc95992a0dfe21e3fc3e829dfab8d5
16
-EBUILD courier-0.63.0.ebuild 9877 RMD160 34545f9de67aee93bd2d19561325d84d71bf02e5 SHA1 0b9e037bab2beb2777c4b5a4a26eca8e2bdd75f8 SHA256 e50fe99e65cb63bf36e19be9cb6965316dbc95992a0dfe21e3fc3e829dfab8d5
16
+EBUILD courier-0.63.0.ebuild 9329 RMD160 41eb08d50ebffbc0def7d3a5d0ce6bd6d368a650 SHA1 6c41184e23bdfac2e349722576b066a52d3de25c SHA256 7e49c612aa474c9e8a4058585ba59023b9bfb9a36693413f29bbfd309490432b
17 17
 MISC ChangeLog 30202 RMD160 e7bcd05b5c1be30647bb4b128e3c746f9075525b SHA1 6f97e81b15a462bbd8bd46dffcb03db8c1a17056 SHA256 bb08316bf40a47df059eeb1986598bdc39ae0eeba60560d646672d44567d586f
18 18
 MISC metadata.xml 687 RMD160 753323e40a9add2b07fd1f138c672ce283d2f255 SHA1 2e8255902a9e0394bd27e13e488e84ba70f05845 SHA256 ea417e66d396e793212529ed20f5570b0c97eb666a5ba52bb3202bbfbc022be1
... ...
@@ -1,6 +1,6 @@
1 1
 # Copyright 1999-2009 Gentoo Foundation
2 2
 # Distributed under the terms of the GNU General Public License v2
3
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.61.2.ebuild,v 1.2 2009/05/04 17:16:23 hanno Exp $
3
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.63.0.ebuild,v 1.1 2009/12/07 14:21:52 hanno Exp $
4 4
 
5 5
 inherit eutils flag-o-matic
6 6
 
... ...
@@ -44,12 +44,6 @@ PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
44 44
 	crypt? ( >=app-crypt/gnupg-1.0.4 )"
45 45
 
46 46
 src_unpack() {
47
-	use fam || (
48
-		ewarn "File Alteration Monitor (FAM) is disabled"
49
-		ewarn "courier-imap will fall back to 60 second polls."
50
-		ewarn 'add "fam" to your USE flags to build as usual'
51
-		ebeep 4
52
-		epause 4 )
53 47
 	unpack ${A}
54 48
 	cd "${S}"
55 49
 	use norewrite && epatch "${FILESDIR}/norewrite.patch"
... ...
@@ -60,19 +54,17 @@ src_compile() {
60 54
 	filter-flags '-fomit-frame-pointer'
61 55
 
62 56
 	local myconf
63
-	myconf="`use_with ipv6` \
64
-		`use_with ldap ldapaliasd` `use_enable ldap maildropldap`"
57
+	myconf=""
65 58
 
66 59
 	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
67
-	use spell || myconf="${myconf} --without-ispell"
68 60
 
69
-	myconf="${myconf} --enable-mimetypes=/etc/mime.types"
70
-
71
-	myconf="${myconf} $(use_with fam)"
72
-
73
-	einfo "Configuring courier: $(echo ${myconf} | xargs echo)"
74
-
75
-	econf \
61
+	econf ${myconf} \
62
+		$(use_with fam) \
63
+		$(use_with ipv6) \
64
+		$(use_with spell ispell) \
65
+		$(use_with ldap ldapaliasd) \
66
+		$(use_enable ldap maildroldap) \
67
+		--enable-mimetypes=/etc/mime.types \
76 68
 		--prefix=/usr \
77 69
 		--disable-root-check \
78 70
 		--mandir=/usr/share/man \
... ...
@@ -89,7 +81,7 @@ src_compile() {
89 81
 		--with-db=gdbm \
90 82
 		--disable-autorenamesent \
91 83
 		--cache-file="${S}/configuring.cache" \
92
-		--host="${CHOST}" ${myconf} debug=true || die "./configure"
84
+		--host="${CHOST}" debug=true || die "./configure"
93 85
 	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
94 86
 	emake || die "Compile problem"
95 87
 }
... ...
@@ -236,17 +228,12 @@ src_install() {
236 228
 }
237 229
 
238 230
 src_test() {
239
-	addpredict /
240
-	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
241
-	if hasq userpriv "${FEATURES}" ; then
242
-		if ! emake -j1 check; then
243
-			hasq test "${FEATURES}" && die "Make check failed. See above for details."
244
-			hasq test "${FEATURES}" || eerror "Make check failed. See above for details."
245
-		fi
231
+	if [ `whoami` != 'root' ]; then
232
+		emake -j1 check || die "Make check failed."
246 233
 	else
247
-		hasq test "${FEATURES}" && eerror "Make check needs FEATURES="userpriv" to work."
234
+		einfo "make check skipped, can't run as root."
235
+		einfo "You can enable it with FEATURES=\"userpriv\""
248 236
 	fi
249
-	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
250 237
 }
251 238
 
252 239
 pkg_postinst() {
253 240