gentoo resync : 24.02.2018

3 files changed, 27 insertions, 19 deletions

diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index f43fce30a8e3..8b231ee6556b 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,7 +1,7 @@
-DIST sylpheed-3.4.2.tar.bz2 3474176 BLAKE2B a76498e29900c9a13f48111a462045f1dae935edc1d8fd1cd8dd880ceeceef6e234ce5d066d398976bdc42139bb33033dba78d76d5aa63fe000ffd64ec15c8f2 SHA512 1bfaf5636facb6ca55173e914904be7f9fb9ca98eb440f5b548fbbbe03f5dfb5428801e878f3275d3683e715d0b4bd33f63f69f5f98578ce1a25cef695406b5e
 DIST sylpheed-3.5.1.tar.bz2 3561816 BLAKE2B 811d433a2930d32dd6d2a5aa3010c4cfe54e514a7705624dc7ae067b3e5db1a3aa745e980c0e240b1b6515535c8ee38988aa8410ea07369f77d53bade561b462 SHA512 264aafb40eaa163405074480b2deb7eefe0d2158a107d9b26bc35d5506dcf5a52cf5712b81bd4c06b4c76e48c6e372c74473e5371bbdc80f230267f3b211c7f5
 DIST sylpheed-3.6.0.tar.bz2 3568998 BLAKE2B 283ea6c956eb67332b9f1ba34cecb2be853a079d398b5165e925b9adfe33b75d5eab559b91a707b5c76d9253f35acbf4177afcbb90e86fb48b45bcd9aa517768 SHA512 84c59e327690ed7e637e9ce60e630da6cdad771ccc278e31e490ed643da55c295fb47e999ad421fc59dbbcfed990882022b96cf478bd47253692d2e86279c591
-EBUILD sylpheed-3.4.2.ebuild 1505 BLAKE2B b43c8ab916fbb8b98864dba74cb2fba630dfae328b92d0029b88d865da37e2fa38ee9311ad139d08090b7384388802ae279de1ee25e7a61c38b4ce9625818a2b SHA512 5fd43e3e5dd1a9bd6f059a252ea894a6562db7c2eabcb063a912de7e68777ad0dafc136ee657a0f5b7c855abb896faa1714c1be2b607d28aa8fd3db0a0ed101a
+DIST sylpheed-3.7.0.tar.bz2 3612328 BLAKE2B bd8182db8a46b956e12b3da4b15d3ee8184a612e2fb216aca20fd4a022610b17416f994d36b390a5a92835915e95f08bd59bf71154a86962c9564162be891f21 SHA512 490837528bf7ba9d26994cd5fff00b6e5390a127419b9d0efd9fc25c38be1291d55c5b8daebdf5ca9d9159a51c938449e76212328f3eae40cc039db88cb5caa4
 EBUILD sylpheed-3.5.1.ebuild 1562 BLAKE2B de18e090c09ad9df8e8ff26fdd2af1499e7f7c273891cd6b74f2852209f42b8713ce320b20fc6f0a4dc4fd0f684de720215b2cf0c06b946aa765d566bcce87bf SHA512 d7660a0451164cea86d5c52a19ec3823a1ee6dec6a9aeb67155c447efc9db47735b0eddd2e4703d39bb15c71168933b75701ab0a138d17cc8a4852f8909b72ca
