gentoo resync : 23.12.2017

7 files changed, 12 insertions, 157 deletions

diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 550b3ce282cc..53bbe7ed00b8 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
index adffe379a3e9..1ae346404ca1 100644
--- a/net-news/quiterss/Manifest
+++ b/net-news/quiterss/Manifest
@@ -1,10 +1,6 @@
-DIST quiterss-0.18.4.tar.gz 3341511 BLAKE2B b2ba94da2f402f71fcdc2639ceafb627cfb2ad725228faa7698af266745644a3e31be1375ba25ca0f1b81e8b712279f2a06f5dbd2c60b1215df589218ef8167d SHA512 345061e631b1e536fb17f8550ded185128f58ce51366fd0d0ad088dc6cfb61739e9b7edd1f6ebc4eb87a62b8902ea8d17bcf74fdcfd675092dd70cf2ccfaf13d
-DIST quiterss-0.18.5.tar.gz 3481530 BLAKE2B 646629fc2f5552ac4994e49f3a88e89feb055e225c18048d035cdce9131d5b11ed12039784b9e5cdadf3f1ae908a7f3d6f9b447eae2933ce5e0d080c346f5f1f SHA512 1eab7b961e2a0150812e3d22aa8b7627cd58513c109b05b8b7eb3f55e0ee40462714b6f65852d7a7fb53fce125dcbc988101c3d6f2ba9827771ff9bf93316e75
-DIST quiterss-0.18.6.tar.gz 3481730 BLAKE2B db12b6b6aea93e1e6c6bfb02fec18bd1db28c90f1f7f72b45ffc9b0a02a89dca77df01c07cfd0c6e3a659458e4cca683be194b29b0b94a0e9f60d49a51df2354 SHA512 773c22b61e6eea4348f1987a27049bec3d2f2b5834f4e24a5528b69b43fc93a2bca4a408c1cb1f2346e6aa1a2a000b0f8dea9a2fde64caea55e296ffcca68678
 DIST quiterss-0.18.8.tar.gz 3513387 BLAKE2B e36e87cb0fd9afe4444c56beffdd8e5522ba10b4e31dd175c312651e4f37c1ac4e7848af507d21273d9b0627a3b27662ade4fbca0298db376c13ca62e8f2196c SHA512 6bb4e09612b20705819cde1e0f954df8443e6b2a6caafec3f201bf85e28bfd184f8dbc805b54ba7bb4eca52a7d4d57f60adef9bf566069df1725cb7dab1ade8e
-EBUILD quiterss-0.18.4.ebuild 1642 BLAKE2B c32a37a3460d6a1a9867703c1964c9fc709b078c34ed657d41eda970d4b167c0b7130598c01367f61a2fa32d567b160c066a9998d11f65c46ed409ff5ad94743 SHA512 7ed87aa2add86710c0f8d67057552a2a1d51b4d412466758b18b8aae7a650490b93c8e5253a9b2573e13b2f6049ea18128ef19f0126d6c1ab65e9790265cbab2
-EBUILD quiterss-0.18.5.ebuild 1196 BLAKE2B c36070e093f3ffcd108e083311acc15c2a048bf172aa8aaf54d006b78691f6e7435a0867b1e9b7a4a47e5d61c09d9fe1ea227007323b505e79db35ec64ca5a13 SHA512 026ee73c299838b1d98d883378962bc7bf095a7901ce37d662816ae00dcc2d6606fdccaff31e549d84f256c7a1d5adeee3ad0cb67295be687cc564d1140581c9
-EBUILD quiterss-0.18.6.ebuild 1196 BLAKE2B c36070e093f3ffcd108e083311acc15c2a048bf172aa8aaf54d006b78691f6e7435a0867b1e9b7a4a47e5d61c09d9fe1ea227007323b505e79db35ec64ca5a13 SHA512 026ee73c299838b1d98d883378962bc7bf095a7901ce37d662816ae00dcc2d6606fdccaff31e549d84f256c7a1d5adeee3ad0cb67295be687cc564d1140581c9
-EBUILD quiterss-0.18.8.ebuild 1196 BLAKE2B c36070e093f3ffcd108e083311acc15c2a048bf172aa8aaf54d006b78691f6e7435a0867b1e9b7a4a47e5d61c09d9fe1ea227007323b505e79db35ec64ca5a13 SHA512 026ee73c299838b1d98d883378962bc7bf095a7901ce37d662816ae00dcc2d6606fdccaff31e549d84f256c7a1d5adeee3ad0cb67295be687cc564d1140581c9
+DIST quiterss-0.18.9.tar.gz 3521216 BLAKE2B 5b8fd4e382a3473cc1d284a1ee12f6179defe7ac573120198823f53870ca2aaf50eae3541de4af69573c6c07477cf19942abfc82e4aa5f687b43c412168c0f66 SHA512 1c068cc58e2c24123d62101e629e0138d5d9e3773f841e0aa8fe7a29e057e8397e2d60cfd1d3ebe81240c9ce9caf25ad61da1a37d41965daac951b45c906f80b
+EBUILD quiterss-0.18.8.ebuild 1194 BLAKE2B b7f2e5a21786d674039ccf83f3df2781045fdd79961e3bdcb284c878c1fae73ccf85acb2385166f3f5887e6249369dca2b49869fec02dcf798e8ce73711179b7 SHA512 a4524e88169a07ada96b4967e3ed541ed131e2316b40eea2e70622c5a4e417e80c5e1e9bd06c9079544132f954a2ed60984ee25946bf59d91fbd73df56cf5abb
+EBUILD quiterss-0.18.9.ebuild 1196 BLAKE2B c36070e093f3ffcd108e083311acc15c2a048bf172aa8aaf54d006b78691f6e7435a0867b1e9b7a4a47e5d61c09d9fe1ea227007323b505e79db35ec64ca5a13 SHA512 026ee73c299838b1d98d883378962bc7bf095a7901ce37d662816ae00dcc2d6606fdccaff31e549d84f256c7a1d5adeee3ad0cb67295be687cc564d1140581c9
 EBUILD quiterss-9999.ebuild 1196 BLAKE2B c36070e093f3ffcd108e083311acc15c2a048bf172aa8aaf54d006b78691f6e7435a0867b1e9b7a4a47e5d61c09d9fe1ea227007323b505e79db35ec64ca5a13 SHA512 026ee73c299838b1d98d883378962bc7bf095a7901ce37d662816ae00dcc2d6606fdccaff31e549d84f256c7a1d5adeee3ad0cb67295be687cc564d1140581c9
