diff --git a/net-news/feedreader/Manifest b/net-news/feedreader/Manifest
index caff0d1..e1e1f67 100644
--- a/net-news/feedreader/Manifest
+++ b/net-news/feedreader/Manifest
@@ -1,7 +1,4 @@
-AUX 0001-fix-webkit2gtk-vapi.patch 3475 BLAKE2B eaf78de80ec2a69e49e137bc22cbf13006b1249c9f564ed5be37795e33c170077fcde1f9535d00a07faa2e0718fb5f0dabb77f5d6c80924ea9d593faedb258e3 SHA512 f1b35ca9101441f4dec8b6048f577341139ad2b5be1dc269bd20bc4e32218a59bcbbb2a21bbc6a7115ae64adbee22c8a632eafa7b4614f2cbb0fa2ed19ab6b1f
-DIST v2.0.2.tar.gz 725025 BLAKE2B e1adb64d2160af1c0046c89e608507df7520cd73ebee2446f6e95cbbeb09b2ca1ebc23f3a6f02d234e1b2402d64661dd6df8bd3d634c5c8963d1e7cd9d325e04 SHA512 99d1946d959c64977a35470b3eb67183c0d5643f51d838809c628ffb12964d5bfcb5b82b32f289a0bfcf70e105014f856ebba8b514b3f1ad00b5c2bb551c5dee
 DIST v2.3.0.tar.gz 573678 BLAKE2B aa0a14ac226394894fa8654268850d3aaede1a964c77702f128cafd8097e05851711c16fad3323738a46d05e1f7d8d15f0c689a2bf75e67bdf2c8bfd416233a2 SHA512 eedb2e17a6053c7142d7e7994f3329a35c2de3ceac5691abcb59ffb5f9475e7b05f00e2606180566b9d4a09a32715038a0df6d680200a8cd2fcfe7239fa807e2
-EBUILD feedreader-2.0.2-r2.ebuild 1528 BLAKE2B 2809bb2c4f8256b63f0c6a2a59ebc66f1c81da270238af30506f33e682c6043b791db830802d9df9403ad7d4c7381528261fa6753944e0dad778fdeb7491340b SHA512 ab76fad3ede9305bf0272201b01dda74ee6a800e403f42d2d3e7db2f11caa8e96454710b04eccceb291c37d5944f0e0e38f41a877c1f22c746b4b6801163ec64
 EBUILD feedreader-2.3.0.ebuild 1171 BLAKE2B 347b587a438f006a17740c32de25a7b9153772402bfbfd532fe9404c8793cf620e15b09bee20aa85eb9a086689d97fc7bfd923da68f09a84a3b8dfebcadf1484 SHA512 ca0c42d8f3c481eb5bba1f1adf4a92ed7d0feef27c606026bcca5d1c33f1ab62214ac5b92b489b4d90149ab263640474d9a585b0437c7863b03f2603ddcabfb8
 MISC ChangeLog 2111 BLAKE2B 3dfae5d25603f5d593133fb1713e02d553dfef71299c43cca70d3210584ee4b907b89c79820563564f5a800c438c743bdb50a1c4b79bd337d0a9323bbde0cafe SHA512 220cc3191ffa8cb68f03a531206f7fdf5105d5457e91beda3f0ca0412a6824b2bb0e736e9965983e7a652bc3fd9c647afbda4bceb40fc006287a57b07f83cce6
 MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2