-EBUILD sylpheed-3.6.0.ebuild 1623 BLAKE2B 8344a9e62ae9f0d63fc7e71345693c2a15059f7714e6500564dc7d60b69e96c50f4bffbb2d695af33a64c7c929e42f9801beb63946402b5e21871d118b6c2ffc SHA512 16136243562090dd74302c0bdcaf7ea0a0f39329315ae304bc91defcb105af6ee7fabaddbd2630d6b4d14a5ac347bbc88da0c1a6a84043c9aedc9c19f5a2c112
+EBUILD sylpheed-3.6.0.ebuild 1621 BLAKE2B c495b8988f315c31d751dda5c41e946f6b69b5f3341f05ab9d78e77e77735c92ac3642b5189cef4a98722998734455783821618916f7506d7242f799c07eb441 SHA512 ff2ca08dd551effe172121b7520a49ef162f2695f02ebc3a0454cf54135a043e81c7ea05914eff2ad2d71dc37252d8b984d90f5fd84e9411f04e46af9985355f
+EBUILD sylpheed-3.7.0.ebuild 1623 BLAKE2B 8f6bcfdb9684cb2091803a3125eaccacb3b980e21a324a60f5becae76a360582ecd8a63b64200774f26731a46995beb0184327e2463321690cde42df0d77ed86 SHA512 9ca225e89923b4eeda0439377c362519a06eac6696cbfe72a262390103e77ebeb17f9b40e85e9ad1b3a2070111fb8a5edde371863e71beca28e954b5ebad342d
 MISC metadata.xml 440 BLAKE2B efcb9ca3d9130ca42ba924b3466975f87869800e50cd286d892331a0bf97b21dfacd3fdf02704091341a391e60052ee2b3322f2e90dfe66b076ff4f1db51fb31 SHA512 69ac2f825b9dd04550e139906f492e50eceb5e8922a95b2a44196c664215095dbc0809f9677d403dcb7deb5093dc0c8723b56ad840b3a93ea9101b55ac38de84
diff --git a/mail-client/sylpheed/sylpheed-3.6.0.ebuild b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
index 5ff58b054cba..45eb5b5d4b15 100644
--- a/mail-client/sylpheed/sylpheed-3.6.0.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
 
 CDEPEND="net-libs/liblockfile
diff --git a/mail-client/sylpheed/sylpheed-3.4.2.ebuild b/mail-client/sylpheed/sylpheed-3.7.0.ebuild
index c601b0683782..b7859679adca 100644
--- a/mail-client/sylpheed/sylpheed-3.4.2.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-inherit eutils multilib
+inherit eutils
 
 DESCRIPTION="A lightweight email client and newsreader"
 HOMEPAGE="http://sylpheed.sraoss.jp/"
@@ -11,17 +11,24 @@ SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="crypt ipv6 ldap nls oniguruma pda spell ssl xface"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
 
-CDEPEND="x11-libs/gtk+:2
+CDEPEND="net-libs/liblockfile
+	x11-libs/gtk+:2
 	crypt? ( app-crypt/gpgme )
 	ldap? ( net-nds/openldap )
 	nls? ( sys-devel/gettext )
 	oniguruma? ( dev-libs/oniguruma:= )
 	pda? ( app-pda/jpilot )
-	spell? ( app-text/gtkspell:2 )
-	ssl? ( dev-libs/openssl:0 )"
+	spell? (
+		app-text/gtkspell:2
+		dev-libs/dbus-glib
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
 RDEPEND="${CDEPEND}
 	app-misc/mime-types
 	net-misc/curl"
@@ -29,8 +36,10 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	xface? ( media-libs/compface )"
 
+DOCS="AUTHORS ChangeLog* NEW* PLUGIN* README* TODO*"
+
 src_configure() {
-	local htmldir=/usr/share/doc/${PF}/html
+	local htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 	econf \
 		$(use_enable crypt gpgme) \
 		$(use_enable ipv6) \
@@ -40,15 +49,14 @@ src_configure() {
 		$(use_enable spell gtkspell) \
 		$(use_enable ssl) \
 		$(use_enable xface compface) \
-		--with-plugindir=/usr/$(get_libdir)/${PN}/plugins \
-		--with-manualdir=${htmldir}/manual \
-		--with-faqdir=${htmldir}/faq \
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins \
+		--with-manualdir="${htmldir}"/manual \
+		--with-faqdir="${htmldir}"/faq \
 		--disable-updatecheck
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog* NEWS* PLUGIN* README* TODO*
+	default
 
 	doicon *.png
 	domenu *.desktop