gentoo resync : 18.12.2017

9 files changed, 20 insertions, 401 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index ced14cbcc8d4..04ebb71d313c 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index fe1fdfbd0e13..be62630449ce 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,10 +1,8 @@
 AUX claws-mail-3.15.0-old_profile_segfault.patch 2758 BLAKE2B 64b98598814de6ac03894a7750a1da40edda7b8468c32b87f74c83f1fd6027c51d1804a95570909525630b7aff6f1eac81c1d8ad55f87538f32f03bac85aad83 SHA512 3ef1a001b6817d42b626754160aeb971263cca066294d9683403079d08eadbe86a9661ff6dbc8f3034c10db12d6d8b99a74f22f315b03fcf6e8ee581ca44583b
-DIST claws-mail-3.13.2.tar.xz 5582600 BLAKE2B c1dd3e86e4b36e2823c910ddce6541a18ef693935994e6be9492496dcfced4263c389e893c807a32d019ac06f7382df8eabfe737f4cf4f2fc529c69e31131a95 SHA512 7356a4286fc76e215746de846f412e80b4d21c3be90ac8edd7719be2874569f953ce5c094e4a20b0c467db994d710135fc14bcb01f8fb4e947bf7d1666261ea3
-DIST claws-mail-3.14.1.tar.xz 5812444 BLAKE2B ba4f65a594bb824fe37ef8dc470fae0b8c0bd416fa6e60f712be0808203d9786aace04fcb8091c6caf38c718a49511629a121bcd9a979643bca013b69af2c203 SHA512 ee1653ebd14b8aee76e97ce81ec203e0beeea7074eba0aa34c69bceb0a80135cdb16e508009cb479047d5112abd7eaa4bdb7e46722f33a88419fb24eeb75ac30
 DIST claws-mail-3.15.0.tar.xz 5665648 BLAKE2B f25356372b65f2df072eb2774fca87514c2da59811e78650e26ae58c1b518e229cba62cf1b0d0ad72107e292c9d87450f7d2508c02f34c5c9c70d944f9866823 SHA512 667cb0ea2f7c5d8e8b6046313ed7698c378f504caeeaa54348ba228317538dfc040e4ddf80f4aaa1491858a7803954e89599b1e479febe7cf1ab4bae5a638dc8
 DIST claws-mail-3.15.1.tar.xz 5665468 BLAKE2B c6d4c5875f82f836815193b330427bdd533be5445706fc437b1c30be8e52325a2b824e8a1d1332bb286ac9ea2bd4b872943709d9ff78b20a6a3ff5b781808d25 SHA512 11113ab2bc75571b9a71b11ee3f7fe4773ff7b17132f29e6637aa7b7b9a7f8ed125430ee7e5ab5c9842463d776a96be150d7c8e1e3d682b955dd582a6a6ce68c
-EBUILD claws-mail-3.13.2.ebuild 5610 BLAKE2B 4bbe46b7ee7c0615a59c71c97222fd32f4fbba580fbe38e9f75fecefe66612aa8048fe35604998fb36ff805eaf1911c2372f5e1c6105d8663a9288699684aee3 SHA512 3e51d2f66fed531e77b498210026bc23362e092f775a60cf24695490e405880c7a45c99ba48b31679acdd57bfe613db1f850b7f645e244b341ee66ebbc7b398d
-EBUILD claws-mail-3.14.1-r1.ebuild 5570 BLAKE2B 4aab7e9636a2148e4258fb61e7f7e00c439aa9955bb599aada5de82eb0d1623b4d25b2a20ef490ca284a337786824af94fcb27a36c55b16b875a032363af482f SHA512 6b3913627ae1c11ede1f9c07b44206445ff0713cd725c6b02c86eeb856264e5a00f5080ca29dd871401b6041aae82af0b9b3a7b23c9c06d2ef12f63d8d582a76
+DIST claws-mail-3.16.0.tar.xz 5913948 BLAKE2B 6744045de6bc3945221569a9ae1cdcd849ec11c4f5dbfe966ca70c7c2ab3f5d9ded1dbd5bcedffdc756809c1802d31d955b5c6c53f20a00be5abc861db340d0f SHA512 5c96e21b4c5117b67ccfe4178c68e2f1b1449f882d6ecf22041e41f08fd607c6ce7afe6c7fdbd039da7ffc5673d366551b15d3e4b7de8d758fc1554a8eadc55e
 EBUILD claws-mail-3.15.0-r2.ebuild 5772 BLAKE2B 0425ac3ea56b9877d29ff7423c1f819563657c313e4de0e0e7269a0d4289480394fba59ca2399af40cb6dc74ac0b8064e9c6377b5bd032c3a13d931601b56bb8 SHA512 dc8cec723c25881eb73c876996ac48ef95a5d3c19cb4ce2eb55a7e37b33b7c1b3549f462d21f0a8204199c590205933a334004b9b810e42bc520572c1a3b511a
 EBUILD claws-mail-3.15.1.ebuild 5715 BLAKE2B 2ad97877ac1c200044d6419922396c7e8f389df75aaee53f80f04cb551ee2463d09592b0cd4d90758fef09016f7a1a26d615036d58630146a2ee17fbcb1b0b3d SHA512 a27fbf82daa240cb27975ebc254ae9a7cf4b04d6cb6750276a91b7746579a5bb561172c73b7a8e384adc0c7eca419e198cd5241c5350399c5d19ece1bb9aa396
