Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

8 files changed, 3 insertions, 217 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index baba429c8e67..9ff45c6848f6 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/gnubiff/Manifest b/net-mail/gnubiff/Manifest
index 80d76bf07563..36e751e5109f 100644
--- a/net-mail/gnubiff/Manifest
+++ b/net-mail/gnubiff/Manifest
@@ -4,5 +4,5 @@ AUX gnubiff-2.2.15-underlink.patch 337 BLAKE2B ea045a75986fd13e63549b7f187315ac7
 DIST gnubiff-2.2.15.tar.gz 851638 BLAKE2B dd6d8527664470497d0f7eccd5f435f06f67935a831ace025152f717986c80bd39d49730f1f92b94ded4da8fd0d6aba30705f81b245c6a51dc8257bfe6c95238 SHA512 592a9934f34cec65869bef6bb7a488fd1a44515d513e47b440a36ef15ff9c44dbedb33c27e375ac6cc9590d9a0f02b315307913059f3d7e44ee64a87d95f52c4
 DIST gnubiff-2.2.17.tar.gz 897817 BLAKE2B 5ee58828211eb7b85ab017129feec48c6d2b2df4de862f7791f15f361bda7919cbdc7aa37403130da044a1f9e2068154ddc5ae8629eb9f4d38956d759477fb80 SHA512 2fe715d584fb057255d4922275de152ff5b1167abcbdd27d33124921a4c659c3db301944a73d58622ecd22f62615d44b5bebb83838bbd53c67a2dd8286592d89
 EBUILD gnubiff-2.2.15-r3.ebuild 1059 BLAKE2B f0b824e9610600bafc9a3a634333d261c7ad080233eac7495804510c23c26daac1433a2efa373e65bd9cd40222050236594e56b7ccfd0a38b9065d724a739ca0 SHA512 d6ab12975a623075abd8ebdd479f0d43d51397166e585abe27f1987816bd48c9659fdb4ecac72e4e3a7eef94b07a8706d1e9631f69339dbe7e184ff9eee7bda0
-EBUILD gnubiff-2.2.17-r1.ebuild 1107 BLAKE2B 5b64af7022e16fa55167f4db3db0f7228157340a5d3eab9315b2f267b04866cc4ea47c991c892214471e4271b96346ea67729a9a6897a44d2530fb911bbf4863 SHA512 96e16c80e19b6c315d14d6b959356b51e30a7e116624074d36b5765b4666415bee238a52f9f3c83df8dd706d38966fba903f689e6b0db695dbeab65d8eb89cb8
+EBUILD gnubiff-2.2.17-r1.ebuild 1109 BLAKE2B 92424de5c679d56c01ce2f5aaacec79d39c29e4f70f6837ed8656771e2dbf6f7fd90bf39895bd412385b81bfad0ade83a3cf56caeab13bde6a393f3761e82c6e SHA512 7ba8e1bc715f9f9aa3843ba02b00e9e4788172821ea01b12c6ba114d5af0fb9bb432f6fc470a293161a4ee35ecca1dc8a91d16a9836622d51f4473e6e3544170
 MISC metadata.xml 441 BLAKE2B 32d4e54f87f31b0c58ec3ed963923431c65507c9d8bb42607c2fab2a5e7ac4769c3c8211aa1167108f9ad2891fd64bc79c646af3b90b99055bcce4941cf176de SHA512 05e73c040168ab771d6b48e72ad1f24ff2e85fd6aef619f0bff8cc06b0f0ffd52816ee48ae2c3d7c58fab4630242c9d20945ea8a06698db7f768074328690a27
diff --git a/net-mail/gnubiff/gnubiff-2.2.17-r1.ebuild b/net-mail/gnubiff/gnubiff-2.2.17-r1.ebuild
index f2f1da676d1f..3312ee12e0a0 100644
--- a/net-mail/gnubiff/gnubiff-2.2.17-r1.ebuild
+++ b/net-mail/gnubiff/gnubiff-2.2.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug fam nls password"
 
 RDEPEND="
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index f4141ea41a2c..2fd6d82bf4b2 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -2,10 +2,8 @@ AUX aliases 809 BLAKE2B bc6295e7cddae8ee29450f4054992b6fe47f301303be7ea284d42f9e
 AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14f89a83cd82eebc5580ea0375f6548d373a04ac17f214a0135047d99f7ed3cf62f5500953bf6a SHA512 5b7d878969e644aac8aa9355e1a8ff9e2a9c1b07edb5a62c694bd7a4f87961242db7c85b1030540c9ad733a4d3d4c5367a047a188b21517d1d077bec6e620ec7
 AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0
 AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
-AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
 EBUILD mailbase-1.1.ebuild 1657 BLAKE2B ae93c9819b1e5bb8f8ede43955453d2f6aa68a306ebce97b611bb1b37abcbb12fe390c20a4db2c997f860c0b2b0db251052b12d6073e70c3ee1e40b7361139b5 SHA512 998ad423d34728fd24d0ff04d014568eba456775deedb1551e9c8e05a5993235347b0235975599e330e0545a84d8857ac84ce160fedc3bbb8d8062b908026932
 EBUILD mailbase-1.2.ebuild 1492 BLAKE2B ea342a3be316df8623fa242ed2dcc3e47f6bc303cb880a9c4b240a89edebacbecbdc86cc7abe058b5b9b233235f7e9983a8fe548ee77d3ab9be9523637c7e12b SHA512 a5e8edf618de36acefb9326f40e64b9c7f659f704b8f8effd5930ff619085895a8bd26da556adbccfad1d375bdb14149dfb4704c623ce7359ab67f438eb28d6e
 EBUILD mailbase-1.3.ebuild 1458 BLAKE2B 835a54fe1e299fd10342d6d890ef3436b91483a9e12cfc74d4291939c0a8bb1702f9467b9b9f0687a748915fdc3bdccefedaace530d96cb4d37108a474db3e7a SHA512 60cbbe72959a4b0f7f05080765257cdc18bde09c5444acf97d19b4bfbbe70eec3b6e110cbefc382db74d1506f551d9d5e919e8b927465c70fd6ac8a951eaaeb3
