gentoo resync : 18.11.2018

3 files changed, 3 insertions, 68 deletions

diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
index 7b1135af16c1..51de7cba30da 100644
--- a/net-news/quiterss/Manifest
+++ b/net-news/quiterss/Manifest
@@ -1,6 +1,4 @@
 DIST quiterss-0.18.12.tar.gz 3597214 BLAKE2B ff06de6f6618fa6bb1b2b1274e5c214f1cae2dbb4e7d6c406b885f1b59b5b5d22ca919d32a672f8843360100e87d80c7a7add7ebccc41b53f67b0719fe2f7c99 SHA512 e047d88d3be2d24e264869c9fe5a9327d66b7f6907bb74b5fc7e53b2cbb69c232f130826c8ad79ac95dd3dc5137d1d1779a23c20ddb35c56fccfbaff4fb4f3e4
-DIST quiterss-0.18.9.tar.gz 3521216 BLAKE2B 5b8fd4e382a3473cc1d284a1ee12f6179defe7ac573120198823f53870ca2aaf50eae3541de4af69573c6c07477cf19942abfc82e4aa5f687b43c412168c0f66 SHA512 1c068cc58e2c24123d62101e629e0138d5d9e3773f841e0aa8fe7a29e057e8397e2d60cfd1d3ebe81240c9ce9caf25ad61da1a37d41965daac951b45c906f80b
-EBUILD quiterss-0.18.12.ebuild 1196 BLAKE2B e5732c415f59c37ac4c96ce3a80afcda50dd04f41b3ab327e9143a4074c976a370be549010909e9ff9f9ada312fc89467542ea272f583d1579a1dec235ec695c SHA512 8454304677d8feeb61741f3501c3d0baf991d0bb9387eb62e27561eaa5dd20456874355903c1203e2025751caf7179091154cbfe4ee769d3c6dfd28ce32bae68
-EBUILD quiterss-0.18.9-r1.ebuild 1194 BLAKE2B f902b0e4126725ef2350ea9df473e9ef61e1123ebb831f579ab4a7d664951b76145bd0f438ea2c1c388cb20969fa99b0ab8bab9f46ce242fcb23fcfa4de09117 SHA512 ade998c1c2f44fa801b76750bf706ef3433221448dbec93bca0087846518212d934a6acdfdafa7babe461c91689d0385b1bf0e2bee1b201b8d79be046c26d4e6
+EBUILD quiterss-0.18.12.ebuild 1191 BLAKE2B 63871a785da5bcef11981f873a776d3fa65a70342032add83ae55cc6af6fafaf17561c3138ea17eda2456dd144b608f0cf144f42f5da88350823207746347e54 SHA512 15a2e7f4588003a29bffac9c0f1c7b0efab065b2291467328c3fe97fd12b9c0b852c1b453dcbe05c0644d10ed8c0b4da6059e3448b26b65d1f6d8033cc6ea046
 EBUILD quiterss-9999.ebuild 1196 BLAKE2B e5732c415f59c37ac4c96ce3a80afcda50dd04f41b3ab327e9143a4074c976a370be549010909e9ff9f9ada312fc89467542ea272f583d1579a1dec235ec695c SHA512 8454304677d8feeb61741f3501c3d0baf991d0bb9387eb62e27561eaa5dd20456874355903c1203e2025751caf7179091154cbfe4ee769d3c6dfd28ce32bae68
 MISC metadata.xml 329 BLAKE2B caa7a5bfcbbf62b32546c2a8cb0d3e55b1b1d0371b81505156a566df605e277d9560d900a4d2f945b4d9da99b7898edec3c08264b5628f4d74c9c949f805e455 SHA512 d77d10152c5497c4bb21511bd20b8a122159e048d11d070fffbd2ef5742be3bd0019eafb79a5e828b923b095b8628ff1d65371800ea49dbe6ec6355d1b9a0150
diff --git a/net-news/quiterss/quiterss-0.18.12.ebuild b/net-news/quiterss/quiterss-0.18.12.ebuild
index 2f26f2b7e331..dabec7dd1cbc 100644
--- a/net-news/quiterss/quiterss-0.18.12.ebuild
+++ b/net-news/quiterss/quiterss-0.18.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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.9-r1.ebuild b/net-news/quiterss/quiterss-0.18.9-r1.ebuild
deleted file mode 100644
index 88ced73d4dfc..000000000000
--- a/net-news/quiterss/quiterss-0.18.9-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 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
-}