-MISC metadata.xml 1716 BLAKE2B 7822f11d535e99ac8ce2a918b5aef1f0979f045e1f4422d66d41e0af8a78d2e3b14791a172d8ccb6eaa7c1cd73a7596662114dbd16cea07b102b4d65d1e94739 SHA512 2246148a5fe3ecd1b097a1037ba08ef2c175b7d93ceaeb7e9b2a49b9397a47e9f98e4a510f3f2224e94a3aa7982af2b77df2c917496a01c44602e866924b3a5b
+EBUILD claws-mail-3.16.0.ebuild 5715 BLAKE2B 2ad97877ac1c200044d6419922396c7e8f389df75aaee53f80f04cb551ee2463d09592b0cd4d90758fef09016f7a1a26d615036d58630146a2ee17fbcb1b0b3d SHA512 a27fbf82daa240cb27975ebc254ae9a7cf4b04d6cb6750276a91b7746579a5bb561172c73b7a8e384adc0c7eca419e198cd5241c5350399c5d19ece1bb9aa396
+MISC metadata.xml 1601 BLAKE2B 7827fe2821ee1e9a6ddc747f269de28106a0ad9855fce1a298a0bef5a00de1383d0798bd3239e888dd0f88b477112ec14d4dcb9488c1709d6064b9fe9a2bad13 SHA512 824a2702d57d86e0ebfd451e12f374010559956e5770c65028c819b799de4e72a156c80587278fff7d246a5f402aeee8a30fae53a4c84a8922cd050a7c1c9340
diff --git a/mail-client/claws-mail/claws-mail-3.13.2.ebuild b/mail-client/claws-mail/claws-mail-3.13.2.ebuild
deleted file mode 100644
index 3f0fc0bfdde9..000000000000
--- a/mail-client/claws-mail/claws-mail-3.13.2.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib gnome2-utils eutils python-single-r1
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
-
-SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
-REQUIRED_USE="libcanberra? ( notification )
-	libindicate? ( notification )
-	libnotify? ( notification )
-	networkmanager? ( dbus )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	smime? ( pgp )"
-
-COMMONDEPEND=">=sys-devel/gettext-0.12.1
-	gdata? ( >=dev-libs/libgdata-0.17.1 )
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( >=x11-libs/gtk+-2.20:2 )
-	pda? ( >=app-pda/jpilot-0.99 )
-	gnutls? ( >=net-libs/gnutls-2.2.0 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	pgp? ( >=app-crypt/gpgme-0.4.5 )
-	valgrind? ( dev-util/valgrind )
-	dbus? ( >=dev-libs/dbus-glib-0.60 )
-	spell? ( >=app-text/enchant-1.0.0 )
-	imap? ( >=net-libs/libetpan-0.57 )
-	nntp? ( >=net-libs/libetpan-0.57 )
-	startup-notification? ( x11-libs/startup-notification )
-	session? ( x11-libs/libSM
-			x11-libs/libICE )
-	archive? ( app-arch/libarchive
-		>=net-misc/curl-7.9.7 )
-	bogofilter? ( mail-filter/bogofilter )
-	notification? (
-		libnotify? ( x11-libs/libnotify )
-		libcanberra? (  media-libs/libcanberra[gtk] )
-		libindicate? ( dev-libs/libindicate:3[gtk] )
-		dev-libs/glib:2
-	)
-	smime? ( >=app-crypt/gpgme-0.4.5 )
-	calendar? ( >=net-misc/curl-7.9.7 )
-	pdf? ( app-text/poppler[cairo] )
-	spam-report? ( >=net-misc/curl-7.9.7 )
-	webkit? ( >=net-libs/webkit-gtk-1.0:2 )
-"
-
-DEPEND="${COMMONDEPEND}
-	app-arch/xz-utils
-	xface? ( >=media-libs/compface-1.4 )
-	virtual/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
-	pdf? ( app-text/ghostscript-gpl )
-	clamav? ( app-antivirus/clamav )
-	networkmanager? ( net-misc/networkmanager )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.3 )
-	rss? ( net-misc/curl
-		dev-libs/libxml2 )
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# Don't use libsoup-gnome (bug #565924)
-	export HAVE_LIBSOUP_GNOME=no
-
-	local myeconfargs=(
-		$(use_enable debug crash-dialog)
-		$(use_enable valgrind valgrind)
-		$(use_enable doc manual)
-		$(use_enable gtk3)
-		$(use_enable ipv6)
-		$(use_enable ldap)
-		$(use_enable dbus dbus)
-		$(use_enable networkmanager)
-		$(use_enable pda jpilot)
-		$(use_enable session libsm)
-		$(use_enable spell enchant)
-		$(use_enable gnutls)
-		$(use_enable startup-notification)
-		$(use_enable xface compface)
-		$(use_enable archive archive-plugin)
-		$(use_enable bogofilter bogofilter-plugin)
-		$(use_enable calendar vcalendar-plugin)
-		$(use_enable clamav clamd-plugin)
-		$(use_enable gdata gdata-plugin)
-		$(use_enable notification notification-plugin)
-		$(use_enable pdf pdf_viewer-plugin)
-		$(use_enable perl perl-plugin)
-		$(use_enable pgp pgpmime-plugin)
-		$(use_enable pgp pgpinline-plugin)
-		$(use_enable pgp pgpcore-plugin)
-		$(use_enable python python-plugin)
-		$(use_enable rss rssyl-plugin)
-		$(use_enable spamassassin spamassassin-plugin)
-		$(use_enable sieve managesieve-plugin)
-		$(use_enable smime smime-plugin)
-		$(use_enable spam-report spam_report-plugin)
-		$(use_enable webkit fancy-plugin)
-		--enable-alternate-addressbook
-		--enable-nls
-		--enable-acpi_notifier-plugin
-		--enable-address_keeper-plugin
-		--enable-att_remover-plugin
-		--enable-attachwarner-plugin
-		--enable-fetchinfo-plugin
-		--enable-mailmbox-plugin
-		--enable-newmail-plugin
-		--enable-tnef_parse-plugin
-		--disable-generic-umpc
-		--disable-bsfilter-plugin
-	)
-
-	# libetpan is needed if user wants nntp or imap functionality
-	if use imap || use nntp; then
-		myeconfargs+=( --enable-libetpan )
-	else
-		myeconfargs+=( --disable-libetpan )
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
-	autotools-utils_src_install
-
-	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
-	# => also install it in /usr/share/pixmaps for other desktop envs
-	# => also install higher resolution icons in /usr/share/icons/hicolor/...
-	insinto /usr/share/pixmaps
-	doins ${PN}.png
-	local res resdir
-	for res in 64x64 128x128 ; do
-		resdir="/usr/share/icons/hicolor/${res}/apps"
-		insinto ${resdir}
-		newins ${PN}-${res}.png ${PN}.png
-	done
-
-	docinto tools
-	dodoc tools/README*
-
-	domenu ${PN}.desktop
-
-	einfo "Installing extra tools"
-	cd "${S}"/tools
-	exeinto /usr/$(get_libdir)/${PN}/tools
-	doexe *.pl *.py *.conf *.sh
-	doexe tb2claws-mail update-po uudec uuooffice
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
-	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
-	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
-	ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/claws-mail/claws-mail-3.14.1-r1.ebuild b/mail-client/claws-mail/claws-mail-3.16.0.ebuild
index 8a2efc8f690f..69f04ac6397a 100644
--- a/mail-client/claws-mail/claws-mail-3.14.1-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.16.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit autotools gnome2-utils eutils python-single-r1
+inherit autotools gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
 HOMEPAGE="http://www.claws-mail.org/"
