x11-misc/e16menuedit2: update EAPI 6 -> 8

Signed-off-by: David Seifert <soap@gentoo.org>

4 files changed, 35 insertions, 19 deletions

diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3-r1.ebuild
index 44b1cc54d695..97e6c4f9efaf 100644
--- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
+++ b/x11-misc/e16menuedit2/e16menuedit2-0.0.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 GNOME2_EAUTORECONF="yes"
 inherit gnome2
@@ -9,25 +9,21 @@ inherit gnome2
 DESCRIPTION="Menu editor for Enlightenment DR16 written in GTK2"
 HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
 SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
-DEPEND="
+RDEPEND="
 	>=gnome-base/libglade-2.4
-	virtual/pkgconfig
 	x11-libs/gtk+:2
 	x11-wm/e16
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-no-default-docs.patch"
-	"${FILESDIR}/${PN}-no-common.patch"
+	"${FILESDIR}"/${PN}-missing-include.patch
+	"${FILESDIR}"/${PN}-autotools.patch
+	"${FILESDIR}"/${PN}-no-common.patch
 )
-
-src_prepare() {
-	sed -i '1i#include <glib/gstdio.h>' src/e16menuedit2.c || die
-	gnome2_src_prepare
-}
diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-no-default-docs.patch b/x11-misc/e16menuedit2/files/e16menuedit2-autotools.patch
index bb456d52b0d7..98ae4d6fbd99 100644
--- a/x11-misc/e16menuedit2/files/e16menuedit2-no-default-docs.patch
+++ b/x11-misc/e16menuedit2/files/e16menuedit2-autotools.patch
@@ -1,5 +1,5 @@
---- e16menuedit2-0.0.3/Makefile.am.orig	2019-03-08 00:52:08.000000000 +0300
-+++ e16menuedit2-0.0.3/Makefile.am	2019-03-08 00:52:31.930201552 +0300
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -2,15 +2,8 @@
  
  SUBDIRS = src po pixmaps help
@@ -18,3 +18,13 @@
  
  GLADE_FILES = e16menuedit2.glade
  
+--- a/configure.in
++++ b/configure.in
+@@ -1,6 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT(configure.in)
++AC_INIT(configure.ac)
+ AM_INIT_AUTOMAKE(e16menuedit2, 0.0.3)
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-missing-include.patch b/x11-misc/e16menuedit2/files/e16menuedit2-missing-include.patch
new file mode 100644
index 000000000000..25cc8908177c
--- /dev/null
+++ b/x11-misc/e16menuedit2/files/e16menuedit2-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/e16menuedit2.c
++++ b/src/e16menuedit2.c
+@@ -31,6 +31,7 @@
+ #include <sys/types.h>
+ #include <string.h>
+ #include <stdarg.h>
++#include <glib/gstdio.h>
+ #include "callbacks.h"
+ #include "e16menuedit2.h"
+ #include "file.h"
diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch
index 4ac213b101f9..521be7df2b0d 100644
--- a/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch
+++ b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch
@@ -1,5 +1,5 @@
---- e16menuedit2-0.0.3/src/e16menu.h.orig	2020-10-11 10:41:36.827021380 +0300
-+++ e16menuedit2-0.0.3/src/e16menu.h	2020-10-11 10:51:27.043070842 +0300
+--- a/src/e16menu.h
++++ b/src/e16menu.h
 @@ -45,6 +45,6 @@
  gboolean table_check_func (GtkTreeModel *model, GtkTreePath *path,
                            GtkTreeIter *iter, gpointer user_data);			  
@@ -8,8 +8,8 @@
 +extern gchar *menu_file[MAX_RECURSION];
  
  #endif /* _E16MENU_H */
---- e16menuedit2-0.0.3/src/e16menu.c.orig	2005-02-18 15:09:55.000000000 +0300
-+++ e16menuedit2-0.0.3/src/e16menu.c	2020-10-11 10:51:52.615152314 +0300
+--- a/src/e16menu.c
++++ b/src/e16menu.c
 @@ -34,6 +34,7 @@
  #include "treeview.h"