diff --git a/net-news/feedreader/feedreader-2.0.2-r2.ebuild b/net-news/feedreader/feedreader-2.0.2-r2.ebuild
deleted file mode 100644
index 59d3bd2..0000000
--- a/net-news/feedreader/feedreader-2.0.2-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2 vala
-
-CMAKE_MIN_VERSION="2.6"
-VALA_MIN_API_VERSION="0.26"
-
-MY_PN="FeedReader"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple News Feed Reader for feeds aggregated by Tiny Tiny RSS or feedly"
-HOMEPAGE="https://github.com/jangernert/${MY_PN}"
-SRC_URI="https://github.com/jangernert/${MY_PN}/archive/v${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror"
-
-RDEPEND="$(vala_depend)
-	app-crypt/libsecret[vala]
-	dev-db/sqlite:3
-	dev-libs/gobject-introspection
-	dev-libs/json-glib
-	dev-libs/libgee:0.8
-	dev-libs/libpeas
-	dev-libs/libxml2
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	net-libs/gnome-online-accounts
-	net-libs/libsoup:2.4
-	net-libs/rest
-	net-libs/webkit-gtk:4
-	net-misc/curl
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libnotify"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/0001-fix-webkit2gtk-vapi.patch"
-	vala_src_prepare
-	eapply_user
-}
-
-src_configure() {
-	local PREFIX=/usr
-	local mycmakeargs=(
-		-DWITH_LIBUNITY=OFF
-		-DVALA_EXECUTABLE="${VALAC}"
-		-DCMAKE_INSTALL_PREFIX="${PREFIX}"
-		-DGSETTINGS_LOCALINSTALL=OFF
-		-DUSE_WEBKIT_4=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/net-news/feedreader/files/0001-fix-webkit2gtk-vapi.patch b/net-news/feedreader/files/0001-fix-webkit2gtk-vapi.patch
deleted file mode 100644
index 753d2a9..0000000
--- a/net-news/feedreader/files/0001-fix-webkit2gtk-vapi.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9c59cfb..fe22f3e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -125,7 +125,7 @@ set(UI_PACKAGES
- 	libsecret-1
- 	libnotify
- 	rest-0.7
--	WebKit2-4.0
-+	webkit2gtk-4.0
- 	gstreamer-1.0
- 	gstreamer-pbutils-1.0
- 	libpeas-1.0
-diff --git a/plugins/backend/demo/CMakeLists.txt b/plugins/backend/demo/CMakeLists.txt
-index d6d018c..87bc5d4 100644
---- a/plugins/backend/demo/CMakeLists.txt
-+++ b/plugins/backend/demo/CMakeLists.txt
-@@ -47,7 +47,7 @@ PACKAGES
-     libsecret-1
-     sqlite3
-     libsoup-2.4
--    WebKit2-4.0
-+    webkit2gtk-4.0
- 
- OPTIONS
-     --target-glib=2.32
-diff --git a/plugins/backend/feedbin/CMakeLists.txt b/plugins/backend/feedbin/CMakeLists.txt
-index 35361e9..1d25652 100644
---- a/plugins/backend/feedbin/CMakeLists.txt
-+++ b/plugins/backend/feedbin/CMakeLists.txt
-@@ -52,7 +52,7 @@ PACKAGES
-     libsecret-1
-     sqlite3
-     libsoup-2.4
--    WebKit2-4.0
-+    webkit2gtk-4.0
- 
- OPTIONS
-     --target-glib=2.32
-diff --git a/plugins/backend/feedly/CMakeLists.txt b/plugins/backend/feedly/CMakeLists.txt
-index a0cdabd..d314eb8 100644
---- a/plugins/backend/feedly/CMakeLists.txt
-+++ b/plugins/backend/feedly/CMakeLists.txt
-@@ -52,7 +52,7 @@ PACKAGES
-     libsecret-1
-     sqlite3
-     libsoup-2.4
--    WebKit2-4.0
-+    webkit2gtk-4.0
- 
- OPTIONS
-     --target-glib=2.32
-diff --git a/plugins/backend/fresh/CMakeLists.txt b/plugins/backend/fresh/CMakeLists.txt
-index 0ca5511..dd6b7de 100644
---- a/plugins/backend/fresh/CMakeLists.txt
-+++ b/plugins/backend/fresh/CMakeLists.txt
-@@ -52,7 +52,7 @@ PACKAGES
-     libsecret-1
-     sqlite3
-     libsoup-2.4
--    WebKit2-4.0
-+    webkit2gtk-4.0
- 
- OPTIONS
-     --target-glib=2.32
-diff --git a/plugins/backend/inoreader/CMakeLists.txt b/plugins/backend/inoreader/CMakeLists.txt
-index ff2d8ef..7b051f5 100644
---- a/plugins/backend/inoreader/CMakeLists.txt
-+++ b/plugins/backend/inoreader/CMakeLists.txt
-@@ -50,7 +50,7 @@ PACKAGES
-     json-glib-1.0
-     sqlite3
-     libsoup-2.4
--    WebKit2-4.0
-+    webkit2gtk-4.0
- 
- OPTIONS
-     --target-glib=2.32
-diff --git a/plugins/backend/local/CMakeLists.txt b/plugins/backend/local/CMakeLists.txt
-index 3ec5a7a..36cb3f4 100644
---- a/plugins/backend/local/CMakeLists.txt
-+++ b/plugins/backend/local/CMakeLists.txt
-@@ -61,7 +61,7 @@ PACKAGES
-     libsecret-1
-     sqlite3
-     libsoup-2.4
--    WebKit2-4.0
-+    webkit2gtk-4.0
-     posix
- 
- OPTIONS
-diff --git a/plugins/backend/oldreader/CMakeLists.txt b/plugins/backend/oldreader/CMakeLists.txt
-index 4a5aca9..3005191 100644
---- a/plugins/backend/oldreader/CMakeLists.txt
-+++ b/plugins/backend/oldreader/CMakeLists.txt
-@@ -51,7 +51,7 @@ PACKAGES
-     libsecret-1
-     sqlite3
-     libsoup-2.4
--    WebKit2-4.0
-+    webkit2gtk-4.0
- 
- OPTIONS
-     --target-glib=2.32
-diff --git a/plugins/backend/owncloud/CMakeLists.txt b/plugins/backend/owncloud/CMakeLists.txt
-index ca5b9c9..30352bd 100644
---- a/plugins/backend/owncloud/CMakeLists.txt
-+++ b/plugins/backend/owncloud/CMakeLists.txt
-@@ -51,7 +51,7 @@ PACKAGES
-     libsecret-1
-     sqlite3
-     libsoup-2.4
--    WebKit2-4.0
-+    webkit2gtk-4.0
- 
- OPTIONS
-     --target-glib=2.32
-diff --git a/plugins/backend/ttrss/CMakeLists.txt b/plugins/backend/ttrss/CMakeLists.txt
-index e80d489..c738ed3 100644
---- a/plugins/backend/ttrss/CMakeLists.txt
-+++ b/plugins/backend/ttrss/CMakeLists.txt
-@@ -51,7 +51,7 @@ PACKAGES
-     libsecret-1
-     sqlite3
-     libsoup-2.4
--    WebKit2-4.0
-+    webkit2gtk-4.0
- 
- OPTIONS
-     --target-glib=2.32