Merge branch 'master' into 126-gitlab-10-4

net-news/feedreader/ChangeLog

@@ -1,3 +1,11 @@
+*feedreader-2.0.2-r2 (21 Feb 2018)
+
+  21 Feb 2018; Manuel Friedli <manuel@fritteli.ch> +feedreader-2.0.2-r2.ebuild,
+  +files/0001-fix-webkit2gtk-vapi.patch, -feedreader-2.0.2-r1.ebuild,
+  -files/0001-Add-webkit2gtk-vapi.patch:
+  net-news/feedreader:  Replace that huge patch with a smaller one, based on
+  github pullrequest no. 622: https://github.com/jangernert/FeedReader/pull/622
+
   06 Sep 2017; Manuel Friedli <manuel@fritteli.ch> -feedreader-1.6.2-r1.ebuild:
   net-news/feedreader:  Prune version 1.6.2-r1
 

net-news/feedreader/Manifest

@@ -1,5 +1,5 @@
-AUX 0001-Add-webkit2gtk-vapi.patch 77160 SHA256 6ce1ed01dbbfe20e97adba891a58c732feec19fcebe702a6a26ce0638b674401 SHA512 d546caf1e85b2ff60ce677e3a74ec07a62ce4b22f02d2ed7b17cdc2f292a69057fa5334168aa38fdd4e94cf29d3092583683f071605d1b5d4203a449ca015aa5 WHIRLPOOL a109b2358fb738707922b94b4856f0626bb2e87fc34cbc31a3d2d524266f31dd136c57ec44ba2c335b5dc7df53778e5af8f385d87cafa40cfe7330c023a7432d
+AUX 0001-fix-webkit2gtk-vapi.patch 3475 SHA256 1028e4558c44485cd07332c0da047f6fee8556a19e626c26177ee123feee08ea SHA512 f1b35ca9101441f4dec8b6048f577341139ad2b5be1dc269bd20bc4e32218a59bcbbb2a21bbc6a7115ae64adbee22c8a632eafa7b4614f2cbb0fa2ed19ab6b1f WHIRLPOOL 6e87fddb9d96380a0cf285a1bc8103470ffc99d062e96fb9afb66ab82deb086f1b2a8c73fd0a4bc41767e892fb34b49098010324e85c6ef5ed4164e1dff1b35c
 DIST v2.0.2.tar.gz 725025 SHA256 949262912bc07f8d1ec72dfa1bbeafb0ed1cea992589e1ee5901e0630c714261 SHA512 99d1946d959c64977a35470b3eb67183c0d5643f51d838809c628ffb12964d5bfcb5b82b32f289a0bfcf70e105014f856ebba8b514b3f1ad00b5c2bb551c5dee WHIRLPOOL fb6b91749c0f0d5ba3df620f012d577eeb37278b70b6b825e1eeff0a5634ee48436d4be80391b7ee2310be47a7b1e0decb2fcfeadc86749e927e8a4ac3a0016f
-EBUILD feedreader-2.0.2-r1.ebuild 1542 SHA256 7d39853eb52d09aa812bca3ea5ea2b896ca41e221fc8a94feb628cf3bb7a62cd SHA512 e9a24c3710f82009fe830be430916133c280c8d58bf36c0b0ad547814bd7b575eaf5aae4d8504090ec10457c423598a345f43cee49267b2da5d17fe551b15b4f WHIRLPOOL 2e72f9a3d1fc80e967b3c464d88103b8f0abe3bcf5499c14a96604a6234d000acc4ffa147d799ddb1010e7a00fae59f715395517e82fc5a5881016f61874fcf3
+EBUILD feedreader-2.0.2-r2.ebuild 1528 SHA256 9e16f6893925f3a4bd5a287a0afa05bd347a4a6167d89cdaf875234ef057e47f SHA512 ab76fad3ede9305bf0272201b01dda74ee6a800e403f42d2d3e7db2f11caa8e96454710b04eccceb291c37d5944f0e0e38f41a877c1f22c746b4b6801163ec64 WHIRLPOOL 7cee4393fa1c093f8c865220bdf57bdbccccc0e6c3b7f21c899b244b343185d192bd7ec42c568ddc1846d3a55cba810d1c82705716a55c970794a3489e4f30d7
-MISC ChangeLog 1560 SHA256 000b15a0b1a08c49df238ccb3069ca5be148cb149dbcb0876a9305c8bfd9f002 SHA512 90b29a0a47b6acdd4c5b638029412a716f31d90c14fa03bc9cfe3e1d3e79910378c465e71cf1a4306ed75ea5c9c0bbfc9fae50cebe7d1eb0e20c9094e38badf1 WHIRLPOOL 38a114e1633adc094630c2c7ccf75941c54f0dca535b3927ddd0169de84cdfbde2c14bb8fa909359f8f27e5868d29e4ce7235b319802db8f0fbb617be5a4b20b
+MISC ChangeLog 1945 SHA256 8d9de5030c69168dc6ca64c38d9a2641c0456a41b88040fedbc80e4611c9548d SHA512 3fb0b32b6157815810e0f11d9b7f1f2303d2bf84d9caca8d79c10059d7b6a1d936fb86e29ef2a5dbd2519adafc5d8416f4197b1354b0371f7f876b9b3ecbb5a4 WHIRLPOOL 8e4773b659e7b3eb39fd577a6bc725954b0fae56fafa42a520a9aeed82cd2904ee8933fa8b2a5eb8829a8d4e28537ad4ea27374e541039d24fa00b09fdce1870
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1

net-news/feedreader/feedreader-2.0.2-r2.ebuild

@@ -9,7 +9,6 @@ CMAKE_MIN_VERSION="2.6"
 VALA_MIN_API_VERSION="0.26"
 
 MY_PN="FeedReader"
-MY_PV="${PV}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Simple News Feed Reader for feeds aggregated by Tiny Tiny RSS or feedly"
@@ -47,7 +46,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/0001-Add-webkit2gtk-vapi.patch"
+	epatch "${FILESDIR}/0001-fix-webkit2gtk-vapi.patch"
 	vala_src_prepare
 	eapply_user
 }

net-news/feedreader/files/0001-fix-webkit2gtk-vapi.patch

@@ -0,0 +1,130 @@
+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