gentoo resync : 16.02.1018

4 files changed, 51 insertions, 60 deletions

diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index 44f63a5ad693..6bf8cec26087 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,6 +1,6 @@
 AUX focuswriter-1.6.0-unbundle-qtsingleapplication.patch 1108 BLAKE2B b17d04cfb5833d485a421244228ef36601320ddcdad1e744e4a83fee2633154c4bd642053e09bf97ee79aab2b11a82df4afcb4a70823cb5df24b5232c9b0a8d6 SHA512 5f272a4c65b1eb58cc87732fbe82f2c6b925562e77b2280a8b9a0a8b0a41716567051ebd4f6ed32caa8ce7f14edff4e20666f6ad4e464cc8d308640efa4a3c19
-DIST focuswriter-1.6.13-src.tar.bz2 10342493 BLAKE2B 11086bf7d35cc392169e7b6de57ea0b65c919bef0d845946893641f705ba0522bdef7244f4035104188d3fdf0dd3b6ad30ed6bf347b5ce8c422d7eea6c6dc714 SHA512 d78719d5a1e25afec8035759d0ebff17728e856fe346d4d8fefd38a15eea3476eb1c6e2aca30955ac148fadd4701a9c4a83399baffe93239a18b93854fab9858
 DIST focuswriter-1.6.16-src.tar.bz2 10301446 BLAKE2B ade186dffe87b4256c85b876b7121fa144f264d358479ef46c34579f96ea15fdd55da2c036d35119fe1eee3498d64ad1ac72737fa2e9f45aa13535dec599b168 SHA512 aefffcde693f4e7627f11cc37d763936f85dd749293daf910934da99e858471399618243c20ff88cd4993cffcb4b3270cb38bd97834519484c463b1b1b7e5f0d
-EBUILD focuswriter-1.6.13.ebuild 1088 BLAKE2B ff94d0c7953ff3e0c76462014c9b401d7998eadc3cb8699667a931d7b8a70ca4c1685a78a8b0350a6124e1d32598cc1d8c4442983f46aa90e45920b4fe363a9a SHA512 631f853d16a2759b1e7e359fc020aa48eb82df1f41a024c4665485277ff4a0d7d9dba144f782425e12dc4ca9eec0506698fafb687292fd595a11cd6e789c36de
-EBUILD focuswriter-1.6.16.ebuild 1073 BLAKE2B a38856c1b8938448bd2f0ef03539418b0b5653866e9a342469dbfc35573a0959e313b3d4fc9127c32f8fa0deb6437083061d8464ef40a2d21b084dc3a06a2462 SHA512 e824d960df167fd2a4afe9fd64e08a5f225be25caa5286b098f4d816eb3aa1b383a783187e3f2adef44577be6523585d0f5a440f68a5d81b2d2385f83a2eb04e
+DIST focuswriter-1.7.1-src.tar.bz2 10306009 BLAKE2B 8b76c4c85c304e4014ef91d1e0829b2e2fe06d4d064af1fe1f0e7b3ca1d7a8a0a776322bba574e3b64f4f57e6cdefb8c1c000c7aa17ad0e4fdddea41e2b3aa2f SHA512 a7d45978670305c1a1f1d737ba7620f6ec38c76ce3aefdac2b008d3d208686013d300436d8fa210c99fe3048a7f377b0e1ab8b9f92b2ed7f58d57354ea683522
+EBUILD focuswriter-1.6.16.ebuild 1071 BLAKE2B 0a602d38299bde8d04b84a60f455d0bf89a5d81b8a7f97b177e5f218aa1b27f3b3ed97824ad8d4b34384a4c82b6a8682aca5939a1f1cc0aaf22c0fcbe136b6a0 SHA512 9299c32e46563fd6d45d72f9c4ef1d3afe10d2eca7e9a6d31fc06c4fd522fdfacfdc3189007bb3ddc6e189c8507acd1b9c0b49df7b187b9297fc2013125968e8
+EBUILD focuswriter-1.7.1.ebuild 916 BLAKE2B 6ed0b071addf2cdff3a70620d03a4cc999088db46af0078b5b8ad8402a65de12921e39bde11b77aae0e83bbf164b29d328d63c1426a3d6a2ee6c1d9008d6f4a5 SHA512 536390081a468c38782c0505d29dc705ca8b691549862be8d34b10bedd237bd04237b2c86bc2681b0478a23dcf1bf059b4b29d7afc7d7b12744293e6b5e864d4
 MISC metadata.xml 392 BLAKE2B dcb98e8e1ba1c2a2aea89d380d6a2a1a1cfd5fd9773f133aa7603b88384c91911429832a7117026cea4c092c1c84dfe440a2c4da875ce56e1da7e8670aecf068 SHA512 beaf6206dfa83ffa8acbae3d5f8c5a9041974588a18de742fa049d4ff0b8d75bcb2f40ab081418cdd2987709566b678f7016b1be0acb02deeec480cd25ddf3cb
diff --git a/app-editors/focuswriter/focuswriter-1.6.13.ebuild b/app-editors/focuswriter/focuswriter-1.6.13.ebuild
deleted file mode 100644
index b76907d10e21..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.13.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils xdg-utils
-
-DESCRIPTION="A fullscreen and distraction-free word processor"
-HOMEPAGE="https://gottcode.org/focuswriter/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# drop qtcore subslot when minimal Qt is 5.10
-RDEPEND="
-	app-text/hunspell:=
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog CREDITS NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/focuswriter/focuswriter-1.6.16.ebuild b/app-editors/focuswriter/focuswriter-1.6.16.ebuild
index ea35e3d513fa..e76a7123b909 100644
--- a/app-editors/focuswriter/focuswriter-1.6.16.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.6.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-editors/focuswriter/focuswriter-1.7.1.ebuild b/app-editors/focuswriter/focuswriter-1.7.1.ebuild
new file mode 100644
index 000000000000..0eb1d6e9eb3f
--- /dev/null
+++ b/app-editors/focuswriter/focuswriter-1.7.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Fullscreen and distraction-free word processor"
+HOMEPAGE="https://gottcode.org/focuswriter/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-text/hunspell:=
+	>=dev-qt/qtcore-5.11:5
+	>=dev-qt/qtgui-5.11:5
+	>=dev-qt/qtmultimedia-5.11:5
+	>=dev-qt/qtprintsupport-5.11:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	>=dev-qt/qtwidgets-5.11:5
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+
+DOCS=( ChangeLog CREDITS README )
+
+PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}"/usr
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}