summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2017-02-28 11:47:27 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2017-02-28 11:50:50 -0800
commit61b861acd7b49083dab687e133f30f3331cb7480 (patch)
tree8a7f8399749ed165000187dad48ad8ac4b831465 /net-mail
parentkde-apps/kcharselect: Add missing DEPEND (diff)
downloadgentoo-61b861acd7b49083dab687e133f30f3331cb7480.tar.gz
gentoo-61b861acd7b49083dab687e133f30f3331cb7480.tar.bz2
gentoo-61b861acd7b49083dab687e133f30f3331cb7480.zip
Drop $Id$ per council decision in bug #611234.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/Freemail/Freemail-9999-r1.ebuild1
-rw-r--r--net-mail/altermime/altermime-0.3.11.ebuild1
-rw-r--r--net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild1
-rw-r--r--net-mail/archivemail/archivemail-0.9.0-r1.ebuild1
-rw-r--r--net-mail/asmail/asmail-2.1-r1.ebuild1
-rw-r--r--net-mail/asmail/asmail-2.1.ebuild1
-rw-r--r--net-mail/automx/automx-0.10.2-r1.ebuild1
-rw-r--r--net-mail/automx/automx-0.10.2-r2.ebuild1
-rw-r--r--net-mail/autorespond/autorespond-2.0.4.ebuild1
-rw-r--r--net-mail/autorespond/autorespond-2.0.5.ebuild1
-rw-r--r--net-mail/bincimap/bincimap-1.2.13-r1.ebuild1
-rw-r--r--net-mail/bincimap/bincimap-1.2.13.ebuild1
-rw-r--r--net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild1
-rw-r--r--net-mail/checkpassword/checkpassword-0.90-r2.ebuild1
-rw-r--r--net-mail/checkpassword/checkpassword-0.90-r3.ebuild1
-rw-r--r--net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild1
-rw-r--r--net-mail/courier-imap/courier-imap-4.15-r2.ebuild1
-rw-r--r--net-mail/courier-imap/courier-imap-4.16.0-r1.ebuild1
-rw-r--r--net-mail/courier-imap/courier-imap-4.16.2-r1.ebuild1
-rw-r--r--net-mail/courierpassd/courierpassd-1.1.2-r1.ebuild1
-rw-r--r--net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.17-r1.ebuild1
-rw-r--r--net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.18.ebuild1
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild1
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild1
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild1
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild1
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild1
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.5.7.ebuild1
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.5.8.ebuild1
-rw-r--r--net-mail/cyrus-imapd/cyrus-imapd-2.5.9.ebuild1
-rw-r--r--net-mail/dbmail/dbmail-3.2.2.ebuild1
-rw-r--r--net-mail/dbmail/dbmail-3.2.3-r1.ebuild1
-rw-r--r--net-mail/dbmail/dbmail-3.2.3.ebuild1
-rw-r--r--net-mail/dot-forward/dot-forward-0.71-r3.ebuild1
-rw-r--r--net-mail/dovecot/dovecot-2.2.19.ebuild1
-rw-r--r--net-mail/dovecot/dovecot-2.2.27.ebuild1
-rw-r--r--net-mail/email/email-2.5.0.ebuild1
-rw-r--r--net-mail/email/email-3.0.5.ebuild1
-rw-r--r--net-mail/email/email-3.1.2.ebuild1
-rw-r--r--net-mail/email/email-3.1.3.ebuild1
-rw-r--r--net-mail/eps/eps-1.7.ebuild1
-rw-r--r--net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild1
-rw-r--r--net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild1
-rw-r--r--net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r2.ebuild1
-rw-r--r--net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild1
-rw-r--r--net-mail/fastforward/fastforward-0.51-r1.ebuild1
-rw-r--r--net-mail/fdm/fdm-1.7.ebuild1
-rw-r--r--net-mail/fdm/fdm-1.8.ebuild1
-rw-r--r--net-mail/fdm/fdm-1.9.ebuild1
-rw-r--r--net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild1
-rw-r--r--net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild1
-rw-r--r--net-mail/gensig/gensig-2.3.ebuild1
-rw-r--r--net-mail/getmail/getmail-4.52.0.ebuild1
-rw-r--r--net-mail/getmail/getmail-4.53.0.ebuild1
-rw-r--r--net-mail/gnubiff/gnubiff-2.2.15-r2.ebuild1
-rw-r--r--net-mail/grepmail/grepmail-5.30.33-r2.ebuild1
-rw-r--r--net-mail/hotwayd/hotwayd-0.8.4.ebuild1
-rw-r--r--net-mail/imapsync/imapsync-1.592-r1.ebuild1
-rw-r--r--net-mail/imapsync/imapsync-1.607-r1.ebuild1
-rw-r--r--net-mail/imapsync/imapsync-1.644.ebuild1
-rw-r--r--net-mail/imapsync/imapsync-1.684.ebuild1
-rw-r--r--net-mail/isync/isync-1.0.6.ebuild1
-rw-r--r--net-mail/isync/isync-1.2.0.ebuild1
-rw-r--r--net-mail/isync/isync-1.2.1.ebuild1
-rw-r--r--net-mail/kuvert/kuvert-2.0.4.ebuild1
-rw-r--r--net-mail/lbdb/lbdb-0.39-r1.ebuild1
-rw-r--r--net-mail/lbdb/lbdb-0.39.ebuild1
-rw-r--r--net-mail/lbdb/lbdb-0.41.ebuild1
-rw-r--r--net-mail/lbdb/lbdb-0.42.ebuild1
-rw-r--r--net-mail/libdbx/libdbx-1.0.3.ebuild1
-rw-r--r--net-mail/libpst/libpst-0.6.64-r1.ebuild1
-rw-r--r--net-mail/libpst/libpst-0.6.66-r1.ebuild1
-rw-r--r--net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild1
-rw-r--r--net-mail/mailbase/mailbase-1.1.ebuild1
-rw-r--r--net-mail/mailbase/mailbase-1.ebuild1
-rw-r--r--net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild1
-rw-r--r--net-mail/maildirtree/maildirtree-0.6-r1.ebuild1
-rw-r--r--net-mail/mailfront/mailfront-0.88.ebuild1
-rw-r--r--net-mail/mailfront/mailfront-0.98.ebuild1
-rw-r--r--net-mail/mailfront/mailfront-1.12.ebuild1
-rw-r--r--net-mail/mailfront/mailfront-1.16.ebuild1
-rw-r--r--net-mail/mailgraph/mailgraph-1.14-r2.ebuild1
-rw-r--r--net-mail/mailman/mailman-2.1.23.ebuild1
-rw-r--r--net-mail/mailshears/mailshears-0.0.2-r1.ebuild1
-rw-r--r--net-mail/mailsync/mailsync-5.2.1.ebuild1
-rw-r--r--net-mail/mailutils/mailutils-2.99.98-r1.ebuild1
-rw-r--r--net-mail/mailutils/mailutils-3.1.1.ebuild1
-rw-r--r--net-mail/mairix/mairix-0.23.ebuild1
-rw-r--r--net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild1
-rw-r--r--net-mail/mess822/mess822-0.58-r2.ebuild1
-rw-r--r--net-mail/metamail/metamail-2.7.53.3-r1.ebuild1
-rw-r--r--net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r1.ebuild1
-rw-r--r--net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r2.ebuild1
-rw-r--r--net-mail/mhonarc/mhonarc-2.6.18-r2.ebuild1
-rw-r--r--net-mail/mlmmj/mlmmj-1.2.18.0.ebuild1
-rw-r--r--net-mail/mlmmj/mlmmj-1.2.18.1.ebuild1
-rw-r--r--net-mail/mlmmj/mlmmj-1.2.19.0-r1.ebuild1
-rw-r--r--net-mail/mlmmj/mlmmj-1.2.19.0.ebuild1
-rw-r--r--net-mail/mpack/mpack-1.6-r3.ebuild1
-rw-r--r--net-mail/mpop/mpop-1.2.4.ebuild1
-rw-r--r--net-mail/mpop/mpop-1.2.5.ebuild1
-rw-r--r--net-mail/mpop/mpop-1.2.6.ebuild1
-rw-r--r--net-mail/mswatch/mswatch-1.2.0.ebuild1
-rw-r--r--net-mail/mu/mu-0.9.15-r1.ebuild1
-rw-r--r--net-mail/mu/mu-0.9.16.ebuild1
-rw-r--r--net-mail/mu/mu-0.9.18-r1.ebuild1
-rw-r--r--net-mail/mu/mu-0.9.9.5.ebuild1
-rw-r--r--net-mail/mu/mu-0.9.9.6.ebuild1
-rw-r--r--net-mail/mu/mu-0.9.9.ebuild1
-rw-r--r--net-mail/muchsync/muchsync-2.ebuild1
-rw-r--r--net-mail/nmzmail/nmzmail-1.1.ebuild1
-rw-r--r--net-mail/notmuch/notmuch-0.21.ebuild1
-rw-r--r--net-mail/notmuch/notmuch-0.22.2-r1.ebuild1
-rw-r--r--net-mail/notmuch/notmuch-0.23.3.ebuild1
-rw-r--r--net-mail/notmuch/notmuch-0.23.5.ebuild1
-rw-r--r--net-mail/offlineimap/offlineimap-6.5.6.ebuild1
-rw-r--r--net-mail/offlineimap/offlineimap-6.7.0.3.ebuild1
-rw-r--r--net-mail/offlineimap/offlineimap-7.0.10.ebuild1
-rw-r--r--net-mail/offlineimap/offlineimap-7.0.12.ebuild1
-rw-r--r--net-mail/offlineimap/offlineimap-7.0.13.ebuild1
-rw-r--r--net-mail/peephole/peephole-1.5.ebuild1
-rw-r--r--net-mail/pflogsumm/pflogsumm-1.1.5.ebuild1
-rw-r--r--net-mail/pfqueue/pfqueue-0.5.6.ebuild1
-rw-r--r--net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild1
-rw-r--r--net-mail/pop2imap/pop2imap-1.18.ebuild1
-rw-r--r--net-mail/pop2imap/pop2imap-1.21.ebuild1
-rw-r--r--net-mail/popa3d/popa3d-1.0.2-r1.ebuild1
-rw-r--r--net-mail/popick/popick-0.1.ebuild1
-rw-r--r--net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild1
-rw-r--r--net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild1
-rw-r--r--net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild1
-rw-r--r--net-mail/qlogtools/qlogtools-3.1.ebuild1
-rw-r--r--net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild1
-rw-r--r--net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild1
-rw-r--r--net-mail/qmail-lint/qmail-lint-0.55.ebuild1
-rw-r--r--net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild1
-rw-r--r--net-mail/qmail-qfilter/qmail-qfilter-2.1-r1.ebuild1
-rw-r--r--net-mail/qmail-qfilter/qmail-qfilter-2.1.ebuild1
-rw-r--r--net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild1
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.10.ebuild1
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.12.ebuild1
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild1
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.15.ebuild1
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.16.ebuild1
-rw-r--r--net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild1
-rw-r--r--net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild1
-rw-r--r--net-mail/qmhandle/qmhandle-1.3.2.ebuild1
-rw-r--r--net-mail/qmrtg/qmrtg-2.1-r1.ebuild1
-rw-r--r--net-mail/qpopper/qpopper-4.1.0.ebuild1
-rw-r--r--net-mail/qprint/qprint-1.0.ebuild1
-rw-r--r--net-mail/qprint/qprint-1.1.ebuild1
-rw-r--r--net-mail/qtools/qtools-0.56.ebuild1
-rw-r--r--net-mail/queue-fix/queue-fix-1.4-r2.ebuild1
-rw-r--r--net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild1
-rw-r--r--net-mail/queue-repair/queue-repair-0.9.0.ebuild1
-rw-r--r--net-mail/randomsig/randomsig-1.10.0.ebuild1
-rw-r--r--net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild1
-rw-r--r--net-mail/renattach/renattach-1.2.4-r1.ebuild1
-rw-r--r--net-mail/ripmime/ripmime-1.4.0.10.ebuild1
-rw-r--r--net-mail/ripole/ripole-0.2.1.ebuild1
-rw-r--r--net-mail/ripole/ripole-0.2.2.ebuild1
-rw-r--r--net-mail/rss2email/rss2email-2.71-r1.ebuild1
-rw-r--r--net-mail/safecat/safecat-1.13.ebuild1
-rw-r--r--net-mail/sendEmail/sendEmail-1.56-r1.ebuild1
-rw-r--r--net-mail/sendEmail/sendEmail-1.56-r2.ebuild1
-rw-r--r--net-mail/serialmail/serialmail-0.75-r4.ebuild1
-rw-r--r--net-mail/signify/signify-1.14.ebuild1
-rw-r--r--net-mail/smtptools/smtptools-0.2.3.ebuild1
-rw-r--r--net-mail/spamcup/spamcup-1.09.ebuild1
-rw-r--r--net-mail/swaks/swaks-20130209.0-r1.ebuild1
-rw-r--r--net-mail/swaks/swaks-20130209.0.ebuild1
-rw-r--r--net-mail/t-prot/t-prot-3.4.ebuild1
-rw-r--r--net-mail/tnef/tnef-1.4.12.ebuild1
-rw-r--r--net-mail/topal/topal-75.ebuild1
-rw-r--r--net-mail/tpop3d/tpop3d-1.5.5.ebuild1
-rw-r--r--net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild1
-rw-r--r--net-mail/uw-imap/uw-imap-2007f-r1.ebuild1
-rw-r--r--net-mail/uw-imap/uw-imap-2007f.ebuild1
-rw-r--r--net-mail/uw-mailutils/uw-mailutils-2007f.ebuild1
-rw-r--r--net-mail/vacation/vacation-1.2.7.0.ebuild1
-rw-r--r--net-mail/vchkuser/vchkuser-0.4.ebuild1
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild1
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33.ebuild1
-rw-r--r--net-mail/vqadmin/vqadmin-2.3.7.ebuild1
-rw-r--r--net-mail/yosucker/yosucker-73.ebuild1
-rw-r--r--net-mail/yosucker/yosucker-77.ebuild1
186 files changed, 0 insertions, 186 deletions
diff --git a/net-mail/Freemail/Freemail-9999-r1.ebuild b/net-mail/Freemail/Freemail-9999-r1.ebuild
index 83ec9f56b1b..ee9035cf5e1 100644
--- a/net-mail/Freemail/Freemail-9999-r1.ebuild
+++ b/net-mail/Freemail/Freemail-9999-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/net-mail/altermime/altermime-0.3.11.ebuild b/net-mail/altermime/altermime-0.3.11.ebuild
index 2e6cf1b9e56..9d8ff8c549a 100644
--- a/net-mail/altermime/altermime-0.3.11.ebuild
+++ b/net-mail/altermime/altermime-0.3.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit eutils toolchain-funcs
diff --git a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
index b53c1ab3179..f8eb3efd3b4 100644
--- a/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
+++ b/net-mail/amavis-logwatch/amavis-logwatch-1.51.03.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/archivemail/archivemail-0.9.0-r1.ebuild b/net-mail/archivemail/archivemail-0.9.0-r1.ebuild
index f366ee85f6c..ab850606ed4 100644
--- a/net-mail/archivemail/archivemail-0.9.0-r1.ebuild
+++ b/net-mail/archivemail/archivemail-0.9.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/net-mail/asmail/asmail-2.1-r1.ebuild b/net-mail/asmail/asmail-2.1-r1.ebuild
index 4802e2ea84e..ca22bcd63a6 100644
--- a/net-mail/asmail/asmail-2.1-r1.ebuild
+++ b/net-mail/asmail/asmail-2.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/net-mail/asmail/asmail-2.1.ebuild b/net-mail/asmail/asmail-2.1.ebuild
index 9f851938e3b..ccd9e1cabdb 100644
--- a/net-mail/asmail/asmail-2.1.ebuild
+++ b/net-mail/asmail/asmail-2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs eutils
diff --git a/net-mail/automx/automx-0.10.2-r1.ebuild b/net-mail/automx/automx-0.10.2-r1.ebuild
index 701055a00d2..8e254aba86e 100644
--- a/net-mail/automx/automx-0.10.2-r1.ebuild
+++ b/net-mail/automx/automx-0.10.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/automx/automx-0.10.2-r2.ebuild b/net-mail/automx/automx-0.10.2-r2.ebuild
index 7fd390eeed8..f9f23a5e095 100644
--- a/net-mail/automx/automx-0.10.2-r2.ebuild
+++ b/net-mail/automx/automx-0.10.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/autorespond/autorespond-2.0.4.ebuild b/net-mail/autorespond/autorespond-2.0.4.ebuild
index b7402ef9a10..392689e29e9 100644
--- a/net-mail/autorespond/autorespond-2.0.4.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/net-mail/autorespond/autorespond-2.0.5.ebuild b/net-mail/autorespond/autorespond-2.0.5.ebuild
index cc61de80bea..f8b0e5f0413 100644
--- a/net-mail/autorespond/autorespond-2.0.5.ebuild
+++ b/net-mail/autorespond/autorespond-2.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/net-mail/bincimap/bincimap-1.2.13-r1.ebuild b/net-mail/bincimap/bincimap-1.2.13-r1.ebuild
index 5acb6b9ffe1..4c68d7e65c5 100644
--- a/net-mail/bincimap/bincimap-1.2.13-r1.ebuild
+++ b/net-mail/bincimap/bincimap-1.2.13-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/bincimap/bincimap-1.2.13.ebuild b/net-mail/bincimap/bincimap-1.2.13.ebuild
index 816032a6f3d..e08221517a8 100644
--- a/net-mail/bincimap/bincimap-1.2.13.ebuild
+++ b/net-mail/bincimap/bincimap-1.2.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild b/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild
index 1cea87f5ecb..c5e6e629562 100644
--- a/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild
+++ b/net-mail/checkpassword-pam/checkpassword-pam-0.99.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
IUSE=""
diff --git a/net-mail/checkpassword/checkpassword-0.90-r2.ebuild b/net-mail/checkpassword/checkpassword-0.90-r2.ebuild
index bd8b5b7f309..2b677c23353 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r2.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs flag-o-matic
diff --git a/net-mail/checkpassword/checkpassword-0.90-r3.ebuild b/net-mail/checkpassword/checkpassword-0.90-r3.ebuild
index 4840d1f6b5c..5aa2798d623 100644
--- a/net-mail/checkpassword/checkpassword-0.90-r3.ebuild
+++ b/net-mail/checkpassword/checkpassword-0.90-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils fixheadtails flag-o-matic qmail
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
index 21919000999..a75828e3468 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.30-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils fixheadtails user
diff --git a/net-mail/courier-imap/courier-imap-4.15-r2.ebuild b/net-mail/courier-imap/courier-imap-4.15-r2.ebuild
index f58f093a7b6..4a7ef1d07e1 100644
--- a/net-mail/courier-imap/courier-imap-4.15-r2.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.15-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/courier-imap/courier-imap-4.16.0-r1.ebuild b/net-mail/courier-imap/courier-imap-4.16.0-r1.ebuild
index 3bce05ea415..fbb94172a5a 100644
--- a/net-mail/courier-imap/courier-imap-4.16.0-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.16.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/courier-imap/courier-imap-4.16.2-r1.ebuild b/net-mail/courier-imap/courier-imap-4.16.2-r1.ebuild
index 0f41f534674..83083366938 100644
--- a/net-mail/courier-imap/courier-imap-4.16.2-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.16.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/courierpassd/courierpassd-1.1.2-r1.ebuild b/net-mail/courierpassd/courierpassd-1.1.2-r1.ebuild
index decd9d26668..0c4a813b8ee 100644
--- a/net-mail/courierpassd/courierpassd-1.1.2-r1.ebuild
+++ b/net-mail/courierpassd/courierpassd-1.1.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
inherit eutils
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.17-r1.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.17-r1.ebuild
index d9e0ad7f9e1..d91bfe890a4 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.17-r1.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.17-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.18.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.18.ebuild
index e60f09907a1..81c15a3a95e 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.18.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.4.18.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools db-use eutils perl-app toolchain-funcs
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild
index 728aad3b687..514db3fbe22 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
index f4ef86f14cf..786326bd692 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild
index ec349747384..0d555c7617c 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild
index 007acd3eea3..33de3282055 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.18.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools db-use eutils multilib pam ssl-cert user toolchain-funcs
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
index a1cfa03f1b9..7d18d33ec91 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools multilib pam ssl-cert user toolchain-funcs
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.7.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.7.ebuild
index dbdc249a66b..a2ff8a27fd8 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.7.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils multilib pam ssl-cert user toolchain-funcs
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.8.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.8.ebuild
index 56de5c73d4b..74304b8dccd 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.8.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools multilib pam ssl-cert user toolchain-funcs
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.9.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.9.ebuild
index 1d0d736b88d..043d1325ab5 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.9.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.5.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools multilib pam ssl-cert user toolchain-funcs
diff --git a/net-mail/dbmail/dbmail-3.2.2.ebuild b/net-mail/dbmail/dbmail-3.2.2.ebuild
index 0865f451ba4..419c1fcda26 100644
--- a/net-mail/dbmail/dbmail-3.2.2.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils multilib versionator user
diff --git a/net-mail/dbmail/dbmail-3.2.3-r1.ebuild b/net-mail/dbmail/dbmail-3.2.3-r1.ebuild
index dd7e68cf373..4d2e4a7d27e 100644
--- a/net-mail/dbmail/dbmail-3.2.3-r1.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/dbmail/dbmail-3.2.3.ebuild b/net-mail/dbmail/dbmail-3.2.3.ebuild
index 4ca2a280489..6aa8cf25470 100644
--- a/net-mail/dbmail/dbmail-3.2.3.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit eutils multilib versionator user
diff --git a/net-mail/dot-forward/dot-forward-0.71-r3.ebuild b/net-mail/dot-forward/dot-forward-0.71-r3.ebuild
index f3bcd9ea648..b1856f0c40f 100644
--- a/net-mail/dot-forward/dot-forward-0.71-r3.ebuild
+++ b/net-mail/dot-forward/dot-forward-0.71-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils fixheadtails qmail
diff --git a/net-mail/dovecot/dovecot-2.2.19.ebuild b/net-mail/dovecot/dovecot-2.2.19.ebuild
index a1187c729ba..afb1f739bdb 100644
--- a/net-mail/dovecot/dovecot-2.2.19.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.19.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils multilib ssl-cert systemd user versionator
diff --git a/net-mail/dovecot/dovecot-2.2.27.ebuild b/net-mail/dovecot/dovecot-2.2.27.ebuild
index 959e57aa22f..8ea052c39dd 100644
--- a/net-mail/dovecot/dovecot-2.2.27.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.27.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit ssl-cert systemd user versionator
diff --git a/net-mail/email/email-2.5.0.ebuild b/net-mail/email/email-2.5.0.ebuild
index 54763bea89d..c33c1f68e09 100644
--- a/net-mail/email/email-2.5.0.ebuild
+++ b/net-mail/email/email-2.5.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Advanced CLI tool for sending email"
HOMEPAGE="http://email.cleancode.org"
diff --git a/net-mail/email/email-3.0.5.ebuild b/net-mail/email/email-3.0.5.ebuild
index 5fccbfe5934..7882010380f 100644
--- a/net-mail/email/email-3.0.5.ebuild
+++ b/net-mail/email/email-3.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit flag-o-matic
diff --git a/net-mail/email/email-3.1.2.ebuild b/net-mail/email/email-3.1.2.ebuild
index 236ca1bf079..78ef342e635 100644
--- a/net-mail/email/email-3.1.2.ebuild
+++ b/net-mail/email/email-3.1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Advanced CLI tool for sending email"
HOMEPAGE="http://www.cleancode.org/projects/email"
diff --git a/net-mail/email/email-3.1.3.ebuild b/net-mail/email/email-3.1.3.ebuild
index 442647c22df..24fdb011d93 100644
--- a/net-mail/email/email-3.1.3.ebuild
+++ b/net-mail/email/email-3.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/net-mail/eps/eps-1.7.ebuild b/net-mail/eps/eps-1.7.ebuild
index 1ead55368c0..c938746bdb4 100644
--- a/net-mail/eps/eps-1.7.ebuild
+++ b/net-mail/eps/eps-1.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=3
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild
index e888d55e64e..d85c320c1d0 100644
--- a/net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild
+++ b/net-mail/ezmlm-idx/ezmlm-idx-6.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EZMLM_P=ezmlm-0.53
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild
index 8302bb95acd..d2804201c7e 100644
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit qmail multilib
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r2.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r2.ebuild
index c19c5d28d9a..356a65c7241 100644
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r2.ebuild
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit qmail multilib
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild
index 1e27cbf5f78..b43261b504e 100644
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild
+++ b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit qmail
diff --git a/net-mail/fastforward/fastforward-0.51-r1.ebuild b/net-mail/fastforward/fastforward-0.51-r1.ebuild
index bc6396c9132..289cedaf538 100644
--- a/net-mail/fastforward/fastforward-0.51-r1.ebuild
+++ b/net-mail/fastforward/fastforward-0.51-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils fixheadtails
diff --git a/net-mail/fdm/fdm-1.7.ebuild b/net-mail/fdm/fdm-1.7.ebuild
index 0300b8966ad..0c5d011d77b 100644
--- a/net-mail/fdm/fdm-1.7.ebuild
+++ b/net-mail/fdm/fdm-1.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/fdm/fdm-1.8.ebuild b/net-mail/fdm/fdm-1.8.ebuild
index 9f815374be0..f3143004b7c 100644
--- a/net-mail/fdm/fdm-1.8.ebuild
+++ b/net-mail/fdm/fdm-1.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/fdm/fdm-1.9.ebuild b/net-mail/fdm/fdm-1.9.ebuild
index 7864c00a9e6..149768ca55e 100644
--- a/net-mail/fdm/fdm-1.9.ebuild
+++ b/net-mail/fdm/fdm-1.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild b/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild
index b3c143a2ca8..3ba19eb6b65 100644
--- a/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild b/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild
index 7a56d842783..eae9513c0d1 100644
--- a/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/net-mail/gensig/gensig-2.3.ebuild b/net-mail/gensig/gensig-2.3.ebuild
index 6ea314410c4..f2064574f11 100644
--- a/net-mail/gensig/gensig-2.3.ebuild
+++ b/net-mail/gensig/gensig-2.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Random ~/.signature generator"
HOMEPAGE="http://www.geekthing.com/~robf/gensig/ChangeLog"
diff --git a/net-mail/getmail/getmail-4.52.0.ebuild b/net-mail/getmail/getmail-4.52.0.ebuild
index dc8464bb843..f95982f33d5 100644
--- a/net-mail/getmail/getmail-4.52.0.ebuild
+++ b/net-mail/getmail/getmail-4.52.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/net-mail/getmail/getmail-4.53.0.ebuild b/net-mail/getmail/getmail-4.53.0.ebuild
index 6b4c1360c04..a213f82d865 100644
--- a/net-mail/getmail/getmail-4.53.0.ebuild
+++ b/net-mail/getmail/getmail-4.53.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/net-mail/gnubiff/gnubiff-2.2.15-r2.ebuild b/net-mail/gnubiff/gnubiff-2.2.15-r2.ebuild
index 63e2f340fb1..42858029624 100644
--- a/net-mail/gnubiff/gnubiff-2.2.15-r2.ebuild
+++ b/net-mail/gnubiff/gnubiff-2.2.15-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils
diff --git a/net-mail/grepmail/grepmail-5.30.33-r2.ebuild b/net-mail/grepmail/grepmail-5.30.33-r2.ebuild
index 5046e60db8a..8944fb7b638 100644
--- a/net-mail/grepmail/grepmail-5.30.33-r2.ebuild
+++ b/net-mail/grepmail/grepmail-5.30.33-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/hotwayd/hotwayd-0.8.4.ebuild b/net-mail/hotwayd/hotwayd-0.8.4.ebuild
index 68f1506357c..26e68488a6a 100644
--- a/net-mail/hotwayd/hotwayd-0.8.4.ebuild
+++ b/net-mail/hotwayd/hotwayd-0.8.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/net-mail/imapsync/imapsync-1.592-r1.ebuild b/net-mail/imapsync/imapsync-1.592-r1.ebuild
index 57c87043d52..65e587b45b5 100644
--- a/net-mail/imapsync/imapsync-1.592-r1.ebuild
+++ b/net-mail/imapsync/imapsync-1.592-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/imapsync/imapsync-1.607-r1.ebuild b/net-mail/imapsync/imapsync-1.607-r1.ebuild
index 9cca9492513..b4513397c49 100644
--- a/net-mail/imapsync/imapsync-1.607-r1.ebuild
+++ b/net-mail/imapsync/imapsync-1.607-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/imapsync/imapsync-1.644.ebuild b/net-mail/imapsync/imapsync-1.644.ebuild
index b7267a92f80..c1758035bbc 100644
--- a/net-mail/imapsync/imapsync-1.644.ebuild
+++ b/net-mail/imapsync/imapsync-1.644.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/imapsync/imapsync-1.684.ebuild b/net-mail/imapsync/imapsync-1.684.ebuild
index 190ff67d7e3..7520990085d 100644
--- a/net-mail/imapsync/imapsync-1.684.ebuild
+++ b/net-mail/imapsync/imapsync-1.684.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/isync/isync-1.0.6.ebuild b/net-mail/isync/isync-1.0.6.ebuild
index 23873b1e75d..6ec6be6d3d4 100644
--- a/net-mail/isync/isync-1.0.6.ebuild
+++ b/net-mail/isync/isync-1.0.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils
diff --git a/net-mail/isync/isync-1.2.0.ebuild b/net-mail/isync/isync-1.2.0.ebuild
index fbf1b0ee3c5..0b53ac0d880 100644
--- a/net-mail/isync/isync-1.2.0.ebuild
+++ b/net-mail/isync/isync-1.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/isync/isync-1.2.1.ebuild b/net-mail/isync/isync-1.2.1.ebuild
index bd40d1e1611..b09a08848da 100644
--- a/net-mail/isync/isync-1.2.1.ebuild
+++ b/net-mail/isync/isync-1.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/kuvert/kuvert-2.0.4.ebuild b/net-mail/kuvert/kuvert-2.0.4.ebuild
index 768ced50c4c..18570068f80 100644
--- a/net-mail/kuvert/kuvert-2.0.4.ebuild
+++ b/net-mail/kuvert/kuvert-2.0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit toolchain-funcs
diff --git a/net-mail/lbdb/lbdb-0.39-r1.ebuild b/net-mail/lbdb/lbdb-0.39-r1.ebuild
index 9cd6c90157a..d84e7c42270 100644
--- a/net-mail/lbdb/lbdb-0.39-r1.ebuild
+++ b/net-mail/lbdb/lbdb-0.39-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/lbdb/lbdb-0.39.ebuild b/net-mail/lbdb/lbdb-0.39.ebuild
index cf6cc7981a1..89a3c98d490 100644
--- a/net-mail/lbdb/lbdb-0.39.ebuild
+++ b/net-mail/lbdb/lbdb-0.39.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/lbdb/lbdb-0.41.ebuild b/net-mail/lbdb/lbdb-0.41.ebuild
index 571ada55515..9bc42cb1b34 100644
--- a/net-mail/lbdb/lbdb-0.41.ebuild
+++ b/net-mail/lbdb/lbdb-0.41.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/lbdb/lbdb-0.42.ebuild b/net-mail/lbdb/lbdb-0.42.ebuild
index bce51c9aedd..5ac47600a38 100644
--- a/net-mail/lbdb/lbdb-0.42.ebuild
+++ b/net-mail/lbdb/lbdb-0.42.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/libdbx/libdbx-1.0.3.ebuild b/net-mail/libdbx/libdbx-1.0.3.ebuild
index 7fbfd71aaa4..4f8dd3227f7 100644
--- a/net-mail/libdbx/libdbx-1.0.3.ebuild
+++ b/net-mail/libdbx/libdbx-1.0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/libpst/libpst-0.6.64-r1.ebuild b/net-mail/libpst/libpst-0.6.64-r1.ebuild
index e6924030630..88ab640dc3c 100644
--- a/net-mail/libpst/libpst-0.6.64-r1.ebuild
+++ b/net-mail/libpst/libpst-0.6.64-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/net-mail/libpst/libpst-0.6.66-r1.ebuild b/net-mail/libpst/libpst-0.6.66-r1.ebuild
index b4881a7abb4..6edb8f5a9dd 100644
--- a/net-mail/libpst/libpst-0.6.66-r1.ebuild
+++ b/net-mail/libpst/libpst-0.6.66-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild b/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild
index 5701833f6c8..6118538101f 100644
--- a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild
+++ b/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/mailbase/mailbase-1.1.ebuild b/net-mail/mailbase/mailbase-1.1.ebuild
index e71fca173a2..27f616b7313 100644
--- a/net-mail/mailbase/mailbase-1.1.ebuild
+++ b/net-mail/mailbase/mailbase-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit pam eutils user
diff --git a/net-mail/mailbase/mailbase-1.ebuild b/net-mail/mailbase/mailbase-1.ebuild
index de0a56e8022..b7b4232af14 100644
--- a/net-mail/mailbase/mailbase-1.ebuild
+++ b/net-mail/mailbase/mailbase-1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit pam eutils user
diff --git a/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild b/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild
index 2fc2721c9df..a4c8cb579c8 100644
--- a/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild
+++ b/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/maildirtree/maildirtree-0.6-r1.ebuild b/net-mail/maildirtree/maildirtree-0.6-r1.ebuild
index c95ac5237f2..d880ea1dc78 100644
--- a/net-mail/maildirtree/maildirtree-0.6-r1.ebuild
+++ b/net-mail/maildirtree/maildirtree-0.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/mailfront/mailfront-0.88.ebuild b/net-mail/mailfront/mailfront-0.88.ebuild
index 2c8805fb87f..f95422c8171 100644
--- a/net-mail/mailfront/mailfront-0.88.ebuild
+++ b/net-mail/mailfront/mailfront-0.88.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit fixheadtails toolchain-funcs
diff --git a/net-mail/mailfront/mailfront-0.98.ebuild b/net-mail/mailfront/mailfront-0.98.ebuild
index b9da1be25cc..884d59a1395 100644
--- a/net-mail/mailfront/mailfront-0.98.ebuild
+++ b/net-mail/mailfront/mailfront-0.98.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs
diff --git a/net-mail/mailfront/mailfront-1.12.ebuild b/net-mail/mailfront/mailfront-1.12.ebuild
index d5bd055009d..3ff971dea19 100644
--- a/net-mail/mailfront/mailfront-1.12.ebuild
+++ b/net-mail/mailfront/mailfront-1.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/net-mail/mailfront/mailfront-1.16.ebuild b/net-mail/mailfront/mailfront-1.16.ebuild
index 810015815d4..71d144870dd 100644
--- a/net-mail/mailfront/mailfront-1.16.ebuild
+++ b/net-mail/mailfront/mailfront-1.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/net-mail/mailgraph/mailgraph-1.14-r2.ebuild b/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
index 304884db2a4..732d4934e48 100644
--- a/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
+++ b/net-mail/mailgraph/mailgraph-1.14-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit eutils user
diff --git a/net-mail/mailman/mailman-2.1.23.ebuild b/net-mail/mailman/mailman-2.1.23.ebuild
index 119af504344..93ca858b5dc 100644
--- a/net-mail/mailman/mailman-2.1.23.ebuild
+++ b/net-mail/mailman/mailman-2.1.23.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/mailshears/mailshears-0.0.2-r1.ebuild b/net-mail/mailshears/mailshears-0.0.2-r1.ebuild
index 8cc176cbe23..37b1ac25499 100644
--- a/net-mail/mailshears/mailshears-0.0.2-r1.ebuild
+++ b/net-mail/mailshears/mailshears-0.0.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/mailsync/mailsync-5.2.1.ebuild b/net-mail/mailsync/mailsync-5.2.1.ebuild
index 3616b0790ef..89143e1b0c7 100644
--- a/net-mail/mailsync/mailsync-5.2.1.ebuild
+++ b/net-mail/mailsync/mailsync-5.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="A mailbox synchronizer"
HOMEPAGE="http://mailsync.sourceforge.net/"
diff --git a/net-mail/mailutils/mailutils-2.99.98-r1.ebuild b/net-mail/mailutils/mailutils-2.99.98-r1.ebuild
index 74dbd22bb08..b42056d47ef 100644
--- a/net-mail/mailutils/mailutils-2.99.98-r1.ebuild
+++ b/net-mail/mailutils/mailutils-2.99.98-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/net-mail/mailutils/mailutils-3.1.1.ebuild b/net-mail/mailutils/mailutils-3.1.1.ebuild
index a39a4cf723f..ce0e5fa4f2f 100644
--- a/net-mail/mailutils/mailutils-3.1.1.ebuild
+++ b/net-mail/mailutils/mailutils-3.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/net-mail/mairix/mairix-0.23.ebuild b/net-mail/mairix/mairix-0.23.ebuild
index 9d8891a0f70..a39bc552fb9 100644
--- a/net-mail/mairix/mairix-0.23.ebuild
+++ b/net-mail/mairix/mairix-0.23.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild b/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild
index 397c2ea907e..3f990709627 100644
--- a/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild
+++ b/net-mail/mboxgrep/mboxgrep-0.7.9-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/mess822/mess822-0.58-r2.ebuild b/net-mail/mess822/mess822-0.58-r2.ebuild
index 43674bbd144..95c6b44751e 100644
--- a/net-mail/mess822/mess822-0.58-r2.ebuild
+++ b/net-mail/mess822/mess822-0.58-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/metamail/metamail-2.7.53.3-r1.ebuild b/net-mail/metamail/metamail-2.7.53.3-r1.ebuild
index 04379b6edb6..feffd01cf43 100644
--- a/net-mail/metamail/metamail-2.7.53.3-r1.ebuild
+++ b/net-mail/metamail/metamail-2.7.53.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r1.ebuild b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r1.ebuild
index d67a35c3df7..80e6f53e637 100644
--- a/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r1.ebuild
+++ b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r2.ebuild b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r2.ebuild
index 8af0c4f0fba..2b646147897 100644
--- a/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r2.ebuild
+++ b/net-mail/mhonarc-gentoo/mhonarc-gentoo-2.6.18-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/mhonarc/mhonarc-2.6.18-r2.ebuild b/net-mail/mhonarc/mhonarc-2.6.18-r2.ebuild
index 0805b869967..a1c2f869f39 100644
--- a/net-mail/mhonarc/mhonarc-2.6.18-r2.ebuild
+++ b/net-mail/mhonarc/mhonarc-2.6.18-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/mlmmj/mlmmj-1.2.18.0.ebuild b/net-mail/mlmmj/mlmmj-1.2.18.0.ebuild
index 5255e67c73c..9e589d0d553 100644
--- a/net-mail/mlmmj/mlmmj-1.2.18.0.ebuild
+++ b/net-mail/mlmmj/mlmmj-1.2.18.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/mlmmj/mlmmj-1.2.18.1.ebuild b/net-mail/mlmmj/mlmmj-1.2.18.1.ebuild
index ddc5dca600f..b770d08ecbb 100644
--- a/net-mail/mlmmj/mlmmj-1.2.18.1.ebuild
+++ b/net-mail/mlmmj/mlmmj-1.2.18.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/mlmmj/mlmmj-1.2.19.0-r1.ebuild b/net-mail/mlmmj/mlmmj-1.2.19.0-r1.ebuild
index b4a9d2d639d..e8297ba5e0b 100644
--- a/net-mail/mlmmj/mlmmj-1.2.19.0-r1.ebuild
+++ b/net-mail/mlmmj/mlmmj-1.2.19.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild b/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild
index 570154ee3ad..b0c02c35f4d 100644
--- a/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild
+++ b/net-mail/mlmmj/mlmmj-1.2.19.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/mpack/mpack-1.6-r3.ebuild b/net-mail/mpack/mpack-1.6-r3.ebuild
index 5a25600aa5c..5016cc6747d 100644
--- a/net-mail/mpack/mpack-1.6-r3.ebuild
+++ b/net-mail/mpack/mpack-1.6-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
diff --git a/net-mail/mpop/mpop-1.2.4.ebuild b/net-mail/mpop/mpop-1.2.4.ebuild
index 4c5f7f5d7a0..88d21a14ec4 100644
--- a/net-mail/mpop/mpop-1.2.4.ebuild
+++ b/net-mail/mpop/mpop-1.2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/mpop/mpop-1.2.5.ebuild b/net-mail/mpop/mpop-1.2.5.ebuild
index 4c5f7f5d7a0..88d21a14ec4 100644
--- a/net-mail/mpop/mpop-1.2.5.ebuild
+++ b/net-mail/mpop/mpop-1.2.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/mpop/mpop-1.2.6.ebuild b/net-mail/mpop/mpop-1.2.6.ebuild
index 4c5f7f5d7a0..88d21a14ec4 100644
--- a/net-mail/mpop/mpop-1.2.6.ebuild
+++ b/net-mail/mpop/mpop-1.2.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/mswatch/mswatch-1.2.0.ebuild b/net-mail/mswatch/mswatch-1.2.0.ebuild
index 42e9fb2b6b5..7f4ba1a6d78 100644
--- a/net-mail/mswatch/mswatch-1.2.0.ebuild
+++ b/net-mail/mswatch/mswatch-1.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/net-mail/mu/mu-0.9.15-r1.ebuild b/net-mail/mu/mu-0.9.15-r1.ebuild
index b893a320ce5..e6830778b4c 100644
--- a/net-mail/mu/mu-0.9.15-r1.ebuild
+++ b/net-mail/mu/mu-0.9.15-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/mu/mu-0.9.16.ebuild b/net-mail/mu/mu-0.9.16.ebuild
index f7040dddc66..d6af3e33c34 100644
--- a/net-mail/mu/mu-0.9.16.ebuild
+++ b/net-mail/mu/mu-0.9.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/mu/mu-0.9.18-r1.ebuild b/net-mail/mu/mu-0.9.18-r1.ebuild
index 1c7ede160b5..0d23cc5c5d9 100644
--- a/net-mail/mu/mu-0.9.18-r1.ebuild
+++ b/net-mail/mu/mu-0.9.18-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/mu/mu-0.9.9.5.ebuild b/net-mail/mu/mu-0.9.9.5.ebuild
index 22c3fb0ad14..4dc7ccc9b7b 100644
--- a/net-mail/mu/mu-0.9.9.5.ebuild
+++ b/net-mail/mu/mu-0.9.9.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/mu/mu-0.9.9.6.ebuild b/net-mail/mu/mu-0.9.9.6.ebuild
index fe911321bc3..ce5b12b4561 100644
--- a/net-mail/mu/mu-0.9.9.6.ebuild
+++ b/net-mail/mu/mu-0.9.9.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/mu/mu-0.9.9.ebuild b/net-mail/mu/mu-0.9.9.ebuild
index 1cbc73bfbb6..dd243052a7b 100644
--- a/net-mail/mu/mu-0.9.9.ebuild
+++ b/net-mail/mu/mu-0.9.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/muchsync/muchsync-2.ebuild b/net-mail/muchsync/muchsync-2.ebuild
index c68b4c0b75d..fe3cae17ea4 100644
--- a/net-mail/muchsync/muchsync-2.ebuild
+++ b/net-mail/muchsync/muchsync-2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/nmzmail/nmzmail-1.1.ebuild b/net-mail/nmzmail/nmzmail-1.1.ebuild
index 5fe9f82f52c..9430669eb60 100644
--- a/net-mail/nmzmail/nmzmail-1.1.ebuild
+++ b/net-mail/nmzmail/nmzmail-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/net-mail/notmuch/notmuch-0.21.ebuild b/net-mail/notmuch/notmuch-0.21.ebuild
index 6cbb13aeba3..c124076b915 100644
--- a/net-mail/notmuch/notmuch-0.21.ebuild
+++ b/net-mail/notmuch/notmuch-0.21.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/notmuch/notmuch-0.22.2-r1.ebuild b/net-mail/notmuch/notmuch-0.22.2-r1.ebuild
index 7f0ade722ab..f91a2240ed3 100644
--- a/net-mail/notmuch/notmuch-0.22.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.22.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/notmuch/notmuch-0.23.3.ebuild b/net-mail/notmuch/notmuch-0.23.3.ebuild
index 9799558eccc..7b4c95b389f 100644
--- a/net-mail/notmuch/notmuch-0.23.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/notmuch/notmuch-0.23.5.ebuild b/net-mail/notmuch/notmuch-0.23.5.ebuild
index 86e50bb2204..c5ea1b03fe8 100644
--- a/net-mail/notmuch/notmuch-0.23.5.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/offlineimap/offlineimap-6.5.6.ebuild b/net-mail/offlineimap/offlineimap-6.5.6.ebuild
index 897aab29202..19dcb8983d0 100644
--- a/net-mail/offlineimap/offlineimap-6.5.6.ebuild
+++ b/net-mail/offlineimap/offlineimap-6.5.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/offlineimap/offlineimap-6.7.0.3.ebuild b/net-mail/offlineimap/offlineimap-6.7.0.3.ebuild
index a1670311235..cc24bff5c4c 100644
--- a/net-mail/offlineimap/offlineimap-6.7.0.3.ebuild
+++ b/net-mail/offlineimap/offlineimap-6.7.0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/offlineimap/offlineimap-7.0.10.ebuild b/net-mail/offlineimap/offlineimap-7.0.10.ebuild
index 2915dc79919..a2e610a199b 100644
--- a/net-mail/offlineimap/offlineimap-7.0.10.ebuild
+++ b/net-mail/offlineimap/offlineimap-7.0.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/offlineimap/offlineimap-7.0.12.ebuild b/net-mail/offlineimap/offlineimap-7.0.12.ebuild
index 2915dc79919..a2e610a199b 100644
--- a/net-mail/offlineimap/offlineimap-7.0.12.ebuild
+++ b/net-mail/offlineimap/offlineimap-7.0.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/offlineimap/offlineimap-7.0.13.ebuild b/net-mail/offlineimap/offlineimap-7.0.13.ebuild
index 5371221d69b..c38b4b23157 100644
--- a/net-mail/offlineimap/offlineimap-7.0.13.ebuild
+++ b/net-mail/offlineimap/offlineimap-7.0.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/peephole/peephole-1.5.ebuild b/net-mail/peephole/peephole-1.5.ebuild
index 0f383b4c2b3..cb0997b2f42 100644
--- a/net-mail/peephole/peephole-1.5.ebuild
+++ b/net-mail/peephole/peephole-1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/net-mail/pflogsumm/pflogsumm-1.1.5.ebuild b/net-mail/pflogsumm/pflogsumm-1.1.5.ebuild
index 96138e9c17e..b9f9773e606 100644
--- a/net-mail/pflogsumm/pflogsumm-1.1.5.ebuild
+++ b/net-mail/pflogsumm/pflogsumm-1.1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Pflogsumm is a log analyzer for Postfix logs"
HOMEPAGE="http://jimsun.linxnet.com/postfix_contrib.html"
diff --git a/net-mail/pfqueue/pfqueue-0.5.6.ebuild b/net-mail/pfqueue/pfqueue-0.5.6.ebuild
index e778f6f02c4..806a9322369 100644
--- a/net-mail/pfqueue/pfqueue-0.5.6.ebuild
+++ b/net-mail/pfqueue/pfqueue-0.5.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils toolchain-funcs
diff --git a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
index 488bb005c26..89c00b0fa81 100644
--- a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
+++ b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/pop2imap/pop2imap-1.18.ebuild b/net-mail/pop2imap/pop2imap-1.18.ebuild
index ed716b1fbc2..4da06b095bc 100644
--- a/net-mail/pop2imap/pop2imap-1.18.ebuild
+++ b/net-mail/pop2imap/pop2imap-1.18.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/pop2imap/pop2imap-1.21.ebuild b/net-mail/pop2imap/pop2imap-1.21.ebuild
index 0b72172559a..5122fc25d85 100644
--- a/net-mail/pop2imap/pop2imap-1.21.ebuild
+++ b/net-mail/pop2imap/pop2imap-1.21.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild b/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
index 52b0728d0cc..6ef18a84297 100644
--- a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
+++ b/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit eutils toolchain-funcs user
diff --git a/net-mail/popick/popick-0.1.ebuild b/net-mail/popick/popick-0.1.ebuild
index 103cff6b695..e4286fd8aab 100644
--- a/net-mail/popick/popick-0.1.ebuild
+++ b/net-mail/popick/popick-0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild
index 10859533158..b9029a221c8 100644
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild
+++ b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs pam portability
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild
index a334d4446e3..ff5a2b157ec 100644
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild
+++ b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs pam portability
diff --git a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild
index 99d064ad9ca..375d2ed98b4 100644
--- a/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild
+++ b/net-mail/postfix-logwatch/postfix-logwatch-1.40.03.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/qlogtools/qlogtools-3.1.ebuild b/net-mail/qlogtools/qlogtools-3.1.ebuild
index aa9070f6067..42b1c28b8cb 100644
--- a/net-mail/qlogtools/qlogtools-3.1.ebuild
+++ b/net-mail/qlogtools/qlogtools-3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild
index 85c3cdbc3c7..d7c0c1da018 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild
index 1f42f345795..6950af0af69 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/net-mail/qmail-lint/qmail-lint-0.55.ebuild b/net-mail/qmail-lint/qmail-lint-0.55.ebuild
index 397f25e557c..6e6f8e316da 100644
--- a/net-mail/qmail-lint/qmail-lint-0.55.ebuild
+++ b/net-mail/qmail-lint/qmail-lint-0.55.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="qmail-lint checks your qmail configuration for common problems"
HOMEPAGE="http://www.qmail.org/"
diff --git a/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild b/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild
index d815eedc6a0..d82f98d1d07 100644
--- a/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild
+++ b/net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs
diff --git a/net-mail/qmail-qfilter/qmail-qfilter-2.1-r1.ebuild b/net-mail/qmail-qfilter/qmail-qfilter-2.1-r1.ebuild
index 65f11070bbe..d918e846aea 100644
--- a/net-mail/qmail-qfilter/qmail-qfilter-2.1-r1.ebuild
+++ b/net-mail/qmail-qfilter/qmail-qfilter-2.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/net-mail/qmail-qfilter/qmail-qfilter-2.1.ebuild b/net-mail/qmail-qfilter/qmail-qfilter-2.1.ebuild
index d5482fd46b1..1ff57de295b 100644
--- a/net-mail/qmail-qfilter/qmail-qfilter-2.1.ebuild
+++ b/net-mail/qmail-qfilter/qmail-qfilter-2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs
diff --git a/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild b/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild
index bdd23f511c3..16a155e587d 100644
--- a/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild
+++ b/net-mail/qmail-qsanity/qmail-qsanity-0.52.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="qmail-qsanity checks your queue data structures for internal consistency"
HOMEPAGE="http://www.qmail.org/"
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild
index c0b428c0fb8..03103df34d1 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild
index 2e1d8ca177f..72b043e6e48 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit qmail eutils webapp
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
index 878472e1c50..ac996e0daec 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit qmail eutils webapp autotools
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild
index d139c04c4a9..03817b4d3ed 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit qmail eutils webapp autotools
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
index c67c5dbf27f..cf2bb9ac919 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit qmail eutils webapp autotools
diff --git a/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild b/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild
index 6407b2c0396..604881b3554 100644
--- a/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild
+++ b/net-mail/qmailanalog/qmailanalog-0.70-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils fixheadtails toolchain-funcs
diff --git a/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild b/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild
index 2237291b4e1..bc516bd1c20 100644
--- a/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild
+++ b/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/net-mail/qmhandle/qmhandle-1.3.2.ebuild b/net-mail/qmhandle/qmhandle-1.3.2.ebuild
index ff6e0383888..2bf3394612c 100644
--- a/net-mail/qmhandle/qmhandle-1.3.2.ebuild
+++ b/net-mail/qmhandle/qmhandle-1.3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/net-mail/qmrtg/qmrtg-2.1-r1.ebuild b/net-mail/qmrtg/qmrtg-2.1-r1.ebuild
index 17a1ddcdc3b..dad4124cce5 100644
--- a/net-mail/qmrtg/qmrtg-2.1-r1.ebuild
+++ b/net-mail/qmrtg/qmrtg-2.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils
diff --git a/net-mail/qpopper/qpopper-4.1.0.ebuild b/net-mail/qpopper/qpopper-4.1.0.ebuild
index 3905e974e1c..e9b1d4e5b43 100644
--- a/net-mail/qpopper/qpopper-4.1.0.ebuild
+++ b/net-mail/qpopper/qpopper-4.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
#inherit eutils flag-o-matic ssl-cert
diff --git a/net-mail/qprint/qprint-1.0.ebuild b/net-mail/qprint/qprint-1.0.ebuild
index 1f7f365f75c..cd6d620d27c 100644
--- a/net-mail/qprint/qprint-1.0.ebuild
+++ b/net-mail/qprint/qprint-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="MIME quoted-printable data encoding and decoding utility"
HOMEPAGE="http://www.fourmilab.ch/webtools/qprint/"
diff --git a/net-mail/qprint/qprint-1.1.ebuild b/net-mail/qprint/qprint-1.1.ebuild
index 2e013798935..59789807acb 100644
--- a/net-mail/qprint/qprint-1.1.ebuild
+++ b/net-mail/qprint/qprint-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/qtools/qtools-0.56.ebuild b/net-mail/qtools/qtools-0.56.ebuild
index 9771cdde60b..19b2f5e5da2 100644
--- a/net-mail/qtools/qtools-0.56.ebuild
+++ b/net-mail/qtools/qtools-0.56.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/net-mail/queue-fix/queue-fix-1.4-r2.ebuild b/net-mail/queue-fix/queue-fix-1.4-r2.ebuild
index 645233562b4..3c5a3046315 100644
--- a/net-mail/queue-fix/queue-fix-1.4-r2.ebuild
+++ b/net-mail/queue-fix/queue-fix-1.4-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs fixheadtails
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
index 33bcb55bbde..82fc8505b5c 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-mail/queue-repair/queue-repair-0.9.0.ebuild b/net-mail/queue-repair/queue-repair-0.9.0.ebuild
index b928f2f8d2a..3a25dbdca27 100644
--- a/net-mail/queue-repair/queue-repair-0.9.0.ebuild
+++ b/net-mail/queue-repair/queue-repair-0.9.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/net-mail/randomsig/randomsig-1.10.0.ebuild b/net-mail/randomsig/randomsig-1.10.0.ebuild
index 40e4d63911d..f3b6f0000e8 100644
--- a/net-mail/randomsig/randomsig-1.10.0.ebuild
+++ b/net-mail/randomsig/randomsig-1.10.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MY_P=${PN}-v${PV}
S=${WORKDIR}/${MY_P}
diff --git a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
index dc56d242721..8e04095c233 100644
--- a/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
+++ b/net-mail/relay-ctrl/relay-ctrl-3.1.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs fixheadtails
diff --git a/net-mail/renattach/renattach-1.2.4-r1.ebuild b/net-mail/renattach/renattach-1.2.4-r1.ebuild
index cfce65526c1..d89611b23f1 100644
--- a/net-mail/renattach/renattach-1.2.4-r1.ebuild
+++ b/net-mail/renattach/renattach-1.2.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/ripmime/ripmime-1.4.0.10.ebuild b/net-mail/ripmime/ripmime-1.4.0.10.ebuild
index 517f67dc46e..36bdac2eeef 100644
--- a/net-mail/ripmime/ripmime-1.4.0.10.ebuild
+++ b/net-mail/ripmime/ripmime-1.4.0.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/net-mail/ripole/ripole-0.2.1.ebuild b/net-mail/ripole/ripole-0.2.1.ebuild
index 43744da95c2..5e8fab2f787 100644
--- a/net-mail/ripole/ripole-0.2.1.ebuild
+++ b/net-mail/ripole/ripole-0.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/ripole/ripole-0.2.2.ebuild b/net-mail/ripole/ripole-0.2.2.ebuild
index 494985e91ad..b2830570efa 100644
--- a/net-mail/ripole/ripole-0.2.2.ebuild
+++ b/net-mail/ripole/ripole-0.2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/rss2email/rss2email-2.71-r1.ebuild b/net-mail/rss2email/rss2email-2.71-r1.ebuild
index 761abf70378..7c477764c71 100644
--- a/net-mail/rss2email/rss2email-2.71-r1.ebuild
+++ b/net-mail/rss2email/rss2email-2.71-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/net-mail/safecat/safecat-1.13.ebuild b/net-mail/safecat/safecat-1.13.ebuild
index fc04694450a..78dc3a09942 100644
--- a/net-mail/safecat/safecat-1.13.ebuild
+++ b/net-mail/safecat/safecat-1.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
diff --git a/net-mail/sendEmail/sendEmail-1.56-r1.ebuild b/net-mail/sendEmail/sendEmail-1.56-r1.ebuild
index 44cb5a93ece..65f4ff4912f 100644
--- a/net-mail/sendEmail/sendEmail-1.56-r1.ebuild
+++ b/net-mail/sendEmail/sendEmail-1.56-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
MY_P="${PN}-v${PV}"
diff --git a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild
index f2af001c0f8..aaa924980ff 100644
--- a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild
+++ b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
MY_P="${PN}-v${PV}"
diff --git a/net-mail/serialmail/serialmail-0.75-r4.ebuild b/net-mail/serialmail/serialmail-0.75-r4.ebuild
index 3e32c5aaa59..bf0fede65d3 100644
--- a/net-mail/serialmail/serialmail-0.75-r4.ebuild
+++ b/net-mail/serialmail/serialmail-0.75-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/signify/signify-1.14.ebuild b/net-mail/signify/signify-1.14.ebuild
index f1ca3621836..f3ec72a5e45 100644
--- a/net-mail/signify/signify-1.14.ebuild
+++ b/net-mail/signify/signify-1.14.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
S=${WORKDIR}/${PN}
diff --git a/net-mail/smtptools/smtptools-0.2.3.ebuild b/net-mail/smtptools/smtptools-0.2.3.ebuild
index 1ee6b2ffe17..875d3efd46d 100644
--- a/net-mail/smtptools/smtptools-0.2.3.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/net-mail/spamcup/spamcup-1.09.ebuild b/net-mail/spamcup/spamcup-1.09.ebuild
index 4bda4506fc3..aba9275fab0 100644
--- a/net-mail/spamcup/spamcup-1.09.ebuild
+++ b/net-mail/spamcup/spamcup-1.09.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="This script does the same you would do when you report spam with your browser in Spamcop.net"
HOMEPAGE="https://sourceforge.net/projects/spamcup/"
diff --git a/net-mail/swaks/swaks-20130209.0-r1.ebuild b/net-mail/swaks/swaks-20130209.0-r1.ebuild
index 046cb9acae8..cfbd70a8466 100644
--- a/net-mail/swaks/swaks-20130209.0-r1.ebuild
+++ b/net-mail/swaks/swaks-20130209.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils
diff --git a/net-mail/swaks/swaks-20130209.0.ebuild b/net-mail/swaks/swaks-20130209.0.ebuild
index ae07f3aea1d..66fde1889c5 100644
--- a/net-mail/swaks/swaks-20130209.0.ebuild
+++ b/net-mail/swaks/swaks-20130209.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH"
HOMEPAGE="http://www.jetmore.org/john/code/swaks"
diff --git a/net-mail/t-prot/t-prot-3.4.ebuild b/net-mail/t-prot/t-prot-3.4.ebuild
index f5228a6a121..e4bf5442e85 100644
--- a/net-mail/t-prot/t-prot-3.4.ebuild
+++ b/net-mail/t-prot/t-prot-3.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/tnef/tnef-1.4.12.ebuild b/net-mail/tnef/tnef-1.4.12.ebuild
index 4f369acacd6..cf2ef379f91 100644
--- a/net-mail/tnef/tnef-1.4.12.ebuild
+++ b/net-mail/tnef/tnef-1.4.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/topal/topal-75.ebuild b/net-mail/topal/topal-75.ebuild
index ea45e3c7aee..0e589754f97 100644
--- a/net-mail/topal/topal-75.ebuild
+++ b/net-mail/topal/topal-75.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/tpop3d/tpop3d-1.5.5.ebuild b/net-mail/tpop3d/tpop3d-1.5.5.ebuild
index 8db872aea41..35a5b6a9209 100644
--- a/net-mail/tpop3d/tpop3d-1.5.5.ebuild
+++ b/net-mail/tpop3d/tpop3d-1.5.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild b/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild
index a6aef1ecd1c..accddba1743 100644
--- a/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild
+++ b/net-mail/up-imapproxy/up-imapproxy-1.2.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/uw-imap/uw-imap-2007f-r1.ebuild b/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
index fcacbbc643d..0e4154f69a6 100644
--- a/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
+++ b/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/uw-imap/uw-imap-2007f.ebuild b/net-mail/uw-imap/uw-imap-2007f.ebuild
index c4fdb4ae492..b0baee1ca4e 100644
--- a/net-mail/uw-imap/uw-imap-2007f.ebuild
+++ b/net-mail/uw-imap/uw-imap-2007f.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild b/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild
index 63b3941c97c..55ed9cd6938 100644
--- a/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild
+++ b/net-mail/uw-mailutils/uw-mailutils-2007f.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/vacation/vacation-1.2.7.0.ebuild b/net-mail/vacation/vacation-1.2.7.0.ebuild
index 6c0572fae63..2eaf3b4e99a 100644
--- a/net-mail/vacation/vacation-1.2.7.0.ebuild
+++ b/net-mail/vacation/vacation-1.2.7.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/net-mail/vchkuser/vchkuser-0.4.ebuild b/net-mail/vchkuser/vchkuser-0.4.ebuild
index 57deb6baf47..f007e274eae 100644
--- a/net-mail/vchkuser/vchkuser-0.4.ebuild
+++ b/net-mail/vchkuser/vchkuser-0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
index 90f1eb27f24..ecc09b21af2 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
index 798162c4616..0084ce003a7 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-mail/vqadmin/vqadmin-2.3.7.ebuild b/net-mail/vqadmin/vqadmin-2.3.7.ebuild
index 227287639b9..5bbf2374db4 100644
--- a/net-mail/vqadmin/vqadmin-2.3.7.ebuild
+++ b/net-mail/vqadmin/vqadmin-2.3.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit webapp eutils autotools qmail
diff --git a/net-mail/yosucker/yosucker-73.ebuild b/net-mail/yosucker/yosucker-73.ebuild
index 26b756dd42f..004f6eedd9e 100644
--- a/net-mail/yosucker/yosucker-73.ebuild
+++ b/net-mail/yosucker/yosucker-73.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/net-mail/yosucker/yosucker-77.ebuild b/net-mail/yosucker/yosucker-77.ebuild
index 535e222aded..88c543b6272 100644
--- a/net-mail/yosucker/yosucker-77.ebuild
+++ b/net-mail/yosucker/yosucker-77.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MY_P="YoSucker-pr${PV}"
S=${WORKDIR}/${MY_P}