courier: Fix various small warnings / issues with doc installation and webmail/webadmin use flags.

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

3 files changed, 33 insertions, 24 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 8c805b70e065..76b4af824542 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/courier
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.143 2011/03/31 20:40:01 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.144 2011/04/01 23:25:41 hanno Exp $
+
+  01 Apr 2011; Hanno Boeck <hanno@gentoo.org> courier-0.65.2-r1.ebuild:
+  Fix various small warnings / issues with doc installation and
+  webmail/webadmin use flags.
 
   31 Mar 2011; Eray Aslan <eras@gentoo.org> courier-0.59.0.ebuild,
   courier-0.62.2.ebuild, courier-0.64.1.ebuild, courier-0.65.2.ebuild,
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 8791218a91a5..413df5b45373 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -20,24 +20,24 @@ DIST courier-0.65.2.tar.bz2 7152680 RMD160 6a81f74c85f9e78e6514f840598dde634fe07
 EBUILD courier-0.59.0.ebuild 9855 RMD160 6501abf27ef4535dfc33625880bd757a8cbb0917 SHA1 8972b57d5b75b1ae4f35e75152bf0f74eb5be77c SHA256 2b04d76a198e9d25ce7543e57b9301e6ecb2a765ff79a4c9025930356d74d69a
 EBUILD courier-0.62.2.ebuild 8958 RMD160 2a5d3a2f8cdb591cf0d10fa3486c3a6b3a803c9d SHA1 5fa98bce8043e25538c9dd7a48868f0f2f390a30 SHA256 d664c9bb45c1af0de4880d17468bbf1a45327e4d9a4c5ccc83400ba840de10d2
 EBUILD courier-0.64.1.ebuild 8961 RMD160 e947f8b6997ded5ce6f564598c1fcd58144c9224 SHA1 36f8f9cfadcc82abf1c9aaef2853756884dacd2d SHA256 018a31073e68e0b0185f252d96bf427bbebdcfd7318b7d9183a571bd3d0a8c22
-EBUILD courier-0.65.2-r1.ebuild 8964 RMD160 fc28df7873922bdd7c06c257021bd15ed844b754 SHA1 c5c1bc4a5ba23f0a20670170bf2987ab62358460 SHA256 45298a2e1a005bdebac47b67a4c0469df2d06a9e528a4cecae4035feb3f2289b
+EBUILD courier-0.65.2-r1.ebuild 9233 RMD160 a0ff816fb88556f4eed7448d9d63e1af97dc0688 SHA1 ce89113abed0cf104da31dacfb346638546eb7db SHA256 5ac82eca26c179aab8b9862e0fc79466d5938528d2ae528ef42f4ba9e5cc2f72
 EBUILD courier-0.65.2.ebuild 8963 RMD160 684f201d99626561bf454b467379974b032bc6f6 SHA1 0bdfc0d3558c2d392bb5aa52f648de1a646bec6c SHA256 a69f3ffae10a51cc2c23a63f715655a2507f2e4a8132c081641885a1bacd57f7