-MISC metadata.xml 339 BLAKE2B 97072cdc877c8d2d534b917525ec4512c4722595eb9f77588a32639e8dd97334f8f6295f5af876f74244d16d4f617c05f0be777226024b2972f74749c9dc0cf4 SHA512 7096bac121d72774155996c0f95631546b177a32855a05e87c1335d64ca1dba4a52ed626601ce05e3a1552707bee0456152c01f9cdf761fd364157fc3c3a6742
+MISC metadata.xml 329 BLAKE2B caa7a5bfcbbf62b32546c2a8cb0d3e55b1b1d0371b81505156a566df605e277d9560d900a4d2f945b4d9da99b7898edec3c08264b5628f4d74c9c949f805e455 SHA512 d77d10152c5497c4bb21511bd20b8a122159e048d11d070fffbd2ef5742be3bd0019eafb79a5e828b923b095b8628ff1d65371800ea49dbe6ec6355d1b9a0150
diff --git a/net-news/quiterss/metadata.xml b/net-news/quiterss/metadata.xml
index 56fe54721bb3..0aa296acab08 100644
--- a/net-news/quiterss/metadata.xml
+++ b/net-news/quiterss/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">QuiteRSS/quiterss</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">QuiteRSS/quiterss</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-news/quiterss/quiterss-0.18.4.ebuild b/net-news/quiterss/quiterss-0.18.4.ebuild
deleted file mode 100644
index 76a7d9d1ffaf..000000000000
--- a/net-news/quiterss/quiterss-0.18.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="ar bg cs de el_GR es fa fi fr gl he hi hu it ja ko lt nl pl pt_BR pt_PT ro_RO ru sk sr sv tg_TJ th_TH tr uk vi zh_CN zh_TW"
-
-inherit fdo-mime gnome2-utils l10n qmake-utils
-
-DESCRIPTION="A Qt-based RSS/Atom feed reader"
-HOMEPAGE="https://quiterss.org"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=dev-db/sqlite-3.11.1:3
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[X,qt5(-)]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS CHANGELOG README.md )
-
-src_prepare() {
-	default
-
-	my_rm_loc() {
-		sed -i -e "s:lang/${PN}_${1}.ts::" lang/lang.pri || die
-	}
-
-	# dedicated english locale file is not installed at all
-	rm "lang/${PN}_en.ts" || die
-
-	l10n_find_plocales_changes lang ${PN}_ .ts
-	l10n_for_each_disabled_locale_do my_rm_loc
-}
-
-src_configure() {
-	local myqmakeargs=(
-		PREFIX="${EPREFIX}/usr"
-		SYSTEMQTSA=1
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-news/quiterss/quiterss-0.18.6.ebuild b/net-news/quiterss/quiterss-0.18.6.ebuild
deleted file mode 100644
index da7045485e26..000000000000
--- a/net-news/quiterss/quiterss-0.18.6.ebuild
+++ /dev/null
@@ -1,63 +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 Qt-based RSS/Atom feed reader"
-HOMEPAGE="https://quiterss.org"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-db/sqlite-3.11.1:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[X,qt5(-)]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CHANGELOG README.md )
-
-src_configure() {
-	local myqmakeargs=(
-		PREFIX="${EPREFIX%/}/usr"
-		SYSTEMQTSA=1
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-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/net-news/quiterss/quiterss-0.18.8.ebuild b/net-news/quiterss/quiterss-0.18.8.ebuild
index da7045485e26..84006fd3e39e 100644
--- a/net-news/quiterss/quiterss-0.18.8.ebuild
+++ b/net-news/quiterss/quiterss-0.18.8.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/net-news/quiterss/quiterss-0.18.5.ebuild b/net-news/quiterss/quiterss-0.18.9.ebuild
index da7045485e26..da7045485e26 100644
--- a/net-news/quiterss/quiterss-0.18.5.ebuild
+++ b/net-news/quiterss/quiterss-0.18.9.ebuild