Tie colliding files to tools USE flag - bugs #61116 #374009

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

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index e3418737c4fab42747f0291f97cc18b196757635..95c24de8b18e0d594fc791af27501e2ceebfc1f6 100644 (file)
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-filter/maildrop
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.107 2011/05/27 13:50:51 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.108 2011/07/27 07:26:00 eras Exp $
+
+  27 Jul 2011; Eray Aslan <eras@gentoo.org> maildrop-2.5.4.ebuild:
+  Tie colliding files to tools USE flag - bugs #61116 #374009
 
 *maildrop-2.5.4 (27 May 2011)
 

diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index db59813178bfbf515ee9b2b9fac0970377ffb74b..d17b0ad0539e416a32095c387685098f71bc79fe 100644 (file)
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -12,23 +12,23 @@ DIST maildrop-2.5.4.tar.bz2 2082167 RMD160 a71c08fc2951dd122740870186693ac112e59
 EBUILD maildrop-2.4.2.ebuild 2843 RMD160 949aa62027ded33663700dea267b60c3e9094f37 SHA1 04a8fe51df3bccd3cc21381a1785f34633721d00 SHA256 3780da207704b88d6fe75e049aa34a3746bded8a328427dabc2e1d20961686e8
 EBUILD maildrop-2.5.1.ebuild 2891 RMD160 32c81f58c8a46dc388487c006aeaf3b28e217a65 SHA1 872e7718a1260efb0bee45543fa19a65604f33da SHA256 b7ab48048d48ac1d7988fbe0691aa2aa7891067fc71ecf80c76f51cf1ad456a9
 EBUILD maildrop-2.5.3.ebuild 2978 RMD160 c4f9f698af140adabd1afdc5fab3bac62165535e SHA1 a1ce6c7183da491271316691e0d030d2ff3337af SHA256 9819725773e66a16be7838353fc5abc52a979f2f3e6e35c6309dd912f159e747
-EBUILD maildrop-2.5.4.ebuild 3047 RMD160 949a93a8e125e5a5d10b333aafc088830f68742f SHA1 d853ff66e76616a4617df2a0388c28eb1245ed5b SHA256 18d18ac75d33deb8187a60a372f3c18352353e75775da73fe7005b15c17a950f
-MISC ChangeLog 21160 RMD160 4f6a10bb6fe9134db1f6145cc1c5fda669229f23 SHA1 3f647a56e28d74d4171b93524b383b617eb7a9b6 SHA256 7aafaa4995f87ef6936bae002bfa2505e2a5e5fc19f1d6b7081edb41157f85b0
-MISC metadata.xml 240 RMD160 e5b053c0a14b143e22acb63661529b036ac18428 SHA1 4a9701163fe5473fdbd5eaf6f286bc0a539519b1 SHA256 4e7e2f285c777bc7c6657086935b69d68e8c248546dda4e87b9279ca732308bb
+EBUILD maildrop-2.5.4.ebuild 3408 RMD160 f74601f4c2384fc7e40100bb2c043e4f18de131e SHA1 f399476337afe1dff8fa68b1588cfb107e86595b SHA256 f4ee8932a0ee5a004ae77b0ebdde3d85b3633b71f4ca3f5d753bf93997489aa8
+MISC ChangeLog 21290 RMD160 be90bdd0546c536594a40e8df84a6a7661b0eefe SHA1 53971db540ae7b72406a0043fedaa26325482854 SHA256 b8f60df9d8a7ba200c9485485a69db440c54c644702b4140d9564cfd0b6084fd
+MISC metadata.xml 313 RMD160 a54c7c17c1fb1708ba9987cdad3e1f91bafd5e7e SHA1 c030dc401f831ea71224dbec6685200e34798962 SHA256 8e4845f749808afe7959162a14069b0eb59436401ee3a2ed8661a3bdc18fb5fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN36xMAAoJEHfx8XVYajsf484P/2REDAVOIl4LcuiQIVh5cvJG
-gB5O4OxBpkwkRMw/pndSvuCjWF42QZ0/e/Kg2I5tgA4emzyJ+6NJe5VHckR8etao
-9z+2x643j8MAKebWqLJXMZ3g95DwxflT8ehQhyf//eJdGL/7dl6DZSCVhgANuBxt
-OIS0N6LRETMOkV3qCi3KNrKcKqhFG2EswGncDVltlcjEdo84zM/0ct9XYikuRfaQ
-s7dNYtuEp91ezlL9Ukh9aerfGh2WrUodvw7cJ9iYsW7vS5cGBcxlcXj7JLvetePd
-F9hXwaHilpLg5YnJXFpTsbOrAGjxd99LnhN/OP/qhC/ygdFvRK7o1W/CgU+p3kOp
-H5l9DUQJZxWCQ72W2UXv2Md7PlLicE/kSxu7cygtKfreVOZqBDrYRDLq2Onxek4m
-nYVZ674DOQGKmMsM8eLPyU2ijIguJyOUE2K5U3OZzhCrTxIHGu+MgLkbaUn5CPiZ
-xc9IMSW8RqcbMBeu2bP1A7ynjDzydCo+ezSBL9o4/94Vv5YKVzB+OaHeGec8BHLu
-KeR01wne2T/PPkyq25uOW9sRzC3js+gN6K+KAzy6GUouY2WXQ352muprv5QMb4l5
-7jiKuvagXIyOVL0COfd3v7eq1edTCBcD135FxftcevQ9099bEBnhVZqsMOKXxGJ8
-RwUXSzdmKw40WefMQrUT
-=EbhX
+iQIcBAEBCAAGBQJOL72WAAoJEHfx8XVYajsfAwEP/35MsjKkfn8texe3dYuCux0r
+gKRUk1wUCmtkqQnSWC9CeKxSNXMCke3/R9oR24E6PQOLht8bUFY6lOoJjZI4WYku
+GEd+m5NCakQ9WkAMRkjJ84xvv7V7r+MguQ/r/cQ5W2kBfL+H0mhuriqKsFgZPYuC
+vc8uUoV5sc1uZ9KpwafidC9l4RalpqWNrWBkNBr08WcVCkSC6SYpvwMfFbT3jcAO
+iebq0iUccelj01gi9DiFk4bhK3Aaycfx73y4EfCNMLw+ju5S7dD9H3go7Ouu9wfg
+77jAp+Ni2cl18Uj/K30hx1fqKZyuA8dWqsoZzN3p4oipMe+VKgjnvLiKCTOZN1TI
+vCle2vcKZzcxBesj//tWBVhTMassw52UqDNCbK+ZxCzGgno1Hp9itQ7fbTRRCayI
+V9JlBZ8NJjVJ+VoIa0F4dBXkndJifwZG8qXqcJJPRGRYGOeHV0kOIvmkPCFhRA8P
++KMFpsOPz+7t3Z708t9X1xXlKL0OYxX1mTE2Pwg/9hQtZcvYy1vpa2mox6o6WeIr
+yVeL6RcpvR++LL98KtYTZf+SmN7iW24iKqJxr6K/P/y86wl0xBoi1TnEOuqz1I6i
+dqNwCdSPhLNkp+fatdbuU3UwOcIVWkwLCZ4Y2AHNBAzNYzxMtbkDMt3ZHKbGl1hX
+IncrOJ0y/LoBffuW8UH5
+=/xvl
 -----END PGP SIGNATURE-----