-EBUILD mailbase-1.4.ebuild 1482 BLAKE2B eb1a131d41e204bc07a0d6a339bbed18c0abd27054a31f259d7ccecc9d129ba3f2c49984b51939ab8e0ee70c7d21e7bbd5e8e249f5361ad467b53ec2fd177723 SHA512 9463c5dd2bdc408972c4e3fd4a926f97a7e36672d2f6fcca5e361dd922968bea1517bc191bf0dc968fcda51cfcb3951ef1def837a88fc38bc680ae2b1746f0a9
 EBUILD mailbase-1.ebuild 1608 BLAKE2B f730c8dc3723241b5bdad4de17471b22ed3893ad70b072de1ced072fc994c5615cc2c7e7827ebb1d371a6c85eb194dcc943ff1136172229736b45fc9ed86303c SHA512 18bb8bfd64c6eb6e80cfbc5d7c5d4583155020583baf07cd0c031611271994676891a00e354a2b4da02f8f9fefbc423287dbae1ce4c12e5be2284760920720c4
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/mailbase/files/mailcap.5 b/net-mail/mailbase/files/mailcap.5
deleted file mode 100644
index eec92103f886..000000000000
--- a/net-mail/mailbase/files/mailcap.5
+++ /dev/null
@@ -1,75 +0,0 @@
-.\" Hey, Emacs!  This is an -*- nroff -*- source file.
-.TH MAILCAP 5 "Release 2" "Bellcore Prototype"
-.SH NAME
-mailcap - metamail capabilities file
-.SH DESCRIPTION
-The
-.I mailcap
-file is read by the 
-.I metamail
-program to determine how to display non-text at the local site.
-
-The syntax of a mailcap file is quite simple, at least compared to termcap files.  Any line that starts with "#" is a comment.  Blank lines are ignored.  Otherwise, each line defines a single mailcap entry for a single content type.  Long lines may be continued by ending them with a backslash character, \\.
-
-Each individual mailcap entry consists of a content-type specification, a command to execute, and (possibly) a set of optional "flag" values.  For example, a very simple mailcap entry (which is actually a built-in default behavior for metamail) would look like this:
-
-text/plain; cat %s
-
-The optional flags can be used to specify additional information about the mail-handling command.  For example:
-
-text/plain; cat %s; copiousoutput
-
-can be used to indicate that the output of the 'cat' command may be voluminous, requiring either a scrolling window, a pager, or some other appropriate coping mechanism.
-
-The "type" field (text/plain, in the above example) is simply any legal content type name, as defined by informational RFC 1524.  In practice, this is almost any string.  It is the string that will be matched against the "Content\-type" header (or the value passed in with \-c) to decide if this is the mailcap entry that matches the current message.  Additionally, the type field may specify a subtype (e.g. "text/ISO\-8859\-1") or a wildcard to match all subtypes (e.g. "image/*").
-
-The "command" field is any UNIX command ("cat %s" in the above example), and is used to specify the interpreter for the given type of message.  It will be passed to the shell via the system(3) facility.  Semicolons and backslashes within the command must be quoted with backslashes.  If the command contains "%s", those two characters will be replaced by the name of a file that contains the body of the message. If it contains "%t", those two characters will be replaced by the content-type field, including the subtype, if any.  (That is, if the content-type was "image/pbm; opt1=something-else", then "%t" would be replaced by "image/pbm".)   If the command field contains  "%{" followed by a parameter name and a closing "}", then all those characters will be replaced by the value of the named parameter, if any, from the Content-type header.   Thus, in the previous example, "%{opt1}" will be replaced by "something-else".  Finally, if the command contains "\\%", those two characters will be replaced by a single % character.  (In fact, the backslash can be used to quote any character, including itself.)
-
-If no "%s" appears in the command field, then instead of placing the message body in a temporary file, metamail will pass the body to the command on the standard input.  This is helpful in saving /tmp file space, but can be problematic for window-oriented applications under some window systems such as MGR.
-
-Two special codes can appear in the viewing command for objects of type multipart (any subtype).  These are "%n" and "%F".  %n will be replaced by the number of parts within the multipart object.  %F will be replaced by a series of arguments, two for each part, giving first the content-type and then the name of the temporary file where the decoded part has been stored.  In addition, for each file created by %F, a second file is created, with the same name followed by "H", which contains the header information for that body part.  This will not be needed by most multipart handlers, but it is there if you ever need it.  
-
-The "notes=xxx" field is an uninterpreted string that is used to specify the name of the person who installed this entry in the mailcap file.  (The "xxx" may be replaced by any text string.)
-
-The "test=xxx" field is a command that is executed to determine whether or not the mailcap line actually applies.  That is, if the content-type field matches the content-type on the message, but a "test=" field is present, then the test must succeed before the mailcap line is considered to "match" the message being viewed.  The command may be any UNIX command, using the same syntax and the same %-escapes as for the viewing command, as described above.  A command is considered to succeed if it exits with a zero exit status, and to fail otherwise.
-
-The "print=xxx" field is a command that is executed to print the data instead of display it interactively.  This behavior is usually a consequence of invoking metamail with the "\-h" switch.
-
-The "textualnewlines" field can be used in the rather obscure case where metamail's default rules for treating newlines in base64-encoded data are unsatisfactory.  By default, metamail will translate CRLF to the local newline character in decoded base64 output if the content-type is "text" (any subtype), but will not do so otherwise.  A mailcap entry with a field of "textualnewlines=1" will force such translation for the specified content-type, while "textualnewlines=0" will guarantee that the translation does not take place even for textual content-types.
-
-The "compose" field may be used to specify a program that can be used to compose a new body or body part in the given format.  Its intended use is to support mail composing agents that support the composition of multiple types of mail using external composing agents. As with the view-command, the compose command will be executed after replacing certain escape sequences starting with "%".  In particular, %s should be replaced by the name of a file to which the composed data is to be written by the specified composing program, thus allowing the calling program (e.g. metamail) to tell the called program where to store the composed data.  If %s does not appear, then the composed data will be assumed to be written by the composing programs to standard output.   The result of the composing program may be data that is NOT yet suitable for mail transport -- that is, a Content-Transfer-Encoding may still need to be applied to the data.
-
-The "composetyped" field is similar to the "compose" field, but is to be used when the composing program needs to specify the Content-type header field to be applied to the composed data.  The "compose" field is simpler, and is preferred for use with existing (non-mail-oriented) programs for composing data in a given format.  The "composetyped" field is necessary when the Content-type information must include auxiliary parameters, and the composition program must then know enough about mail formats to produce output that includes the mail type information, and to apply any necessary Content-Transfer-Encoding.   Conceptually, "compose" specifies a program that simply outputs the specified type of data in its raw form, while "composetyped" specifies a program that outputs the data as a MIME object, with all necessary Content-* headers already in place.
-
-.TP 8
-.B needsterminal
-If this flag is given, the named interpreter needs to interact with the user on a terminal.  In some environments (e.g. a window-oriented mail reader under X11) this will require the creation of a new terminal emulation window, while in most environments it will not.  If the mailcap entry specifies "needsterminal" and metamail is not running on a terminal (as determined by isatty(3), the \-x option, and the MM_NOTTTY environment variable) then metamail will try to run the command in a new terminal emulation window.  Currently, metamail knows how to create new windows under the X11, SunTools, and WM window systems.
-.TP 8
-.B copiousoutput
-This flag should be given whenever the interpreter is capable of producing more than a few lines of output on stdout, and does no interaction with the user.  If the mailcap entry specifies copiousoutput, and pagination has been requested via the "\-p" command, then the output of the command being executed will be piped through a pagination program ("more" by default, but this can be overridden with the METAMAIL_PAGER environment variable).
-.SH BUILT-IN CONTENT-TYPE SUPPORT
-The metamail program has built-in support for a few key content-types.  In particular, it supports the text type, the multipart and multipart/alternative type, and the message/rfc822 types.  This support is incomplete for many subtypes -- for example, it only supports US-ASCII text in general.  This kind of built-in support can be OVERRIDDEN by an entry in any mailcap file on the user's search path.  Metamail also has rudimentary built-in support for types that are totally unrecognized -- i.e. for which no mailcap entry or built-in handler exists.  For such unrecognized types, metamail will write a file with a "clean" copy of the data -- i.e. a copy in which all mail headers have been removed, and in which any 7-bit transport encoding has been decoded.
-.SH FILES
-$HOME/.mailcap:/etc/mailcap:/usr/share/etc/mailcap:/usr/local/etc/mailcap -- default path for mailcap files.
-.SH SEE ALSO
-.BR run-mailcap "(1)",
-.BR mailcap.order "(5)",
-.BR update-mime "(8)"
-
-RFC 1524 (<http://tools.ietf.org/html/rfc1524>)
-
-.SH COPYRIGHT
-Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-
-Permission to use, copy, modify, and distribute this material 
-for any purpose and without fee is hereby granted, provided 
-that the above copyright notice and this permission notice 
-appear in all copies, and that the name of Bellcore not be 
-used in advertising or publicity pertaining to this 
-material without the specific, prior written permission 
-of an authorized representative of Bellcore.  BELLCORE 
-MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY 
-OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS", 
-WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-.SH AUTHOR
-Nathaniel S. Borenstein
diff --git a/net-mail/mailbase/mailbase-1.4.ebuild b/net-mail/mailbase/mailbase-1.4.ebuild
deleted file mode 100644
index 157b09c61051..000000000000
--- a/net-mail/mailbase/mailbase-1.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit pam user
-
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="pam"
-
-RDEPEND="pam? ( virtual/pam )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup mail 12
-	enewuser mail 8 -1 /var/spool/mail mail
-	enewuser postmaster 14 -1 /var/spool/mail
-}
-
-src_install() {
-	dodir /etc/mail
-	insinto /etc/mail
-	doins "${FILESDIR}"/aliases
-	insinto /etc
-	doins "${FILESDIR}"/mailcap
-	doman "${FILESDIR}"/mailcap.5
-
-	keepdir /var/spool/mail
-	fowners root:mail /var/spool/mail
-	fperms 03775 /var/spool/mail
-	dosym spool/mail /var/mail
-
-	newpamd "${FILESDIR}"/common-pamd-include pop
-	newpamd "${FILESDIR}"/common-pamd-include imap
-	if use pam ; then
-		local p
-		for p in pop3 pop3s pops ; do
-			dosym pop /etc/pam.d/${p}
-		done
-		for p in imap4 imap4s imaps ; do
-			dosym imap /etc/pam.d/${p}
-		done
-	fi
-}
-
-get_permissions_oct() {
-	if [[ ${USERLAND} = GNU ]] ; then
-		stat -c%a "${ROOT}$1"
-	elif [[ ${USERLAND} = BSD ]] ; then
-		stat -f%p "${ROOT}$1" | cut -c 3-
-	fi
-}
-
-pkg_postinst() {
-	# bug 614396
-	if [[ "$(get_permissions_oct /var/spool/mail)" != "3775" ]] ; then
-		einfo  "Fixing ${ROOT}var/spool/mail/ permissions"
-		chown root:mail "${ROOT}var/spool/mail/"
-		chmod 03775 "${ROOT}var/spool/mail/"
-	fi
-}
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index a3b13060a135..7908192e80ed 100644
--- a/net-mail/metamail/Manifest
+++ b/net-mail/metamail/Manifest
@@ -3,5 +3,4 @@ AUX metamail-2.7.53.3-glibc-2.10.patch 718 BLAKE2B 83a95d5e03008f16449676ea6e863
 DIST metamail_2.7-53.diff.gz 322363 BLAKE2B bfb3ee13816a62f03ba5cdc3e54957b03d41662d1d32a908b7a02d92490f4c5eafd8e57d945e18902b873c9bbc4615ce7819bfb4fea3f227e1ca918aaa81fd28 SHA512 cb5351308f1ad479e1560446f7f540165ff165d7306a5592a8286edd643301608ff9ace01456d4b0d03d27b9b838b61f08412b15d6b3aa99b95e2ab484e884ed
 DIST mm2.7.tar.Z 262881 BLAKE2B da245467b5dd009eb489e136d072205e5bc4a190b2b3a9c558f30c7dc6dfbecff8df1f51359cdc2561f7cd85519a6fd40705f2f640cb6632857507cb6bd551fe SHA512 9cd2619ca83594ca7be94453270b6a9ef01f5a496fd361bb76f16fc575f549ab450efa1d480c3d4b0b172f245d9c3276f99ba1ae4e3ae4bb6618df9d8131f77e
 EBUILD metamail-2.7.53.3-r1.ebuild 1708 BLAKE2B 59c034ab96e4aa4381f0cb43199652a6ada61850abb66c5c2fef7acde31936e0dc45cad96dc4418f311ae049f2af456e16889e1374ffdfed447948b7a9a3d03c SHA512 b7d7ba31683dee40336927bc20c61bbbf716a61f08ff7e06798c8c0b157d5031796c0f5b36ab70b12c935db29d4c90ccfb4bba0bd0332d92215c64c3f2fcd7e4
