gentoo resync : 18.11.2018

12 files changed, 64 insertions, 418 deletions

diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 8db814e9e3ce..73fe85ced767 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 5341a845577b..8740ebcd78c2 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,11 +1,5 @@
-AUX liferea-1.12_rc3-signal.patch 2713 BLAKE2B 1e30542d6d40ccf8f9c9e7d327c791c3d5ff706e0442832af6258eb916d7df3929ebcbfd8f6398965698cf3254824e465a6267ed4a2a9a542515abae7b1532ab SHA512 539880199d49d5e2a635324be15406f0ccabf74dfcfd11ff75add18a3e4374b2e2c97b4cb691f9046070435b39456402727d8c0d41ab27b6b21ec3c1347901f3
-DIST liferea-1.12-rc3.tar.bz2 1474948 BLAKE2B 2eff01f0494024d40f2a530ba52a29778ea3a90b2ad786c76658451140509e99c81d08a54e50a4688588e79a0638de72aed09fd6c8e856941094760d6498b07e SHA512 cc3b84444ec95c158311d5d2df7bec0c18f83fd4a7a6a38fdc67a613283288a90076892d0e632447b0523674c8182e70723f2fb865f479cd6fe7a22d4d29d8bb
-DIST liferea-1.12.1.tar.bz2 1490079 BLAKE2B 56963749537bfe7c1f57e95725756b6da43637c2f6a872482033bafbbbb04539d59f942dbb6e35ceda9426a7311b9ba70d37d0a91fb575287dbfe4f5bbc5b136 SHA512 d3e53127f62e91b23aa042ae6dc655eb174f2823320cc01c4cb2b9074f6547ae9a34f6daeb0c1dfb37dfb9f85890ab67223a863f2679ad15a5c7c7f3840d711a
-DIST liferea-1.12.2.tar.bz2 1466151 BLAKE2B cc627cb567c1b08f8ce109d24ee5021184f64129f2343ade87950027e728ee769a495f114ad41d8cffa1646ef32585521b018b5eb64bb25f59c1af6701bdf633 SHA512 185c9a29760b9ff053835be44b7530d069e52d11c58901c183bd634cb8d3f146e93170e6755a452f36f2d37c602313737dd6140313a1825297186c35b0222e77
 DIST liferea-1.12.3.tar.bz2 1467804 BLAKE2B 3ef8039b7af136568e041309a384547543908e193cd384af819e24cd7ae213e4020e0ea099128295603ecf36d5d817b7529a2356191320ba80f4624128a72a36 SHA512 574dd13502fee81e81e88a0fa3a57028af2d2bfcfed5a132468a2be9257a886c7cbf958883c230deb6dbf952912ecc92631396ef6b5c353315833e0541db1208
-EBUILD liferea-1.12.1.ebuild 1628 BLAKE2B 6f141ca0fe6f8dca02b36d06ed651eb5e9e572daa5670e45cb5860fdbfb0b8b621f49512daa1871590892d3db0f2d22716c4f5a548714c99a8728ed9d6c06e04 SHA512 49a76b1f8def9150c9af36d94c69a8bdf447aa083988aa96403181b93bbd1151205f13cb1f1ee500a3ad70b7d3318b9733658e10ac1735cd6007b901d2133ee7
-EBUILD liferea-1.12.2.ebuild 1457 BLAKE2B 3ce91edfb65fcd2beea9eeec4b476648786dd4b126ae6ae96852a445922f3ae06ded28083d3b597180848239d6b36eb74e787942413e0263e092a142bcbaca50 SHA512 08236a0423618d86902723bd6ce465545a86ec64d1dec29c583363a8b3d673416deb4ebb1e809e26526190696bea4dae90bcf1237fdf0207dbdf17e23a24b2c3
+DIST liferea-1.12.5a.tar.bz2 1470744 BLAKE2B 83f86b1f08efe32c236f7a4bcf8f18e4c6d568cd0d94ebdf6fb700f4d5e3afd433f55628272e46984c81932d7a7004cf09bc9efe93c90e841afe1cd9953baec1 SHA512 6ada3750d40310cc56577baff29796bd26d1da6d74958dbfd46d9477ac24c2f33f5a88cd82a143073dd2e34dcfb4d82fdeec8029307f7c6a4e16e587d2148b5c
 EBUILD liferea-1.12.3.ebuild 1457 BLAKE2B 52122ea77aa05232d068856e64904ea6d0faf1b0d21036d329d33f384bc167ea2e3e20fdaf34ee610130f5fc361462edf51147b03b6b8b520d4afc4ef4e32b22 SHA512 1e4086c7f35cd17b58de2b92e5079034b25bce284756cf31fe867e2fe02f4ddd348959bd35a2e383177ac1ca9e08241317faf87c1273b7d8753736a239c0d73e
