gentoo resync : 17.08.2021

5 files changed, 6 insertions, 185 deletions

diff --git a/net-libs/libgrss/Manifest b/net-libs/libgrss/Manifest
index 9b1294a2e271..024c8c18cb7f 100644
--- a/net-libs/libgrss/Manifest
+++ b/net-libs/libgrss/Manifest
@@ -1,7 +1,3 @@
-AUX libgrss-0.5.0-fix-slotting.patch 3986 BLAKE2B a4fcde8d97fcabf79db52e7b3f99b31ebd60167621f2fdd0a0193d71473676d83aa064f34fa78f3c5d7fb331aa14bf81771fb7297f32c97c074cc6a750d199ba SHA512 797b2290d1a7bb40b3a89c2fcd7cb8f26c0cdd242e510c51880bf6aacbe511f74207b35c9d114a8cee6854cf4379f13c0297b080493a787c27039fbf0a6d69c3
-AUX libgrss-0.5.0-headers.patch 268 BLAKE2B a9873d24aa5c0bdbe004c3d91466127fba21636ed10c3a32c6d5140ea1d9b1b27bffd1146ffcb7309e66d93f3219b13b7da0cf1c86e8fddf4932492d7330dc9c SHA512 4352a3f80f5dccd164adacd32a3568df7c7274bac9a80cb4aac2d2e41cf62e40156a4aa96e4cd420f8279821b17dc63a51bafeab2cd7b5e1d3c0d760c503f738
-DIST libgrss-0.5.0.tar.gz 439634 BLAKE2B 28fcdfc7026b53c83bf8f97194bb70c1d68721bd767a1d527713756eb4360bb1ae81a2512d4284032d590bc5143fe9dedf1251c161bc22f0d4a1320639d05aed SHA512 189c49b7bdf029160e72d3d89c6779e193373e5a3af7f810041bf325d0b5543bb87b414d833a13e028a589b96a4d53bb223e88667d18d2c53f610d6086bb60ea
 DIST libgrss-0.7.0.tar.xz 362360 BLAKE2B d93337ab50edf9b5d0762a624fbf0db29faca556e5d13d51659c6199d9dcbf71bc8334b8a9c6a2830d9496b86d066949fc7b072439b63f3a528ef36b77c61bc0 SHA512 22a4f13ee979932575c6efd25bfd2fb184ea113aa34254d9e4bfb64cfbbd9b277dd235b8c9be037baf8c85bea7ba3bc1478ec3c7a3c87e63aeddb1774959c780
-EBUILD libgrss-0.5.0-r1.ebuild 867 BLAKE2B 53ea59a5f326c2bae6b221f1465d5f1eb4857db951c65df825f13e1e6135a690e5ab5b5e501dfa8a887116faf8e6c01d8f10ca45c214805a5c00dcf6330cde48 SHA512 264323f62db8359f0ed14c8eebc02113b4d2f171a9729cd20229adcf59794e5d2dc25ec61925df605a0e7e77c72f7cf98cdd924bdeb2ad9995b15a19286a45a4
-EBUILD libgrss-0.7.0.ebuild 611 BLAKE2B d3a6e95a785b129e2bb87c2542e59d60e0cdf1bb6a91862b77b1c5f4f2c29d61dee07fca0e4188bb789fd76a093dd127980ef6c8a2eba27fc0f672d95c9369f0 SHA512 ef4078d9f120df4e62c39a8363485bdc306143bae7089918d40bc2d3486960684f332f065fee9a8e1b107b94e7ff5af3fcdda754118315b70bc15ea0655d3497
+EBUILD libgrss-0.7.0.ebuild 590 BLAKE2B 9f84b48cb762a77dbb04b00fec12c5e84f55ea26aadf3100e078c898b97013843cdff54b0d7983f23d8b1a9dc2252e2c72bcf86368ec3ade3cb7333ec3d3dd2d SHA512 047954ea263c8740704cb4b7239fd8a013a0549f87f6fa594c6f2562c0604b173f23db55fa5d0defdb77d7a981e93694c9e8814af481646c981946a1e8a507bb
 MISC metadata.xml 392 BLAKE2B a3683c8e5db0596508877ac63d648bea8ba8bdf1e6fad9bd5eeab6d1003eba5dd9cda58515e80d8f287cb4cd7d056028a4656d2f83660d102c2326c48620ca5c SHA512 ea3b3f271fba72e28c4d0ab6db46c4fe58d5bac4999192a324ecea7f5199b8191cdaaaba89fc437bc24fa146a29a61a17f3df12bbc3d32c69a6aa91a795c05e3