-MISC ChangeLog 34519 RMD160 f5b8976f8604a1e200aa94b73f0ee90ff52368e8 SHA1 522c2e6fd8c721cabc94ac8f52885005b52bf7f1 SHA256 09de5b82c5be4d9f7c8e5031d46f392097d556ea5cfa3fb8c59220b5d9696ec8
+MISC ChangeLog 34687 RMD160 846b320175093d9bd7299460ce936a2acf172f84 SHA1 c262caa1a9884ea00f893dd4aa6c0a13a7225689 SHA256 b15deb8b35447036df68e4789dc22098f9a31b1c3a9e40013a57fa8191e886c7
 MISC metadata.xml 688 RMD160 d6ea2c5c87e6f305adfef15da4cbc91affe577af SHA1 eaa2f9fea774bdbc651a59929e2fa84f2292b335 SHA256 1cb15a4a98fc9fae0e167e7aa9f8672f3456af2320bb3f8f011ecb612eaa1557
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNlOayAAoJEHfx8XVYajsfSnsQALKA05tpeVcwoKER3Cym8Rri
-nZc7VLmfo4b6yP8gO6KHVho55Ku0iEe3TFoskUFyGRVaQuhUd9BwPQo63kEGP030
-wMIJKDfd1iiKKaOdl6HYqR4UqGITZaXmgIcQFnTlMn81JFjGjWMlgWlhIg3eQbjG
-0LMyFJH5397JS8OkYa7jiC2rnWXhT9w9MWnJUM8sJBpAjJxs/8K1Zoz+6+w8XRSz
-HdzHabk4Hb4TQGjBbGlyJPOYCM9xkqRbrvx9AdL7VE4MYl1CjOBrBWwz2VutLo83
-yVHhGxgYh7N5Xjzuupc2gAfsBldoin/IXri54GtncelTi4rOK7ePEShVDgi5xI6H
-UO+7ZaWMf9YxipwMjopKoBMSHCYHdgngSJLaIP3xtCgod6GdRDVnxi8c9x5FBtbg
-0jQWsKd5JY4IH+PHVYSGtTRPWGCg7Ywz6sWaHHRWdgjlhe6NJdkOgZFAhg9bMew4
-t2IxygOs3dd5YeuePl3pwXKSrV9vzXGiCCJgP0b5Vx9TYKT1gOLeojYEnoGjJzsu
-WHSR/77hWP7Un+ZSZYpfoqVx/hJ1YtzKsBpI7NMaZjAS7QZfjXWdchyVcBwVDmX7
-n/ZEpBaDhmmUwtpYz0sRcPtKswTqlShIvOyZHJu8vhlows3suRmsuM5qvGZmDJi9
-cjAJEIskS2xDxpdp2yeb
-=1tDu
+iQIcBAEBCAAGBQJNll77AAoJEKWIAHK7tR5CkYYP/jFB2A0OswX/fVTpVagal0HS
+qW0/DbXl/vMVo3xPIBvvbw8v//mPUeD7pBygqdb94XHeHhHIOY409A8wH17yUK0S
+RKXbBs+Tvxo/2BUtruYDNxWX/Hts57+XxYFOAPJsHEuM+RVbucOh3YTJKcUl/eu+
+f+/4UkAyPzMfuE7HhXVdvvYy9Nwua2Rw0GnjH0ReMOVIHTee/Tgm2xaRnqxWCenX
+jhQyEi7yiqbUhV9W2g+2/e/FGavRkC0yS94dQGvyfwnr0jDsoBrlr1x2mJ0sNHPU
+lVJBVpV3jh/YjGx7s4z+lQ4vvUXxdjZ/PMzINDzcltIX/Cq987RXeRmNFqPHkALH
+VLr6NkGGXcOwzruIAs9aQH7SgeK4l93lBNBChzFWNcddhhrq03PxZOEF6OOa5IP6
++RfYyLkjtIt8t4lDE3VEsNZNKhxU/3XKkaBeicovW2zMjTb4eoRU8rVr3MCttyBz
+PxqR/Sy85PH7m8jsGXwdsrd042ndUiSnNKCtcUQryPQTM1YMCaNXHzilBZO21Qaj
+KIvGYrZmaPYRE8rdjYOg0bR+d5VY+xnvpviekHn0P9O6rVatVR6uWmL2kgaapfSV
+5SQkDUpsBWiIskGRf1QWplitcskMLCkf2Tqm+jCfH2/+358eydnN7e3EKoGS2Zah
+83mCYolZsd33ANFYCo2+
+=JsID
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.65.2-r1.ebuild b/mail-mta/courier/courier-0.65.2-r1.ebuild
index 70ba8695594c..28e11cede476 100644
--- a/mail-mta/courier/courier-0.65.2-r1.ebuild
+++ b/mail-mta/courier/courier-0.65.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic multilib
 
 DESCRIPTION="An MTA designed specifically for maildirs"
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -126,13 +126,19 @@ src_install() {
 
 	# Get rid of files we dont want
 	if ! use webmail ; then
-		cd "${D}"
-		cat "${FILESDIR}/webmail_files" | xargs rm -rf
+		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
+			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
+			"${D}/usr/share/courier/sqwebmail/" \
+			"${D}/usr/sbin/webmaild" \
+			"${D}/usr/sbin/webgpg" \
+			"${D}/etc/courier/webmail.authpam" \
+			"${D}/var/lib/courier/webmail-logincache" \
+			"${D}"/etc/courier/sqwebmaild*
 	fi
 
 	if ! use web ; then
-		cd "${D}"
-		cat "${FILESDIR}/webadmin_files" | xargs rm -rf
+		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
+			"${D}/etc/courier/webadmin"
 	fi
 
 	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
@@ -177,7 +183,6 @@ src_install() {
 
 	# Fix for a sandbox violation on subsequential merges
 	# - ticho@gentoo.org, 2005-07-10
-	rm "${D}"/usr/sbin/{pop3d,imapd}{,-ssl}
 	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
 	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
 	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
@@ -188,7 +193,7 @@ src_install() {
 	use nls && cp unicode/README README.unicode
 	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
 	dodoc tcpd/README.couriertls
-	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${P}/html"
+	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
 
 	if use webmail ; then
 		insinto /usr/$(get_libdir)/courier/courier