gentoo resync : 21.12.2017

5 files changed, 7 insertions, 83 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index e52b847af8b5..f7be7f3d5dda 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index aba0102446a9..e82ddba579c1 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -2,5 +2,4 @@ DIST balsa-2.5.2.tar.bz2 4049163 BLAKE2B 7435c7831d528b3ab6d2783211023e3686e94b2
 DIST balsa-2.5.3.tar.bz2 4333815 BLAKE2B ba8715108cf1122152c069130911275175d5c45ca12e85f1165cb7e86680015d6effd1ea5aaaebd5b154f67fc13002bd26ad0f0d7942253b2483896dd28a50fd SHA512 34e69be050f6c502fa6651029b7d93bf9b7842bbe8489669924563c086def4dbe72109ba5244e0cacf3ef69d3d9d8c5679f870acf564b5551920fa77012e1ff8
 EBUILD balsa-2.5.2-r1.ebuild 2573 BLAKE2B ee91a813897fb5865eb2407f131a6b193c78dd368bdc249fa471f0639d5022e7918da30a6db0da73b16e69ee9f4a48139c0c2972dfd50304ddde9c0610a08b77 SHA512 87414906f0a40d7ccf62ff76cefa2583bb99ea9f07a366f8964f4305424ae5f7034bc2c046a3181b11f4342cfac7eac6ffb9358b030ddb7dd8395bbccb37182b
 EBUILD balsa-2.5.3-r1.ebuild 2108 BLAKE2B 42fd1261248dd6cc57eadaaafac9f7614df5544957c3cc73e446c1ff4a14dddbd44091e4d62ed3bb29c5cefe0bf1f6a3c8b4e69e00edae288158775e4ccce311 SHA512 5011591778b6dec194cb38875dfb55b12bbdd6204dbb6c724ec015996454a569677589f2a22e94471d30442dbb67424d5e295fe5f0da82fce2979f98ee5bb166
-EBUILD balsa-2.5.3.ebuild 2157 BLAKE2B 31ca5705df81bd3e273f4ed547d150f91da0b982de8759dd5991b75d549d029de492226db92f1fc41921d1018d3d26c0755471588d4833901954ddb52d4f5ead SHA512 177ed626dc49744ed2fea8656e1449e018689414f93be52e7a5e32cddf9c5d2301e43bda23297b3ad6261453eb53da7ce9b561639847675ad2e5b2b3a881908c
 MISC metadata.xml 525 BLAKE2B 3afe2cdc67ef1373e7f1db8421db62d12dab1288b8c46787e1adfdd8a6cf4cf3df7514222dd2a17c2ffcef88c6be10a77f35981c2a95c81d9ffc6631f62b9acb SHA512 2cff8f1968d1d1656b2eb01b1a373483a2168a4cdf2556c8cd7a4558f3e0821b816fc7cc2e1476ee8a8fe90622835c6b10e392b6ea7e64eba592c6f50922d4fe