diff --git a/net-libs/libgrss/files/libgrss-0.5.0-fix-slotting.patch b/net-libs/libgrss/files/libgrss-0.5.0-fix-slotting.patch
deleted file mode 100644
index 01146aeb0902..000000000000
--- a/net-libs/libgrss/files/libgrss-0.5.0-fix-slotting.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 4b93347fee20ea18196cab9f702be88ecd23f54e Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Mon, 1 Apr 2013 16:07:21 +0200
-Subject: [PATCH 1/2] Fix parallel installation for API version 0.5
-
----
- Makefile.am               |  5 +++--
- configure.ac              |  3 +++
- doc/reference/Makefile.am |  4 ++--
- libgrss.pc.in             |  4 ++--
- src/Makefile.am           | 12 ++++++------
- 5 files changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8547d3b..a13acf4 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,11 +1,12 @@
- ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = src doc
- EXTRA_DIST = autogen.sh
-+CLEANFILES = libgrss-$(LIBGRSS_API_VERSION).pc
- 
- pcfiledir = $(libdir)/pkgconfig
--pcfile_DATA = libgrss-0.5.pc
-+pcfile_DATA = libgrss-$(LIBGRSS_API_VERSION).pc
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- 
--libgrss-0.5.pc: libgrss.pc
-+libgrss-$(LIBGRSS_API_VERSION).pc: libgrss.pc
- 	@cp -f $< $@
-diff --git a/configure.ac b/configure.ac
-index 61effa3..443140b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,6 +1,7 @@
- m4_define([libgrss_major_version], [0])
- m4_define([libgrss_minor_version], [5])
- m4_define([libgrss_micro_version], [0])
-+m4_define([libgrss_api_version], [0.5])
- 
- m4_define([libgrss_version],
-           [libgrss_major_version.libgrss_minor_version.libgrss_micro_version])
-@@ -46,10 +47,12 @@ AC_CHECK_FUNCS([strptime localtime_r])
- LIBGRSS_MAJOR_VERSION=libgrss_major_version
- LIBGRSS_MINOR_VERSION=libgrss_minor_version
- LIBGRSS_MICRO_VERSION=libgrss_micro_version
-+LIBGRSS_API_VERSION=libgrss_api_version
- LIBGRSS_VERSION=libgrss_version
- AC_SUBST(LIBGRSS_MAJOR_VERSION)
- AC_SUBST(LIBGRSS_MICRO_VERSION)
- AC_SUBST(LIBGRSS_MINOR_VERSION)
-+AC_SUBST(LIBGRSS_API_VERSION)
- AC_SUBST(LIBGRSS_VERSION)
- 
- dnl libgrss checks
-diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
-index 644642d..eafbc65 100644
---- a/doc/reference/Makefile.am
-+++ b/doc/reference/Makefile.am
-@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = 1.6
- # of using the various options.
- 
- # The name of the module, e.g. 'glib'.
--DOC_MODULE=libgrss
-+DOC_MODULE=libgrss-@LIBGRSS_API_VERSION@
- 
- # The top-level SGML file. You can change this if you want to.
- DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-@@ -71,7 +71,7 @@ expand_content_files=
- # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
- 
- INCLUDES=-I$(top_srcdir) $(LIBGRSS_CFLAGS)
--GTKDOC_LIBS=$(top_builddir)/src/libgrss-1.0.la $(LIBGRSS_LIBS)
-+GTKDOC_LIBS=$(top_builddir)/src/libgrss-@LIBGRSS_API_VERSION@.la $(LIBGRSS_LIBS)
- 
- # This includes the standard gtk-doc make rules, copied by gtkdocize.
- include $(top_srcdir)/gtk-doc.make
-diff --git a/libgrss.pc.in b/libgrss.pc.in
-index cdd0f6f..3d75924 100644
---- a/libgrss.pc.in
-+++ b/libgrss.pc.in
-@@ -6,6 +6,6 @@ includedir=@includedir@
- Name: libgrss
- Description: GObject RSS handling library
- Version: @VERSION@
--Libs: -L${libdir} -lgrss-1.0
--Cflags: -I${includedir}/libgrss
-+Libs: -L${libdir} -lgrss-@LIBGRSS_API_VERSION@
-+Cflags: -I${includedir}/libgrss-@LIBGRSS_API_VERSION@
- Requires: gobject-2.0 libxml-2.0 libsoup-2.4
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8587d73..8e0bb5c 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -74,18 +74,18 @@ feed-marshal.c: feed-marshal.list
- 	echo "#include \"feed-marshal.h\"" > $@ &&    \
- 		$(GLIB_GENMARSHAL) $< --prefix=feed_marshal --body >> $@
- 
--lib_LTLIBRARIES = libgrss-1.0.la
-+lib_LTLIBRARIES = libgrss-0.5.la
- 
--libgrss_1_0_la_LIBADD = $(LIBGRSS_LIBS)
--libgrss_1_0_la_SOURCES = \
-+libgrss_0_5_la_LIBADD = $(LIBGRSS_LIBS)
-+libgrss_0_5_la_SOURCES = \
- 	$(sources_public_h) \
- 	$(sources_private_h) \
- 	$(sources_c) \
- 	$(NULL)
--libgrss_1_0_la_LDFLAGS = $(LDADD)
-+libgrss_0_5_la_LDFLAGS = $(LDADD)
- 
--libgrssincludedir = $(includedir)/libgrss
--libgrssinclude_DATA = $(sources_public_h)
-+libgrss_0_5_ladir = $(includedir)/libgrss-@LIBGRSS_API_VERSION@
-+libgrss_0_5_la_HEADERS = $(sources_public_h)
- 
- CLEANFILES = $(pcfile_DATA)
- 
--- 
-1.8.1.5
-
diff --git a/net-libs/libgrss/files/libgrss-0.5.0-headers.patch b/net-libs/libgrss/files/libgrss-0.5.0-headers.patch
deleted file mode 100644
index 5e129d0eb9ab..000000000000
--- a/net-libs/libgrss/files/libgrss-0.5.0-headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/utils.h	2013-11-08 00:04:21.877945385 +0100
-+++ b/src/utils.h	2013-11-08 00:05:45.397901242 +0100
-@@ -34,6 +34,8 @@
- #include <errno.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/socket.h>
-+#include <arpa/inet.h>
- 
- #include "libgrss.h"
- 
diff --git a/net-libs/libgrss/libgrss-0.5.0-r1.ebuild b/net-libs/libgrss/libgrss-0.5.0-r1.ebuild
deleted file mode 100644
index 97d1a4d42169..000000000000
--- a/net-libs/libgrss/libgrss-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit autotools epatch gnome2
-
-DESCRIPTION="LibGRSS is a library for easy management of RSS/Atom/Pie feeds"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgrss"
-SRC_URI="http://gtk.mplat.es/libgrss/tarballs/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0.5"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.30.2:2
-	>=dev-libs/libxml2-2.7.8:2
-	>=net-libs/libsoup-2.36.1:2.4
-"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/gtk-doc-am-1.10
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix soname/.pc
-	epatch "${FILESDIR}"/${P}-fix-slotting.patch
-
-	# Fix build with newer glibc
-	epatch "${FILESDIR}"/${P}-headers.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
diff --git a/net-libs/libgrss/libgrss-0.7.0.ebuild b/net-libs/libgrss/libgrss-0.7.0.ebuild
index 5cd89dff71d1..6499b91ae43f 100644
--- a/net-libs/libgrss/libgrss-0.7.0.ebuild
+++ b/net-libs/libgrss/libgrss-0.7.0.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=7
 
 inherit gnome2
 
-DESCRIPTION="LibGRSS is a library for easy management of RSS/Atom/Pie feeds"
+DESCRIPTION="Library for easy management of RSS/Atom/Pie feeds"
 HOMEPAGE="https://wiki.gnome.org/Projects/Libgrss"
 
 LICENSE="LGPL-3"
@@ -20,7 +19,8 @@ RDEPEND="
 	>=net-libs/libsoup-2.48:2.4
 	introspection? ( >=dev-libs/gobject-introspection-1.42 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/gtk-doc-am-1.10
 	virtual/pkgconfig
 "