gentoo resync : 15.01.2020

6 files changed, 22 insertions, 114 deletions

diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 74f828a3e8cd..969a6bd52b33 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,9 +1,5 @@
 DIST liferea-1.12.3.tar.bz2 1467804 BLAKE2B 3ef8039b7af136568e041309a384547543908e193cd384af819e24cd7ae213e4020e0ea099128295603ecf36d5d817b7529a2356191320ba80f4624128a72a36 SHA512 574dd13502fee81e81e88a0fa3a57028af2d2bfcfed5a132468a2be9257a886c7cbf958883c230deb6dbf952912ecc92631396ef6b5c353315833e0541db1208
-DIST liferea-1.12.5a.tar.bz2 1470744 BLAKE2B 83f86b1f08efe32c236f7a4bcf8f18e4c6d568cd0d94ebdf6fb700f4d5e3afd433f55628272e46984c81932d7a7004cf09bc9efe93c90e841afe1cd9953baec1 SHA512 6ada3750d40310cc56577baff29796bd26d1da6d74958dbfd46d9477ac24c2f33f5a88cd82a143073dd2e34dcfb4d82fdeec8029307f7c6a4e16e587d2148b5c
-DIST liferea-1.12.6b.tar.bz2 1495311 BLAKE2B 28af2ed3045aa63646df4dc45d3108984a4ad41c85536fe8143af2629d0df44622508722f91a4860ba94f751e4a581e182b3f12c80d7be6acce1a12976c5a2dc SHA512 247d4cea97f890bf20b2d01394182d3020c2ccd056c6f0ff94d4c9055ae1c3d73e2e94609c66344260eb4ddece1df86cee8be745247735bd9b48f936f0ad74a8
 DIST liferea-1.12.7.tar.bz2 1495627 BLAKE2B 36e95d270e3c3f68499073c7f2b1b6c987b67fc40517bfeb95c7ce02fc0c66daccb8e7d15709f1a047b36eea3d6d0cfe4af2e37f6809051f1be7613a36e0234f SHA512 7628f089940cd285ae6269b8d788b230572a0f5cab8a81ea1e92010de98a3ecd21d39596be6c18c055469579468fe3df7fca4e917a6a1ef3644a5e24c8e55109
