gentoo auto-resync : 08:10:2023 - 00:01:40

5 files changed, 39 insertions, 22 deletions

diff --git a/x11-misc/e16menuedit2/Manifest b/x11-misc/e16menuedit2/Manifest
index 03c763415884..4079c097bdb5 100644
--- a/x11-misc/e16menuedit2/Manifest
+++ b/x11-misc/e16menuedit2/Manifest
@@ -1,5 +1,6 @@
-AUX e16menuedit2-no-common.patch 725 BLAKE2B 48a150bc33e3baac1a8bbc2f18d560ffe0a67a5a65a57633e7255c554fa9eed9f4201e775742416163ae0af4a805d0a113b6c0be2730091376d61cb9916da1ef SHA512 d99db1bd84c47369f98f2caff216cbdd9c2e10d35eed243ed0971c2f533ed26aa3a93d09a01f4fdce4c15a80416892f74f94d5168d74fa5183aacb6ddb8cea1a
-AUX e16menuedit2-no-default-docs.patch 461 BLAKE2B 87453feb85cff012e821ca86c477bd413e416dffc5893fe1f98121e6090ac73f28d47a8fe1bfb8d93388fc39373433544f988bfa52f62e322a2b261a90d9f717 SHA512 64b115434428a5632f9a2d0c28159a65136cbb106060275e57401018d9c574e68a461dca4f31e4949d089a92c86bca37433c5c0e660b085a495f8baa0f001088
+AUX e16menuedit2-autotools.patch 607 BLAKE2B d17fe4960598b73b1401b04acdfe79970b08288d5b5ea830a61b87dd10de522cf43dac7978c53a96baa9df5a9a04ec033551becc6cec69aae1381c10085219f1 SHA512 75eac9b240bd9926c0b7c3b7e36d7c962ae916df0250d86c36f79612c5f0d1bd5bb2199926479e54c34c68cd1c4db6d9c52e1a9a268aa99bd01957a330d8b05b
+AUX e16menuedit2-missing-include.patch 230 BLAKE2B 02f9b3abb2e91b31bb3415376160f4a0dfb176a04558c323071e6703cd0f46a482338ff3f1fc670d99dabf8f32af4dc35f2cbfbebb1f6f18a2531d5038f13e1f SHA512 e900804dab265b9e94fd53a53d553a1cb72c87543d7f6367763484de7a3027ee0afb49aefb4f95246e105227b418841b2c868c8f78992c476e46ee2729365863
+AUX e16menuedit2-no-common.patch 503 BLAKE2B 5b8e99b903bdbc145946bd8a9d317b35004bd80ef76d396e0733a9df6e2074764de8669662ede8eae2cbf1aa00976072673f4bb7c58d51df6a5bc30b79d73eab SHA512 578a011b3588754c72ef1a5c85b64d5af500d3098e7362b6d6e7f03cd0fb9cb34c35786ce3179d1c11c99a55dbe10892262c9d3635bd0a1d4f2205d277d6ba7c
 DIST e16menuedit2-0.0.3.tar.gz 370740 BLAKE2B 5d5be198f72afbd7cf22f02d8bb9179c3f877101eccc9b57c3a5e4f2fd05260e807d267d4c7abfd40fc0a41700e876efceb992d27450f2960772321a625c5a85 SHA512 41942028e7d20b5aa46fce8f54f60af46bd08e292a1812d4845d68cbc670699c8fc70a8d71c2749df623a4a083b92bc9539b9241fd7daabbee0deb855ff1be99
-EBUILD e16menuedit2-0.0.3.ebuild 731 BLAKE2B a9ad047dcd402e3b1e8feae368b687fa605029f7244c9d32ecd13b7fc069597158697d56c9253d04bb5638c98c70e0d77320b471b565b2ce09e6adfcf257e192 SHA512 427a7049dae277c49872d916f447b40d73317ad84200512b1eea8e337ba62f0c72f0f608a7bd9dbf39e85eae59acd866464e4ac4464c0cdcd0123dacce987318
+EBUILD e16menuedit2-0.0.3-r1.ebuild 676 BLAKE2B 9efe4d51382ba10e54cf3431d08c460e7c82706d20b99d73c2cbaacad968961f1f54d52e148291776740687095a18c643cc6b482133e0a47800a44c33b6bd06c SHA512 ad98777e4aa3112b58b23c7a0a5a34d0b4c70e3c73f7e70f8580c08973e2afb57a4b31423089099bc64eda0c696ebe6b5ca65bdbb44305f379a1eb26293c376c
 MISC metadata.xml 344 BLAKE2B 4a9ce9fcd1aba325a9cd820cd5a8caa164b175fec230e4a758195a045e323548584eb804db9c45be296ef1cde018cbabde46e103c8e42494b4d865ed74aba559 SHA512 1da877cb9e37be7b052cd4d7450d3a1f2049ab7623d9823c3b4e73facf18007462b9e2d64a8e783c8c6d2e9c3d99c154cb64d083452bcbb2d69ef3af85e2a5de
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"