diff --git a/mail-filter/maildrop/maildrop-2.5.4.ebuild b/mail-filter/maildrop/maildrop-2.5.4.ebuild
index 384c343e9014017f8a6d931adef725edc6a08971..e916881a6be9d3d3d268c154145cf5ac313091b2 100644 (file)
--- a/mail-filter/maildrop/maildrop-2.5.4.ebuild
+++ b/mail-filter/maildrop/maildrop-2.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.5.4.ebuild,v 1.1 2011/05/27 13:50:51 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.5.4.ebuild,v 1.2 2011/07/27 07:26:00 eras Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.courier-mta.org/maildrop/"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="berkdb debug fam gdbm ldap mysql postgres authlib"
+IUSE="berkdb debug fam gdbm ldap mysql postgres authlib +tools"
 
 CDEPEND="!mail-mta/courier
        net-mail/mailbase
@@ -28,9 +28,12 @@ CDEPEND="!mail-mta/courier
        authlib?  ( net-libs/courier-authlib )
        fam?      ( virtual/fam )
        !gdbm? (
-               berkdb? (
-                       >=sys-libs/db-3
-               )
+               berkdb? ( >=sys-libs/db-3 )
+       )
+       tools? (
+               !mail-mta/netqmail
+               !net-mail/courier-imap
+               !mail-mta/mini-qmail
        )"
 DEPEND="${CDEPEND}
        dev-util/pkgconfig"
@@ -108,6 +111,16 @@ src_install() {
        docinto maildir
        dodoc maildir/AUTHORS maildir/INSTALL maildir/README*.txt
 
+       # bugs #61116 #374009
+       if ! use tools ; then
+               for tool in "maildirmake" "deliverquota"; do
+                       rm "${D}/usr/bin/${tool}"
+                       rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9]
+                       rm "${D}/usr/share/maildrop/html/${tool}.html"
+               done
+               rm "${D}/usr/share/man/man5/maildir.5"
+       fi
+
        dodir "/usr/share/doc/${PF}"
        mv "${D}/usr/share/maildrop/html" "${D}/usr/share/doc/${PF}/"
        rm -rf "${D}"/usr/share/maildrop

diff --git a/mail-filter/maildrop/metadata.xml b/mail-filter/maildrop/metadata.xml
index 75075e2013cff96f93d8c0ecea7f207d52369309..655feda3f0730ad9d53edad2dc86ee5e24aa8607 100644 (file)
--- a/mail-filter/maildrop/metadata.xml
+++ b/mail-filter/maildrop/metadata.xml
@@ -4,5 +4,6 @@
   <herd>net-mail</herd>
   <use>
     <flag name="authlib">Add courier-authlib support</flag>
+    <flag name="tools">Install maildirmake and deliverquota tools</flag>
   </use>
 </pkgmetadata>