gentoo resync : 23.12.2017

5 files changed, 7 insertions, 115 deletions

diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index 94d2adb205cc..cb57e348b341 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,8 +1,4 @@
 AUX focuswriter-1.6.0-unbundle-qtsingleapplication.patch 1108 BLAKE2B b17d04cfb5833d485a421244228ef36601320ddcdad1e744e4a83fee2633154c4bd642053e09bf97ee79aab2b11a82df4afcb4a70823cb5df24b5232c9b0a8d6 SHA512 5f272a4c65b1eb58cc87732fbe82f2c6b925562e77b2280a8b9a0a8b0a41716567051ebd4f6ed32caa8ce7f14edff4e20666f6ad4e464cc8d308640efa4a3c19
-DIST focuswriter-1.6.5-src.tar.bz2 10194695 BLAKE2B de7c4aef61663cb47662cfbed3933f5f84401c8c30fb77dfacdf7c14663fa0923a9256ff75e9d9fc901f8e59cd386fb33b9ab889a6532d9e950f06c9d5339d8f SHA512 a15024bc94f0212db2ec4f8d88b942fc3640b2917f130b1fbfb04ab616ed4d10baa11f9cab8d27a8fc40150bfa3e25d3afe1d76581dbe96a3cd6d62530207e12
-DIST focuswriter-1.6.6-src.tar.bz2 10195488 BLAKE2B 5aafe1cfa58adca7584d54151d9adcd1a0b55237a9404405924e2b654f5e54ee14d7868b46cbf64b870a007f9c7045d67dbb6c9cbe9831203b9e17c94335d5c7 SHA512 d4faae8477080e3898bad144e154c4c43232befe0c2ee90643a816cbb847d3eb25ed8f6fe916cafa5d445c4b3483e880f84015f952f4606bc01f595aa01e113a
 DIST focuswriter-1.6.7-src.tar.bz2 10196583 BLAKE2B 99c749271c785e69f07601575343669ed5be619e646be4ee38cc82242d353a84577842c1ff98f62b0adbbff1a733a0dce82593ac4ffa2eb61e611cea1b2657b5 SHA512 d33c66881b1065aa9812dae14a5fe2a2850ce1c50f4b38e028bcd3f5a4bb1fd489705b0272e3233f3db468b262daefbd906025126f792d04af41722cde2c7bf5
-EBUILD focuswriter-1.6.5.ebuild 1041 BLAKE2B 7e6a895ee6d4b04cdc9cc19086168a1c4f7f946b0550abd8a4d4fcf660f5f6e65c995f5a1861dfc589e8391cbbea353a7f462297b79c5e22f821a09802390da8 SHA512 71fe8650e73194be29014ea4bf881309f55a0f9bcffd70b016e52ea0d476e8008cfe7b71bf8bcfa016232e68d34c9ae41195d21b2b4459f4fabd4d39d01c0bc3
-EBUILD focuswriter-1.6.6.ebuild 1043 BLAKE2B f7000d1315298b82e583b8c76cde81df55357a99d02116ae0030045a1c1c26cd2f332a10c7b5e25eb997e8b3d85c2cc99f7378da92a613ae991a3ea37d37a2a4 SHA512 1dc69ea4f13b1ff946e08bc7e83297bd3ba804708b304c449123ccaf2c51aba0f4aa62c643b83cbc5cf4832352f5afdcd445a82f2fcba2086bc008f1406bbac5
-EBUILD focuswriter-1.6.7.ebuild 1043 BLAKE2B f7000d1315298b82e583b8c76cde81df55357a99d02116ae0030045a1c1c26cd2f332a10c7b5e25eb997e8b3d85c2cc99f7378da92a613ae991a3ea37d37a2a4 SHA512 1dc69ea4f13b1ff946e08bc7e83297bd3ba804708b304c449123ccaf2c51aba0f4aa62c643b83cbc5cf4832352f5afdcd445a82f2fcba2086bc008f1406bbac5
-MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
+EBUILD focuswriter-1.6.7.ebuild 1041 BLAKE2B 7e6a895ee6d4b04cdc9cc19086168a1c4f7f946b0550abd8a4d4fcf660f5f6e65c995f5a1861dfc589e8391cbbea353a7f462297b79c5e22f821a09802390da8 SHA512 71fe8650e73194be29014ea4bf881309f55a0f9bcffd70b016e52ea0d476e8008cfe7b71bf8bcfa016232e68d34c9ae41195d21b2b4459f4fabd4d39d01c0bc3
+MISC metadata.xml 392 BLAKE2B dcb98e8e1ba1c2a2aea89d380d6a2a1a1cfd5fd9773f133aa7603b88384c91911429832a7117026cea4c092c1c84dfe440a2c4da875ce56e1da7e8670aecf068 SHA512 beaf6206dfa83ffa8acbae3d5f8c5a9041974588a18de742fa049d4ff0b8d75bcb2f40ab081418cdd2987709566b678f7016b1be0acb02deeec480cd25ddf3cb
diff --git a/app-editors/focuswriter/focuswriter-1.6.5.ebuild b/app-editors/focuswriter/focuswriter-1.6.5.ebuild
deleted file mode 100644
index aee21c9571a5..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=""
-
-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.6.ebuild b/app-editors/focuswriter/focuswriter-1.6.6.ebuild
deleted file mode 100644
index 00b883cea9f2..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=""
-
-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.7.ebuild b/app-editors/focuswriter/focuswriter-1.6.7.ebuild
index 00b883cea9f2..aee21c9571a5 100644
--- a/app-editors/focuswriter/focuswriter-1.6.7.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.6.7.ebuild
@@ -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/metadata.xml b/app-editors/focuswriter/metadata.xml
index 17237689dcfd..d79d623beff3 100644
--- a/app-editors/focuswriter/metadata.xml
+++ b/app-editors/focuswriter/metadata.xml
@@ -5,4 +5,8 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://gottcode.org/focuswriter/bugs/</bugs-to>
+		<remote-id type="github">gottcode/focuswriter</remote-id>
+	</upstream>
 </pkgmetadata>