@@ -13,9 +13,9 @@ SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
 
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification valgrind xface"
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
 REQUIRED_USE="libcanberra? ( notification )
 	libindicate? ( notification )
 	libnotify? ( notification )
@@ -24,14 +24,18 @@ REQUIRED_USE="libcanberra? ( notification )
 	smime? ( pgp )"
 
 COMMONDEPEND="
+	net-mail/ytnef
 	archive? (
 		app-arch/libarchive
 		>=net-misc/curl-7.9.7
 	)
 	bogofilter? ( mail-filter/bogofilter )
-	calendar? ( >=net-misc/curl-7.9.7 )
+	calendar? (
+		>=dev-libs/libical-2.0.0
+		>=net-misc/curl-7.9.7
+	)
 	dbus? ( >=dev-libs/dbus-glib-0.60 )
-	gdata? ( >=dev-libs/libgdata-0.17.1 )
+	gdata? ( >=dev-libs/libgdata-0.17.2 )
 	gnutls? ( >=net-libs/gnutls-3.0 )
 	gtk3? ( x11-libs/gtk+:3 )
 	!gtk3? ( >=x11-libs/gtk+-2.20:2 )
@@ -56,6 +60,7 @@ COMMONDEPEND="
 	spam-report? ( >=net-misc/curl-7.9.7 )
 	spell? ( >=app-text/enchant-1.0.0 )
 	startup-notification? ( x11-libs/startup-notification )