-EBUILD metamail-2.7.53.3-r2.ebuild 1692 BLAKE2B 032bec0cf3e19cdeac2c97286afae6d4c0ff1d12c24727bc86c7d0f4c733f45bda9b828f5870eb96cad4e6a5fe0437f18b5f64cf8c6c6d4a7ce84da4dabdc780 SHA512 4542ca8108ddcef025c5022798374e2f56562e16ebc6a5415c31d07669a52172f2b61e7e54423a0d9707ec617b727ec8c2ae0de5e40d4160cdf60d31ccf006a7
 MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild b/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
deleted file mode 100644
index 84c02dac00bf..000000000000
--- a/net-mail/metamail/metamail-2.7.53.3-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-MY_PV=$(ver_cut 1-2)
-DEB_PV=${MY_PV}-$(ver_cut 3)
-
-DESCRIPTION="Metamail (with Debian patches) - Generic MIME package"
-HOMEPAGE="http://ftp.funet.fi/pub/unix/mail/metamail/"
-SRC_URI="http://ftp.funet.fi/pub/unix/mail/metamail/mm${MY_PV}.tar.Z
-	mirror://debian/pool/main/m/metamail/metamail_${DEB_PV}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs"
-
-DEPEND="sys-libs/ncurses
-	app-arch/sharutils
-	net-mail/mailbase"
-RDEPEND="app-misc/mime-types
-	sys-apps/debianutils
-	!app-misc/run-mailcap"
-
-S=${WORKDIR}/mm${MY_PV}/src
-
-src_prepare() {
-	eapply "${WORKDIR}"/metamail_${DEB_PV}.diff
-	eapply "${FILESDIR}"/${PN}-2.7.45.3-CVE-2006-0709.patch
-	eapply "${FILESDIR}"/${P}-glibc-2.10.patch
-
-	# respect CFLAGS
-	sed -i -e 's/CFLAGS/LIBS/' \
-		"${S}"/src/{metamail,richmail}/Makefile.am || die
-
-	# add missing include - QA
-	sed -i -e '/config.h/a #include <string.h>' \
-		"${S}"/src/metamail/shared.c || die
-
-	# Fix building with ncurses[tinfo]
-	sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" \
-		src/richmail/Makefile.am \
-		src/metamail/Makefile.am || die
-
-	eapply_user
-	eautoreconf
-	chmod +x "${S}"/configure
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc CREDITS README
-	rm man/mmencode.1
-	rm man/mailcap.5
-	doman man/* debian/mimencode.1 debian/mimeit.1
-
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-}