-EBUILD liferea-1.12_rc3-r1.ebuild 1672 BLAKE2B af86924207475fd49923b9370c26c66f2ccf1dd56779ef3bf48403465843e7ca17292516b134f49f679a40e975afe35f306060bdda2c8c87510283abc670843d SHA512 7ebd450ce69b09da4a9f1b4b9a96feee486001ba0e8650a201b332741bdd3f3166b05a6b5502baf6065cd0536605be884c643013274d32f422a8eea3cef9d8dd
-EBUILD liferea-1.12_rc3.ebuild 1624 BLAKE2B 7d4e6599750af8c41b55e42f94ccadb88842d347d886b80872801b2b559f8ff2b35c93a96688cd682c4bc5639f1f3994c774f54f12a07244f3bfa6fd7b37a77f SHA512 7bdaf799e2d1de0eb601d056c9dc5099d357082ff627d7f8531047a4a92942a6b581f681a4d0b80dcff2408106e3a08507572ccf7237c95b51da9b622c56850c
-MISC metadata.xml 650 BLAKE2B eb85cb3dfd2c9b13cbbe7920a034674c82af4106728e27b7a0685c9353561d7fea0d0a3366652553ef218fd859cad3d008218bd8410c61f858a128f7fc1b0abe SHA512 8545d82a6b01ef0bf9d7bb723d59bcfc73abb2717495790cdcd59e8bd635e187d9acf49961faebbd170ad9c0475d0dc1279efcfa8a1a64a23e769a07ffe7b586
+EBUILD liferea-1.12.5a.ebuild 1256 BLAKE2B 9b63296945203094ebf29558640225fe86a6a2a1862c8aa1f1012b7de2244ab353201cc0f2dd2252ee77a00a778924817dd7a493bfca62ff505dd14c429fb54a SHA512 6be8c14a0156a84e9bda42db7538ed465ea08b512576b40e68b543c973a6d75e2a6e4cd1dffc81d15448a1a431057a53621c9ddaa0c10b23364b7670ee8121c1
+MISC metadata.xml 1279 BLAKE2B 661fdedf44a0ce186cb151ad3793f24911b52295471e1340c99ffcf2ae759c653bb349192012ea7ef1673bc410a9dcf825d0504da3a2f3953f97fcbd4a96e809 SHA512 e5da4779c45577b73eb0dd63e13a0d416644e3bf94f5ebb682d462bf8807d81721a5f5bff8c07e7ce62d197e04ce1549189624c08642bb4813a3731e32aedde5
diff --git a/net-news/liferea/files/liferea-1.12_rc3-signal.patch b/net-news/liferea/files/liferea-1.12_rc3-signal.patch
deleted file mode 100644
index 56fa5a8cce64..000000000000
--- a/net-news/liferea/files/liferea-1.12_rc3-signal.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From b08641b21bdb590770e10bad873666aedf4ae306 Mon Sep 17 00:00:00 2001
-From: leiaz <leiaz@free.fr>
-Date: Sun, 14 May 2017 20:08:39 +0200
-Subject: [PATCH] Fixes #500 Connects browser entry to callback
-
-Glade copy/paste doesn't copy the signals/callbacks part. I missed that
-one when updating the ui file.
----
- glade/prefs.ui | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/glade/prefs.ui b/glade/prefs.ui
-index b5b97bac0..65d055986 100644
---- a/glade/prefs.ui
-+++ b/glade/prefs.ui
-@@ -736,16 +736,6 @@
-                       </packing>
-                     </child>
-                     <child>
--                      <object class="GtkComboBox" id="browserpopup">
--                        <property name="visible">True</property>
--                        <property name="can_focus">False</property>
--                      </object>
--                      <packing>
--                        <property name="left_attach">1</property>
--                        <property name="top_attach">1</property>
--                      </packing>
--                    </child>
--                    <child>
-                       <object class="GtkLabel" id="manuallabel">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
-@@ -765,6 +755,7 @@
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="activates_default">True</property>
-+                        <signal name="changed" handler="on_browsercmd_changed" swapped="no"/>
-                       </object>
-                       <packing>
-                         <property name="left_attach">1</property>
-@@ -787,6 +778,16 @@
-                       </packing>
-                     </child>
-                     <child>
-+                      <object class="GtkComboBox" id="browserpopup">
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">False</property>
-+                      </object>
-+                      <packing>
-+                        <property name="left_attach">1</property>
-+                        <property name="top_attach">1</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-                       <placeholder/>
-                     </child>
-                   </object>
-@@ -1422,5 +1423,8 @@
-     <action-widgets>
-       <action-widget response="-7">prefclosebtn</action-widget>
-     </action-widgets>
-+    <child>
-+      <placeholder/>
-+    </child>
-   </object>
- </interface>
diff --git a/net-news/liferea/liferea-1.12.1.ebuild b/net-news/liferea/liferea-1.12.1.ebuild
deleted file mode 100644
index daae977aa595..000000000000
--- a/net-news/liferea/liferea-1.12.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools gnome2 pax-utils python-single-r1
-
-MY_P=${P/_/-}
-MY_PV=${PV/_/-}
-
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
-HOMEPAGE="https://lzone.de/liferea/"
-SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-db/sqlite-3.7.0:3
-	>=dev-libs/glib-2.28.0:2
-	dev-libs/gobject-introspection
-	dev-libs/json-glib
-	>=dev-libs/libpeas-1.0.0[gtk,python,${PYTHON_USEDEP}]
-	>=dev-libs/libxml2-2.6.27:2
-	>=dev-libs/libxslt-1.1.19
-	gnome-base/gsettings-desktop-schemas
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	>=x11-libs/pango-1.4.0"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# gnome2_src_prepare calls elibtoolize
-	if [ -f "${S}"/.elibtoolized ]; then
-		local AT_NOELIBTOOLIZE="yes"
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	gnome2_src_configure --disable-schemas-compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	# bug #338213
-	# Uses webkit's JIT. Needs mmap('rwx') to generate code in runtime.
-	# MPROTECT policy violation. Will sit here until webkit will
-	# get optional JIT.
-	pax-mark m "${D%/}"/usr/bin/liferea
-
-	einfo "If you want to enhance the functionality of this package,"
-	einfo "you should consider installing:"
-	einfo "    net-misc/networkmanager"
-}
diff --git a/net-news/liferea/liferea-1.12.2.ebuild b/net-news/liferea/liferea-1.12.2.ebuild
deleted file mode 100644
index 8df197e80aae..000000000000
--- a/net-news/liferea/liferea-1.12.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome2 pax-utils python-single-r1
-
-MY_P=${P/_/-}
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
-HOMEPAGE="https://lzone.de/liferea/"
-SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v${PV/_/-}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-db/sqlite-3.7.0:3
-	>=dev-libs/glib-2.28.0:2
-	dev-libs/gobject-introspection
-	dev-libs/json-glib
-	>=dev-libs/libpeas-1.0.0[gtk,python,${PYTHON_USEDEP}]
-	>=dev-libs/libxml2-2.6.27:2
-	>=dev-libs/libxslt-1.1.19
-	gnome-base/gsettings-desktop-schemas
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	>=x11-libs/pango-1.4.0"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
-	gnome2_src_configure --disable-schemas-compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	# bug #338213
-	# Uses webkit's JIT. Needs mmap('rwx') to generate code in runtime.
-	# MPROTECT policy violation. Will sit here until webkit will
-	# get optional JIT.
-	pax-mark m "${ED%/}"/usr/bin/liferea
-}
-
-pkg_postinst() {
-	elog "If you want to enhance the functionality of this package,"
-	elog "you should consider installing:"
-	elog "    net-misc/networkmanager"
-}
diff --git a/net-news/liferea/liferea-1.12.5a.ebuild b/net-news/liferea/liferea-1.12.5a.ebuild
new file mode 100644
index 000000000000..ca30e636b58c
--- /dev/null
+++ b/net-news/liferea/liferea-1.12.5a.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
+HOMEPAGE="https://lzone.de/liferea/"
+SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v1.12.5/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="gnome-keyring mediaplayer networkmanager notification tray"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="${PYTHON_DEPS}
+	>=dev-db/sqlite-3.7.0:3
+	>=dev-libs/glib-2.28.0:2
+	dev-libs/gobject-introspection
+	dev-libs/json-glib
+	>=dev-libs/libpeas-1.0.0[gtk,python,${PYTHON_USEDEP}]
+	>=dev-libs/libxml2-2.6.27:2
+	>=dev-libs/libxslt-1.1.19
+	gnome-base/gsettings-desktop-schemas
+	>=net-libs/libsoup-2.42:2.4
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	>=x11-libs/pango-1.4.0"
+RDEPEND="${CDEPEND}
+	gnome-keyring? ( app-crypt/libsecret[introspection] )
+	mediaplayer? ( media-libs/gstreamer[introspection] )
+	networkmanager? ( net-misc/networkmanager )
+	notification? ( x11-libs/libnotify[introspection] )
+	tray? (
+		dev-python/pycairo
+		x11-libs/gdk-pixbuf[introspection]
+	)"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
diff --git a/net-news/liferea/liferea-1.12_rc3-r1.ebuild b/net-news/liferea/liferea-1.12_rc3-r1.ebuild
deleted file mode 100644
index 5e51ec580547..000000000000
--- a/net-news/liferea/liferea-1.12_rc3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit autotools gnome2 pax-utils python-single-r1
-
-MY_P=${P/_/-}
-MY_PV=${PV/_/-}
-
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
-HOMEPAGE="https://lzone.de/liferea/"
-SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-db/sqlite-3.7.0:3
-	>=dev-libs/glib-2.28.0:2
-	dev-libs/gobject-introspection
-	dev-libs/json-glib
-	>=dev-libs/libpeas-1.0.0[gtk,python,${PYTHON_USEDEP}]
-	>=dev-libs/libxml2-2.6.27:2
-	>=dev-libs/libxslt-1.1.19
-	gnome-base/gsettings-desktop-schemas
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	>=x11-libs/pango-1.4.0"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${P}-signal.patch"
-)
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# gnome2_src_prepare calls elibtoolize
-	if [ -f "${S}"/.elibtoolized ]; then
-		local AT_NOELIBTOOLIZE="yes"
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	gnome2_src_configure --disable-schemas-compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	# bug #338213
-	# Uses webkit's JIT. Needs mmap('rwx') to generate code in runtime.
-	# MPROTECT policy violation. Will sit here until webkit will
-	# get optional JIT.
-	pax-mark m "${D%/}"/usr/bin/liferea
-
-	einfo "If you want to enhance the functionality of this package,"
-	einfo "you should consider installing:"
-	einfo "    net-misc/networkmanager"
-}
diff --git a/net-news/liferea/liferea-1.12_rc3.ebuild b/net-news/liferea/liferea-1.12_rc3.ebuild
deleted file mode 100644
index 244e16b4e418..000000000000
--- a/net-news/liferea/liferea-1.12_rc3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit autotools gnome2 pax-utils python-single-r1
-
-MY_P=${P/_/-}
-MY_PV=${PV/_/-}
-
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
-HOMEPAGE="https://lzone.de/liferea/"
-SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-db/sqlite-3.7.0:3
-	>=dev-libs/glib-2.28.0:2
-	dev-libs/gobject-introspection
-	dev-libs/json-glib
-	>=dev-libs/libpeas-1.0.0[gtk,python,${PYTHON_USEDEP}]
-	>=dev-libs/libxml2-2.6.27:2
-	>=dev-libs/libxslt-1.1.19
-	gnome-base/gsettings-desktop-schemas
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	>=x11-libs/pango-1.4.0"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# gnome2_src_prepare calls elibtoolize
-	if [ -f "${S}"/.elibtoolized ]; then
-		local AT_NOELIBTOOLIZE="yes"
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	gnome2_src_configure --disable-schemas-compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	# bug #338213
-	# Uses webkit's JIT. Needs mmap('rwx') to generate code in runtime.
-	# MPROTECT policy violation. Will sit here until webkit will
-	# get optional JIT.
-	pax-mark m "${D%/}"/usr/bin/liferea
-
-	einfo "If you want to enhance the functionality of this package,"
-	einfo "you should consider installing:"
-	einfo "    net-misc/networkmanager"
-}
diff --git a/net-news/liferea/metadata.xml b/net-news/liferea/metadata.xml
index 794bcd1338cb..ed69629ab75a 100644
--- a/net-news/liferea/metadata.xml
+++ b/net-news/liferea/metadata.xml
@@ -13,8 +13,21 @@
 	Liferea is a news aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds.  It's
 	based on gnome and xulrunner/webkit.
 	</longdescription>
+	<use>
+		<flag name="gnome-keyring">Enable support for Libsecret Support 
+			plugin that allows Liferea to use <pkg>app-crypt/libsecret</pkg>
+			as password store</flag>
+		<flag name="mediaplayer">Enable support for Media Player plugin 
+			that allows to play music and videos directly from Liferea</flag>
+		<flag name="networkmanager">Use NetworkManager to monitor 
+			nerwork status</flag>
+		<flag name="notification">Enable support for Popup Notifications 
+			plugin that display popups informing about new updates</flag>
+		<flag name="tray">Enable support for Tray Icon (GNOME Classic) 
+			plugin that display a small system tray icon to hide/unhide 
+			Liferea</flag>
+	</use>
 	<upstream>
-		<remote-id type="sourceforge">liferea</remote-id>
 		<remote-id type="github">lwindolf/liferea</remote-id>
 	</upstream>
 </pkgmetadata>
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
-}