gentoo auto-resync : 14:11:2022 - 18:51:10

3 files changed, 21 insertions, 91 deletions

diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 2b607eafb243..43c23269c310 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,6 +1,6 @@
 AUX liferea-1.12.9-webkit-css.patch 1760 BLAKE2B f99c7c86053a6b63a4e3d7cd3b13506870d60addab454c15c9113d5b04bba82e48b5117fc6baa2831356ea6a87ead6662c06b95aa93770c36719ff4c3dc49146 SHA512 438930eb0b23b83d996477a31014287a60b5d8e14e4828ee34ed65cda49161d9a61e85d49a396e53fd53f64f52d1dc56dfc6858113c4fb0cbad30614780d12b2
 DIST liferea-1.12.9.tar.bz2 1496593 BLAKE2B a0887a7b04c47a69166396f06305342232b16eefba04df1a0cda7c9d84880e025d73786a55aaa528a143fccef213fa2de9474fb6fab3f301e54a12dba4a705f1 SHA512 09156e0e5e4342741b6290be17ee94a3204d431c687c17688e23067d151d36a178193f5cf01da222974810a48626c877b0cf917fbdd9ecb6e81254e85750be9b
-EBUILD liferea-1.12.9-r1.ebuild 1810 BLAKE2B 26158b6b92acac35a9d17404af10ca3743de77e900c19e9b2fb10ce15a84d9350b5c587bd1e03d7abdd14fe23fd3ed5f10f3c2d22a17191de3c5eb2a6314beae SHA512 05ea996284a3e005865b4c433531f7eb427bfeb929ab14b0737cf17a6e64cfa40fdc7dbaa871433ecd5c8b8b33ddcdf92d7ed7be706cdf7ea2eb67f616137287
+DIST liferea-1.14-RC2.tar.bz2 1737026 BLAKE2B a47b9e675c429ab38d3cf451ee1b42d17819ce95926d631ead3fbdfdf510b5ee6c387c7b774b4966a7608ded738a81c163b0d032ec8e18a87c4a52e9b18b3413 SHA512 15c4bd6e46ae96ea5fda36bcb055d7eb674f5b5be07c1ae3a9846694b3345518d00ce80f2af740f317ee68a9703673a8dbba4ee560bda5d58276f4d498c83b59
 EBUILD liferea-1.12.9-r2.ebuild 1778 BLAKE2B 312846454c44f979b73ff734226c0b8657aa71b4b7e93a58639f5324e04bffec58baf1aa91e77d28d3b22e4f160530f3ec2ba68f860f86c70ff288ae624cfac2 SHA512 1c753133217058abf8f6a50316dbd64746fd05eb8c2b16993e2355ac3c4d0b430f9e4de1028e577bdf40c505b667ff938f884ec3f3df57de7fcb039f4466508a
-EBUILD liferea-1.12.9.ebuild 1751 BLAKE2B c8f019957382f437cb7f3fd795d7aa2d6ad8fd1185ff9bac9b10d24515d2a4bba8e871587332c8b0320848f3bc04e05cb00714bb061162971e1fc631673702cd SHA512 b9bb424ce896932738d304db27178fe537c5a8a879ddbfa6573a72b26ff9163dcc78b3672695a439451ac00fc4ad6b6d4b61860f4041cabb9c46719d34b83de4
+EBUILD liferea-1.14_rc2.ebuild 1852 BLAKE2B bacf3c5b16a6da253b0b07bd39bf0035cc6d2c147ec9bdad1deae6cd43d6496db00b0ab30dadd501b283d2d2565c7e988bd3ea40f760ad630effcc5810203276 SHA512 36de2951f5a049b627e9518194034def138d25af442806c15bd687c6149617cb87b176c017ad9e40cfca57077343cac56f9e634c5c43baf1e33089fa6b9838eb
 MISC metadata.xml 629 BLAKE2B 88e0018637621448c67f2b514c11f3be85a6f2a4a1a0d7af0df0bea2e2cff8651bf8d064c17c314a31da0090231e35811cd60ad8b2a25175e997dc4a2487ead1 SHA512 ae109cd972bf652d0598b660ef74bba8783d097fe87b1ed5839975c3788a905f1768176ec914b03d6e495c89ccac121ea807fd088f77d7c96e582e175a9aae13
diff --git a/net-news/liferea/liferea-1.12.9.ebuild b/net-news/liferea/liferea-1.12.9.ebuild
deleted file mode 100644
index 09074e456845..000000000000
--- a/net-news/liferea/liferea-1.12.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools gnome2-utils 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 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"
-
-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
-
-	elog "Additional features can be enabled via"
-	elog "\tapp-crypt/libsecret[introspection] for Libsecret Support plugin"
-	elog "\tdev-python/pycairo and x11-libs/gdk-pixbuf[introspection] for Tray Icon (GNOME Classic) plugin"
-	elog "\tmedia-libs/gstreamer[introspection] for Media Player plugin"
-	elog "\tnet-misc/networkmanager for monitoring network status"
-	elog "\tx11-libs/libnotify[introspection] for Popup Notifications plugin"
-}
diff --git a/net-news/liferea/liferea-1.12.9-r1.ebuild b/net-news/liferea/liferea-1.14_rc2.ebuild
index 0a846ad9c42e..2a0e29a8fee7 100644
--- a/net-news/liferea/liferea-1.12.9-r1.ebuild
+++ b/net-news/liferea/liferea-1.14_rc2.ebuild
@@ -1,24 +1,29 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..11} )
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV^^}"
+MY_P="${PN}-${MY_PV}"
 
-inherit autotools gnome2-utils python-single-r1 xdg
+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}/releases/download/v${MY_PV}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~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
@@ -27,19 +32,16 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/libxslt
 	gnome-base/gsettings-desktop-schemas
 	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
+	net-libs/webkit-gtk:4=
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/pango"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-util/intltool
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-webkit-css.patch
-)
-
 src_prepare() {
-	xdg_src_prepare
+	default
 
 	sed -i -e 's#$(datadir)/appdata#$(datadir)/metainfo#g' \
 		Makefile.am || die
@@ -66,10 +68,9 @@ pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
 
-	elog "Additional features can be enabled via"
-	elog "\tapp-crypt/libsecret[introspection] for Libsecret Support plugin"
-	elog "\tdev-python/pycairo and x11-libs/gdk-pixbuf[introspection] for Tray Icon (GNOME Classic) plugin"
-	elog "\tmedia-libs/gstreamer[introspection] for Media Player plugin"
-	elog "\tnet-misc/networkmanager for monitoring network status"
-	elog "\tx11-libs/libnotify[introspection] for Popup Notifications plugin"
+	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]
 }