+	svg? ( >=gnome-base/librsvg-2.40.5 )
 	valgrind? ( dev-util/valgrind )
 "
 
@@ -137,12 +142,13 @@ src_configure() {
 		$(use_enable spamassassin spamassassin-plugin)
 		$(use_enable spell enchant)
 		$(use_enable startup-notification)
+		$(use_enable svg)
 		$(use_enable valgrind valgrind)
 		$(use_enable xface compface)
 	)
 
 	# libetpan is needed if user wants nntp or imap functionality
-	if use imap || use nntp; then
+	if use imap || use nntp ; then
 		myeconfargs+=( --enable-libetpan )
 	else
 		myeconfargs+=( --disable-libetpan )
@@ -177,7 +183,7 @@ src_install() {
 	doexe tb2claws-mail update-po uudec uuooffice
 
 	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+	rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
 }
 
 pkg_preinst() {
@@ -190,8 +196,10 @@ pkg_postinst() {
 	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
 	ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index dd8c6462dc0e..2cddcb6d4d52 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -34,8 +34,6 @@
 			plugin</flag>
 		<flag name="valgrind">Add support for memory debugging
 			using valgrind</flag>
-		<flag name="webkit">Enables HTML e-mail rendering by using
-			the <pkg>net-libs/webkit-gtk</pkg> library.</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">sylpheed-claws</remote-id>
diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
index e8516550acb5..b63d6cbefc40 100644
--- a/mail-client/nail/Manifest
+++ b/mail-client/nail/Manifest
@@ -1,7 +1,5 @@
 AUX nail-12.4-debian.patch 1060 BLAKE2B dc07866c7871391e9bbddecfb5bb5addec4cffc16b93f03d0b6288a4fb95fdc546813ee16dd7a3eb3a03ded2c6889fe3c3e5a9b5fc8414d53b53079f17642ca4 SHA512 3cf37a64acf205bb8404e87e93cd920ee71ae8a9a2af147c21ef7d7b4684a05c1bf38eb3cf9e7a7fef7c883fb48de2324d3a687064f1adea3ab3949d6dcce513
 AUX nail-12.4-openssl-1.patch 1860 BLAKE2B e91b6a9f334060c6393aaa20120c0ce21bc6048c24aa097d57fd4eb73300ce864d6631e0b3a1202c43a9baab1bc11873e21d91f12d0478f8e81649ca9337bb6c SHA512 6496973734f4a4c724c3dc7c46a8fde160e4bd456405737098d65d193581c891e697d728b7ebc7cb0317f9ede9b39110e1b27b2bce896aee9eec85474758eeca
 DIST mailx-12.4.tar.bz2 271482 BLAKE2B ad011ef648036f10f800097c56a34cc5b882b808a7886eea86fa3dfc6f5a9a5b4e64e86e9b842384e4f55ce998ee8832176ce7e325c646ac26a187cbf26406a0 SHA512 a0e29972f552bd630ce1a14f70e61661815118520bcd4a00b6cad53f3270d3d08c835ff6982ba8800eb380a5b46f54eb6e60fb7533b5f41c916af45d29605af8
-EBUILD nail-12.4-r2.ebuild 2370 BLAKE2B 75c7511b910f99eec39004ac9ad52c5b271568fdffad6c6445261cea1e5bb435db1dc91de92a51ec7974d33a26d140ebfda9f33f2966ff26e81489d5b344e3e8 SHA512 026e36fffa7fe7386aa72fe1ad7fb498d37be430ed31937491edaa0b591d8963aa59597a770f0e0c7042bccf2ae9fbb96ea00d3e4143d1d543801e4c01e69dc2
-EBUILD nail-12.4-r3.ebuild 2436 BLAKE2B 764a0035f1f58447a10a2045553732365669a8de76c9e8542f5ddddeb0f0c24e31a10121d497b416aecfdc10e1c900a6ff3f9a5a0861c646ce7c79536eda5840 SHA512 fb42d0c912a55932d30216ff97ff7aa9832a8745465beb230e8f7cc978358f2da015d77b2fe5bbe76164fb7594c0847ea0d5c98682c672f7b7fba2ca820ac8f0
-EBUILD nail-12.4.ebuild 2177 BLAKE2B c0e767df2c9c19f7976d4eb0eb633fd472dbd8b117fa33735e86861487bccf3e0a9ccd6a4c7bb820957ca67ea2c23465c9eae97038d0d50f13ef9e42cab2f11f SHA512 e8697a8be27325b82aa4ff17b80878bbf0ea9bafa2c5bfa473789538efbb397b1e27c2aaa755f9ccddded1e7daef8262e36d7e2ab561ad78b35fa3a438a24762
+EBUILD nail-12.4-r3.ebuild 2431 BLAKE2B ca5556e0e56597904b4315aadaff3a66df315c0c2f48ca69ccade567241982ba13e3931dba39f16768feef741aa9b0487545d1ad1e656ddaa8c3f2ab692b9bed SHA512 abfd5dceda88571f26a8ae6c79739f4e270e600f8f5b5429b532c0ed84e85fddf2a2e809ea18858c3ed85ed49f7a34b7dae1389414fdd5bc81def832faedf958
 MISC metadata.xml 907 BLAKE2B c93a11b1488fe3c37220f683bdcc5fac0bf8bfb003ef0166c4632bb178047d7ae819294a83442f75e22fedfc2f50a31c24208833962d27158b59bc094e6fba79 SHA512 7f03613e2f7f8621b996d59a63505882925e755bbc8567a2c3dce3db0304e19ee007df2633fde5232877b71161eb51d037cf205a42b926d36d3aad111a9636d3
diff --git a/mail-client/nail/nail-12.4-r2.ebuild b/mail-client/nail/nail-12.4-r2.ebuild
deleted file mode 100644
index ca0cec9d82f5..000000000000
--- a/mail-client/nail/nail-12.4-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-HOMEPAGE="http://heirloom.sourceforge.net/"
-DESCRIPTION="an enhanced mailx-compatible mail client"
-LICENSE="BSD"
-
-MY_PN="mailx"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ssl net kerberos"
-
-RDEPEND="
-	net? (
-		ssl? ( dev-libs/openssl )
-		kerberos? ( virtual/krb5 )
-	)
-	!mail-client/mailx
-	!net-mail/mailutils
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-undef() {
-	sed -i -e "/$1/s:#define:#undef:" config.h || die
-}
-
-droplib() {
-	sed -i -e "/$1/s:^:#:" LIBS || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-debian.patch \
-		"${FILESDIR}"/${P}-openssl-1.patch
-	# Do not strip the binary
-	sed -i -e '/STRIP/d' Makefile
-}
-
-src_configure() {
-	# Build config.h and LIBS, neccesary to tweak the config
-	# use -j1 because it will produce bogus output otherwise
-	emake -j1 config.h LIBS || die
-
-	# Logic to 'configure' the package
-
-	if ! use ssl || ! use net ; then
-		undef 'USE_\(OPEN\)\?SSL'
-		droplib -lssl
-	fi
-
-	if ! use kerberos || ! use net ; then
-		undef 'USE_GSSAPI'
-		droplib -lgssapi_krb5
-	fi
-
-	if ! use net ; then
-		undef 'HAVE_SOCKETS'
-	fi
-}
-
-src_compile() {
-	# No configure script to check for and set this
-	tc-export CC
-
-	emake \
-		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" \
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
-		SENDMAIL="${EPREFIX}/usr/sbin/sendmail" \
-		MAILSPOOL='/var/spool/mail' \
-		|| die "emake failed"
-}
-
-src_install () {
-	# Use /usr/sbin/sendmail by default and provide an example
-	cat <<- EOSMTP >> nail.rc
-
-		# Use the local sendmail (/usr/sbin/sendmail) binary by default.
-		# (Uncomment the following line to use a SMTP server)
-		#set smtp=localhost
-
-		# Ask for CC: list too.
-		set askcc
-	EOSMTP
-
-	emake DESTDIR="${D}" \
-		UCBINSTALL=$(type -p install) \
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
-		|| die
-
-	dodoc AUTHORS README || die
-
-	dodir /bin
-	dosym ../usr/bin/mailx /bin/mail || die
-	dosym mailx /usr/bin/mail || die
-	dosym mailx /usr/bin/Mail || die
-
-	dosym mailx.1 /usr/share/man/man1/mail.1 || die
-	dosym mailx.1 /usr/share/man/man1/Mail.1 || die
-}
diff --git a/mail-client/nail/nail-12.4-r3.ebuild b/mail-client/nail/nail-12.4-r3.ebuild
index 1c0270cfcb5d..6cd0f0c264bf 100644
--- a/mail-client/nail/nail-12.4-r3.ebuild
+++ b/mail-client/nail/nail-12.4-r3.ebuild
@@ -13,7 +13,7 @@ MY_PN="mailx"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="libressl ssl net kerberos"
 
 RDEPEND="
diff --git a/mail-client/nail/nail-12.4.ebuild b/mail-client/nail/nail-12.4.ebuild
deleted file mode 100644
index 00e9a0fd8c72..000000000000
--- a/mail-client/nail/nail-12.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-HOMEPAGE="http://heirloom.sourceforge.net/"
-DESCRIPTION="an enhanced mailx-compatible mail client"
-LICENSE="BSD"
-
-MY_PN="mailx"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="ssl net kerberos"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	!mail-client/mailx
-	!net-mail/mailutils
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-remove_ssl() {
-	elog "Disabling SSL support"
-	sed -i -e 's~#define USE_\(OPEN\)\?SSL~#undef USE_\1SSL~' config.h
-	sed -i -e 's~-ssl~~' -e 's~-lcrypto~~' LIBS
-}
-
-remove_sockets() {
-	elog "Not enabling sockets (thus disabling IMAP, POP and SMTP)"
-	sed -i -e 's~#define HAVE_SOCKETS~#undef HAVE_SOCKETS~' config.h
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-debian.patch \
-		"${FILESDIR}"/${P}-openssl-1.patch
-	# Do not strip the binary
-	sed -i -e '/STRIP/d' Makefile
-}
-
-src_configure() {
-	# Build config.h and LIBS, neccesary to tweak the config
-	make config.h LIBS
-
-	# Logic to 'configure' the package
-	if use net && ! use ssl ; then
-		remove_ssl
-	elif ! use net ; then
-		# Linking to ssl without net support is pointless
-		remove_ssl
-		remove_sockets
-	fi
-}
-
-src_compile() {
-	# No configure script to check for and set this
-	tc-export CC
-
-	emake \
-		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
-		MAILSPOOL='/var/spool/mail' \
-		|| die "emake failed"
-}
-
-src_install () {
-	# Use /usr/lib/sendmail by default and provide an example
-	cat <<- EOSMTP >> nail.rc
-
-		# Use the local sendmail (/usr/lib/sendmail) binary by default.
-		# (Uncomment the following line to use a SMTP server)
-		#set smtp=localhost
-	EOSMTP
-
-	make DESTDIR="${D}" \
-		UCBINSTALL=$(type -p install) \
-		PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
-		|| die
-	dodoc AUTHORS README
-	dodir /bin
-	dosym /usr/bin/mailx /bin/mail
-	dosym /usr/bin/mailx /usr/bin/mail
-	dosym /usr/bin/mailx /usr/bin/Mail
-}