gentoo auto-resync : 16:09:2023 - 17:00:58

5 files changed, 10 insertions, 138 deletions

diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 5010dfb41e68..7fed4feaf3fc 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 99319a37e27f..edd0a9fd3fe8 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,7 +1,5 @@
-AUX liferea-1.12.9-webkit-css.patch 1760 BLAKE2B f99c7c86053a6b63a4e3d7cd3b13506870d60addab454c15c9113d5b04bba82e48b5117fc6baa2831356ea6a87ead6662c06b95aa93770c36719ff4c3dc49146 SHA512 438930eb0b23b83d996477a31014287a60b5d8e14e4828ee34ed65cda49161d9a61e85d49a396e53fd53f64f52d1dc56dfc6858113c4fb0cbad30614780d12b2
-DIST liferea-1.12.10.tar.bz2 1503040 BLAKE2B 8a935f889b972787a55f0d09c4314ee5ff4d4fa42b46af46d84e5dd5d13df95adf898dc522baadd76e7c752c9f47d771122698882142202002ebf2fa5b0e3f31 SHA512 34b9c5b9c58aaac790e44aa2495a169ea2fbc3cdf351013324615b65c083045c3b09c5d5fa6eeba994184d2d7a9e52626241877c24194f4f771af0f5b3afb067
 DIST liferea-1.14.5.tar.gz 1833641 BLAKE2B 5505e33bd113b3ea0bf7582f75aa968de2b4bbbc659f224062d735bb357177a3eec5dca26dbc22151ccb1659e740ce2068ee2933ef82eb2e3c3a96b31528e570 SHA512 866e795e31644a8546d0fd6eae2976e0c031650caf77aa87e90bc17a55f65d2c207bb295649c7b4d318fb0d628f7cae1fc0d563f59260eddfeafbe9c885f3550
-EBUILD liferea-1.12.10-r1.ebuild 1786 BLAKE2B 684e0f4ee57d0852b50a29e1e3cce5976f51ff1bbeaf16efd6a012de3c215480c120f95c24e3232c398eb078f6ecd14539400b8963363ec82161ec1bf1db2f95 SHA512 109578961a869c1dfbfdf556e4f885d677f83fa3233aad2cdacabae92fc0f782d78791c37b1dedc4844313cfbf2d61d0dc02c1c51aaf27bd8e37741dc97e2015
-EBUILD liferea-1.12.10.ebuild 1786 BLAKE2B e9a0d536a3423de0696cee17e75f5b628abcd9e64b5fd1a7e3b8788d71abe7bba73a2e4f082e5549ee712bfd1fb7387f0c44d39a5fb81e4852950e6b0ca23447 SHA512 5d258566f54ec7c7195a8c080ed2d365f30f4e616cd9faec621d9bf2a5800448d6b8dc64baa3fbad3a48da5409e8b5c177a62f4298fe14c4d87158ecbdcc0ba7
+DIST liferea-1.15.3.tar.gz 1860898 BLAKE2B c339259b084a7e49b34643cbd9717b04ca7e4fb1ea4f87b30027325b8846c51f3db08105fe5056001e843716b32633fa1ad3a6c5ab4cbdac857b3bf51d7e5477 SHA512 45c237e11ef85ae67da34c557b7ef8695ec450dc35c8454ab16116df4eb0031f6755edd8045f121fc4a2ff6624848212fa5ec47a30e63b2d5936be9759086581
 EBUILD liferea-1.14.5.ebuild 1691 BLAKE2B fef471a5fd05d9cf9e7c063cdd7f511855d049d6045b5723b051cd304dce70bb2707eee3a68a394fa523433cbf4c9d36d3cdc62824abefce4262572ba92b4307 SHA512 1c48c125ebe28b41d0cae9a26718e32fa60dfb30a28961056615e648712ec3ff60d99a137262750a30716c3474fb11c854f864df10aea526ab35cfa6b36deecc
+EBUILD liferea-1.15.3.ebuild 1695 BLAKE2B 41ba9b290d4fc45a0f8791e35c30f83d582d4af9753f0cf2615a7b83e1c3ee653397c6cda0445e4ed5b009262a87cc232f4fcbcffb01d9018e65ae4c56d5c3b8 SHA512 2308acd8d26ee9c3925981bf87a23b90db4688b7533a3e147dc1623a40f783f29de24b69bd8b800afde6524be96d5055787015241807e3b23927b42300170e2c
 MISC metadata.xml 629 BLAKE2B 88e0018637621448c67f2b514c11f3be85a6f2a4a1a0d7af0df0bea2e2cff8651bf8d064c17c314a31da0090231e35811cd60ad8b2a25175e997dc4a2487ead1 SHA512 ae109cd972bf652d0598b660ef74bba8783d097fe87b1ed5839975c3788a905f1768176ec914b03d6e495c89ccac121ea807fd088f77d7c96e582e175a9aae13
