[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/files/, gnome-base/gnome-vfs/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     ed699c8184f70d7ca5e3acd33fb9d700daa54e1b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 19:28:20 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 13:51:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed699c81

gnome-base/gnome-vfs: EAPI-7 bump, drop eutils, drop obsolete sed

Use GNOME2_EAUTORECONF="yes"
The only sed match was already dropped by gnome-vfs-2.24.4-automake-1.13.patch.

The same files are installed in the same locations and tests pass.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/gnome-vfs-2.15.2-headers-define.patch    |  4 +--
 .../files/gnome-vfs-2.20.0-automagic-deps.patch    |  4 +--
 .../files/gnome-vfs-2.20.1-automagic-deps.patch    |  4 +--
 .../files/gnome-vfs-2.24.4-openssl-1.1.patch       |  4 +--
 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild    | 30 +++++++---------------
 5 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
index f74db8edb1c..9d6e9978242 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
@@ -1,5 +1,5 @@
---- configure.in	2006-06-13 00:36:14.000000000 -0500
-+++ configure.in	2006-06-13 00:54:15.000000000 -0500
+--- a/configure.in
++++ b/configure.in
 @@ -191,6 +191,16 @@
  
  AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h sys/param.h wctype.h sys/poll.h poll.h)

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
index 876148b891f..18d900ac12c 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
@@ -1,7 +1,7 @@
 Index: configure.in
 ===================================================================
---- configure.in	(révision 5413)
-+++ configure.in	(copie de travail)
+--- a/configure.in
++++ b/configure.in
 @@ -448,9 +448,13 @@
  dnl GSSAPI
  dnl Check for Kerberos installation

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
index 11ac34c0721..63be9f95b9d 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
@@ -1,5 +1,5 @@
---- configure.in.	2007-11-30 04:15:01.000000000 +0100
-+++ configure.in	2007-11-30 04:16:21.000000000 +0100
+--- a/configure.in
++++ b/configure.in
 @@ -1102,6 +1102,7 @@
  	    AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
  	    [],[enable_acl=yes])

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
index 14207f28d19..cb1886ef4a2 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
@@ -4,8 +4,8 @@ struct SSL is opaque in openssl-1.1; and the SSL_free() man page
 says that one should not free members of it manually (in both
 the openssl-1.0 and openssl-1.1 man pages).
 
---- libgnomevfs/gnome-vfs-ssl.c.orig	2010-02-09 12:16:14.000000000 +0000
-+++ libgnomevfs/gnome-vfs-ssl.c
+--- a/libgnomevfs/gnome-vfs-ssl.c
++++ b/libgnomevfs/gnome-vfs-ssl.c
 @@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
  			}
  		}

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index ace27c50d46..aba99abca80 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
+EAPI=7
 
-inherit autotools eutils gnome2 multilib-minimal virtualx
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_EAUTORECONF="yes"
+inherit gnome2 multilib-minimal virtualx
 
 DESCRIPTION="Gnome Virtual Filesystem"
 HOMEPAGE="https://www.gnome.org/"
@@ -39,7 +38,8 @@ RDEPEND="
 			!gnome-extra/gnome-vfs-sftp ) )
 	zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	sys-devel/gettext
 	gnome-base/gnome-common
@@ -48,6 +48,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.13
 "
 
+DOCS=( "${S}"/{AUTHORS,ChangeLog,HACKING,NEWS,README,TODO} )
+
 PATCHES=(
 	# Allow the Trash on afs filesystems (#106118)
 	"${FILESDIR}"/${PN}-2.12.0-afs.patch
@@ -90,15 +92,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.24.4-openssl-1.1.patch
 )
 
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
 multilib_src_configure() {
 	local myconf=(
 		--disable-schemas-install
@@ -141,14 +134,9 @@ multilib_src_test() {
 	unset DISPLAY
 	# Fix bug #285706
 	unset XAUTHORITY
-	Xemake check
+	virtx emake check
 }
 
 multilib_src_install() {
 	gnome2_src_install
 }
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-	einstalldocs
-}