diff --git a/mail-client/balsa/balsa-2.5.3.ebuild b/mail-client/balsa/balsa-2.5.3.ebuild
deleted file mode 100644
index c2af66a84eb7..000000000000
--- a/mail-client/balsa/balsa-2.5.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Email client for GNOME"
-HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
-SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-IUSE="crypt gnome gnome-keyring kerberos ldap libnotify libressl rubrica spell sqlite webkit xface"
-
-# TODO: esmtp can be optional, do we want it?
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=x11-libs/gtk+-3.10.0:3
-	dev-libs/gmime:2.6
-	>=net-libs/libesmtp-1.0.3:=
-	net-mail/mailbase
-	media-libs/libcanberra:=[gtk3]
-	x11-themes/hicolor-icon-theme
-	x11-themes/adwaita-icon-theme
-	crypt? ( >=app-crypt/gpgme-1.2.0:= )
-	gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	sqlite? ( >=dev-db/sqlite-2.8:= )
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap )
-	rubrica? ( dev-libs/libxml2:2 )
-	spell? ( app-text/gspell:0= )
-	webkit? ( net-libs/webkit-gtk:4 )
-	xface? ( >=media-libs/compface-1.5.1:= )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-python/html2text
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=750516
-	sed -i -e 's/@TOOLKIT_CATEGORIES@//' balsa-mailto-handler.desktop.in.in || die
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=750515
-	echo "src/balsa-print-object.c" >> po/POTFILES.in || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--with-canberra \
-		$(usex crypt --with-gpgme=gpgme-config --without-gpgme) \
-		$(use_with gnome) \
-		$(use_with gnome gtksourceview) \
-		$(use_with gnome-keyring libsecret) \
-		$(use_with kerberos gss) \
-		$(use_with ldap) \
-		$(use_with libnotify) \
-		$(use_with rubrica) \
-		$(usex spell --with-spell-checker=gspell --with-spell-checker=no) \
-		$(use_with sqlite) \
-		$(use_with xface compface) \
-		$(usex webkit --with-html-widget=webkit2 --with-html-widget=no)
-}
diff --git a/mail-client/clawsker/Manifest b/mail-client/clawsker/Manifest
index 1f24bf91e838..8c6260702332 100644
--- a/mail-client/clawsker/Manifest
+++ b/mail-client/clawsker/Manifest
@@ -3,5 +3,5 @@ DIST clawsker-0.7.8.tar.gz 66210 BLAKE2B 0e3bc8c17b5672922153f60d1c83da869565488
 DIST clawsker-1.1.0.tar.xz 153404 BLAKE2B 8d19eaa94339b49689bd97921101e8c064f8cd35802a08248ddcebf6e595e1cfd8b577b68dcf1534c054d21dc1ea92d109a2c20ed30b7387aa88c60518576d34 SHA512 e76be7214e5f7568423890cc29e736c163678bb4501911467afd5a4ded2f61a6493c31ac08ca2f55cd143109a37c0f2f27481a0b556628cfaf6d477112375f2b
 EBUILD clawsker-0.7.10.ebuild 550 BLAKE2B e1f8beb2dbe217909335720afc15159b61431ebd51f1e1914e84c8076119a691ca8ecdc4d8872635fba9336d250af855acc2c96c20f92c06969ab519bd8a51d3 SHA512 d24e8026cc223510ebdb725f776ce1a18a3315fd2051053d1d8d7d79d1a193f23da6c9e1feea55d6a1d99f706bf2e33b5e2704ddfa126131b746582e5b185530
 EBUILD clawsker-0.7.8.ebuild 548 BLAKE2B eac21c4694881c592aa14b8ebb590686de3378e43c704e444b7e58c2db03f6dae18820284b0db497b6b6322129dc4b33566cd637a1e97b9fa749d1da5feee3ec SHA512 d17f085cd8c117cd4d66d5a095a2b24cf18cc2e334d55b03d31d5c4775c74ab75599951805d29651c0287b0678a947f99877e36a67ece6f7f54c30e0e976d62a
-EBUILD clawsker-1.1.0.ebuild 553 BLAKE2B c32d37806632cff6e55635d5fd0889cd8d08c00476fcf99253da56a230f471f73aea9cf6cbd8fabe609b70f53855e704781b6f28c53e59951b8513b7dee3b53d SHA512 cff8e7cde8aceb49af59f0861c5f6f5041a4cc3e56c562b83b6133dac5cf0b57cd39a45f9c25137cb0930394376254b3dc4a448833f8b69e8e8d2c883c780dd9
+EBUILD clawsker-1.1.0.ebuild 540 BLAKE2B 0e3572301ae27f096ffcf8047c4a24a892b6c2a5dc905a78c0dc2bcfb468edcd0c85dc581ffb69e0cba4653490668f1af1f4b727ad6c26c232b9b65b92cfa605 SHA512 63efb159d09443a3a6282e7e6c186e2f8e32789e3426c087fa83b640574a0d348b581592e780d1c3d2e0f89ced1834452be410e39b53aea723d6542a0e72b0f5
 MISC metadata.xml 244 BLAKE2B 4c636cb2e4dd31b286d765d3c8724c3fc61051ff0653d1deae09a77fb1849928920749778c98dda893f27765d2ff0f94ce11582315cd95569e1b39092908df67 SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c
diff --git a/mail-client/clawsker/clawsker-1.1.0.ebuild b/mail-client/clawsker/clawsker-1.1.0.ebuild
index 6349b17ba969..c24d7c778a0e 100644
--- a/mail-client/clawsker/clawsker-1.1.0.ebuild
+++ b/mail-client/clawsker/clawsker-1.1.0.ebuild
@@ -12,14 +12,15 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-lang/perl-5.8.0
-    >=dev-perl/Gtk2-1.200
-    >=dev-perl/Locale-gettext-1.05
-    >=mail-client/claws-mail-3.5.0"
+	>=dev-perl/Gtk2-1.200
+	>=dev-perl/Locale-gettext-1.05
+	>=mail-client/claws-mail-3.5.0
+	"
 
 src_compile() {
-    emake
+	emake
 }
 
 src_install() {
-    emake install DESTDIR="${D}" PREFIX=/usr
+	emake install DESTDIR="${D}" PREFIX=/usr
 }