-EBUILD liferea-1.12.3.ebuild 1452 BLAKE2B 8a5d8a7ab18f767e993bf0111a2fa347926afdbc6753c699bfac9431ed1e98855e0ed98bb6ba9454d11b59daa8e240b0b77c1dfa4e06fc7dc31843fe133752f4 SHA512 9b54746f6977f69cc3cfa5e6c0b351e4487935bf7fffc85997a296d04beb57fc7803a9ab8789f581bb0f852ab3d7d3798dd585b37f6aa3a9b908683589016a10
-EBUILD liferea-1.12.5a.ebuild 1254 BLAKE2B bc1605758b936bff3cb98e1eb42c11472aeefccfc5acfa63b48e1a53da5b208e55df61770d7099cc242f15cf067e79f044c63fff4f67f4bab3fbf59b949f3ed0 SHA512 1ec6c6d752a4674a67a0154a13914816386a76277dc3c9f41a7f29ce1f237b16358ab8cac907495bd4540c124194ec007237e9350ea73f8325636bde21970838
-EBUILD liferea-1.12.6b.ebuild 1254 BLAKE2B 76198743051f8a1ab13c39f6feb8b14c06a246c8e6b6b2b384944af92ac4241bc619f4a3bbc825cfa021d1e43c7a651980298cfcc0c655d44dd0e3ea22ac3b59 SHA512 5ae08082bee062ddbe9b1c6f637f4b5cd325a4e42cc7ab79dc4a94a44afcec06b47f24fac4812c86f2fcc715e569f36f425bf9cb20dcfe8134e274e2847daef5
-EBUILD liferea-1.12.7.ebuild 1316 BLAKE2B b749be4c1f64ec43f28c68f808c56fc511b86d514da73248483be19ea1223c07986805d98da8fc9fbfd3e31ae290f0809951f62a04ed44282452127be2cb54dc SHA512 ea34a94db59bc7233ce8cb73d9f0702e018461109f7103d369801e210859631abde8a9896f855cc06c8b647f5e938c356526c5ee02ba840a329e1d7fde22bca5
-MISC metadata.xml 1279 BLAKE2B 661fdedf44a0ce186cb151ad3793f24911b52295471e1340c99ffcf2ae759c653bb349192012ea7ef1673bc410a9dcf825d0504da3a2f3953f97fcbd4a96e809 SHA512 e5da4779c45577b73eb0dd63e13a0d416644e3bf94f5ebb682d462bf8807d81721a5f5bff8c07e7ce62d197e04ce1549189624c08642bb4813a3731e32aedde5
+EBUILD liferea-1.12.3.ebuild 1619 BLAKE2B 1d60dfba23950fcc5caf72f97e9529910da4cec1c5119a26e2d0d4f9c5026a09f7960495d364a8034d5babfc0abc58f3f11273570ace682799c79d6a382c71b9 SHA512 3d2deb48ce158f048cac67b94c1617e520194120fbf8b528cbe2890ab352b4ce332b10aff6fa614b48fb5ee52014d66ba05176f7b09468149b8e0f03d744e3da
+EBUILD liferea-1.12.7.ebuild 1467 BLAKE2B 6e423c88cc8e9e09833f17e449fd82a9d599d004e679670c0918b02028443edf6e8fce315426464965a7c1202675a21b28d7908d704157cc8fd0776e5367b9e9 SHA512 f78de36a8d0ec725b73620fea3dfc4a78c33b63525b2b4bae1e4c94b219b5be4a0f48aadbf0fdb59db4dfd0abf76cb10c9d44579a97760235de1249339f2e07a
+MISC metadata.xml 598 BLAKE2B e6c962c4f6324f1e260256a64970926a9de2e0e24ba6fb53673c40d2aea969a6a779a77a00752a948d41e2923ab844c894b82880921f95a46bce94ba2d84e02c SHA512 d8d877c107353ca9a7a28fdc00a5df495dcd49ac80f111190362ee1e5f7e8bfe1eb2b5f0db298cb71c91d2a567dda5e83cb06178dc44f92704b30be0044a6512
diff --git a/net-news/liferea/liferea-1.12.3.ebuild b/net-news/liferea/liferea-1.12.3.ebuild
index 4bbfc0faefe2..523c5692039b 100644
--- a/net-news/liferea/liferea-1.12.3.ebuild
+++ b/net-news/liferea/liferea-1.12.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit gnome2 pax-utils python-single-r1
 
@@ -43,6 +43,13 @@ src_configure() {
 	gnome2_src_configure --disable-schemas-compile
 }
 
+src_compile() {
+	# Workaround crash in libwebkit2gtk-4.0.so
+	# https://bugs.gentoo.org/704594
+	WEBKIT_DISABLE_COMPOSITING_MODE=1 \
+                gnome2_src_compile
+}
+
 src_install() {
 	gnome2_src_install
 
diff --git a/net-news/liferea/liferea-1.12.5a.ebuild b/net-news/liferea/liferea-1.12.5a.ebuild
deleted file mode 100644
index 5d9268f49675..000000000000
--- a/net-news/liferea/liferea-1.12.5a.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{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.6b.ebuild b/net-news/liferea/liferea-1.12.6b.ebuild
deleted file mode 100644
index 0d73b993e8a6..000000000000
--- a/net-news/liferea/liferea-1.12.6b.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{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.6/${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.7.ebuild b/net-news/liferea/liferea-1.12.7.ebuild
index 273efc90205d..9f6063f540fa 100644
--- a/net-news/liferea/liferea-1.12.7.ebuild
+++ b/net-news/liferea/liferea-1.12.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit gnome2 python-single-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -34,6 +34,13 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig"
 
+src_compile() {
+	# Workaround crash in libwebkit2gtk-4.0.so
+	# https://bugs.gentoo.org/704594
+	WEBKIT_DISABLE_COMPOSITING_MODE=1 \
+		gnome2_src_compile
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 
diff --git a/net-news/liferea/metadata.xml b/net-news/liferea/metadata.xml
index ed69629ab75a..1e49cdec763d 100644
--- a/net-news/liferea/metadata.xml
+++ b/net-news/liferea/metadata.xml
@@ -13,20 +13,6 @@
 	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="github">lwindolf/liferea</remote-id>
 	</upstream>