diff --git a/net-news/liferea/files/liferea-1.12.9-webkit-css.patch b/net-news/liferea/files/liferea-1.12.9-webkit-css.patch
deleted file mode 100644
index 55ceec78b44d..000000000000
--- a/net-news/liferea/files/liferea-1.12.9-webkit-css.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 78fa1f32078eb7a56073ed49fd4b5ce481250f83 Mon Sep 17 00:00:00 2001
-From: Paul Gevers <elbrus@debian.org>
-Date: Thu, 29 Apr 2021 20:59:01 +0200
-Subject: [PATCH] Apply patch for easier review
-
----
- src/webkit/webkit.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/src/webkit/webkit.c b/src/webkit/webkit.c
-index 5be72130..70823359 100644
---- a/src/webkit/webkit.c
-+++ b/src/webkit/webkit.c
-@@ -369,6 +369,21 @@ liferea_webkit_impl_download_started (WebKitWebContext	*context,
- 	enclosure_download (NULL, webkit_uri_request_get_uri (request), TRUE);
- }
- 
-+static void
-+liferea_webkit_handle_liferea_scheme (WebKitURISchemeRequest *request, gpointer user_data)
-+{
-+	const gchar *uri = webkit_uri_scheme_request_get_uri (request);
-+	GInputStream *stream;
-+	gssize length;
-+	gchar *contents;
-+
-+	contents = g_strdup_printf ("Placeholder handler for liferea scheme. URI requested : %s", uri);
-+	length = (gssize) strlen (contents);
-+	stream = g_memory_input_stream_new_from_data (contents, length, g_free);
-+	webkit_uri_scheme_request_finish (request, stream, length, "text/plain");
-+	g_object_unref (stream);
-+}
-+
- static void
- liferea_webkit_impl_init (LifereaWebKitImpl *self)
- {
-@@ -379,6 +394,8 @@ liferea_webkit_impl_init (LifereaWebKitImpl *self)
- 	self->dbus_connections = NULL;
- 	self->settings = webkit_settings_new ();
- 	font = webkit_get_font (&fontSize);
-+	webkit_web_context_register_uri_scheme (webkit_web_context_get_default(), "liferea",
-+		(WebKitURISchemeRequestCallback) liferea_webkit_handle_liferea_scheme,NULL,NULL);
- 
- 	security_manager = webkit_web_context_get_security_manager (webkit_web_context_get_default ());
- 	webkit_security_manager_register_uri_scheme_as_local (security_manager, "liferea");
--- 
-GitLab
-
diff --git a/net-news/liferea/liferea-1.12.10.ebuild b/net-news/liferea/liferea-1.12.10.ebuild
deleted file mode 100644
index 1fffe934d842..000000000000
--- a/net-news/liferea/liferea-1.12.10.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit autotools gnome2-utils optfeature python-single-r1 xdg
-
-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}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	dev-libs/json-glib
-	dev-libs/libpeas[gtk,python,${PYTHON_SINGLE_USEDEP}]
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	gnome-base/gsettings-desktop-schemas
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/intltool
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.9-webkit-css.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	sed -i -e 's#$(datadir)/appdata#$(datadir)/metainfo#g' \
-		Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_compile() {
-	# Workaround crash in libwebkit2gtk-4.0.so
-	# https://bugs.gentoo.org/704594
-	WEBKIT_DISABLE_COMPOSITING_MODE=1 \
-		default
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	optfeature "Libsecret Support plugin" app-crypt/libsecret[introspection]
-	optfeature "Tray Icon (GNOME Classic) plugin" "dev-python/pycairo x11-libs/gdk-pixbuf[introspection]"
-	optfeature "Media Player plugin" media-libs/gstreamer[introspection]
-	optfeature "monitoring network status" net-misc/networkmanager
-	optfeature "Popup Notifications plugin" x11-libs/libnotify[introspection]
-}
diff --git a/net-news/liferea/liferea-1.12.10-r1.ebuild b/net-news/liferea/liferea-1.15.3.ebuild
index 515dc67f6044..76a9aaf11f60 100644
--- a/net-news/liferea/liferea-1.12.10-r1.ebuild
+++ b/net-news/liferea/liferea-1.15.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 
@@ -9,16 +9,17 @@ inherit autotools gnome2-utils optfeature python-single-r1 xdg
 
 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}/${P}.tar.bz2"
+SRC_URI="https://github.com/lwindolf/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-db/sqlite:3
+	dev-libs/fribidi
 	dev-libs/glib:2
 	dev-libs/gobject-introspection
 	dev-libs/json-glib
@@ -26,23 +27,17 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/libxml2:2
 	dev-libs/libxslt
 	gnome-base/gsettings-desktop-schemas
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
+	net-libs/libsoup:3.0
+	net-libs/webkit-gtk:4.1=
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/pango"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-util/intltool
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.9-webkit-css.patch
-)
-
 src_prepare() {
-	xdg_src_prepare
-
-	sed -i -e 's#$(datadir)/appdata#$(datadir)/metainfo#g' \
-		Makefile.am || die
+	default
 	eautoreconf
 }