[gentoo-commits] repo/gentoo:master commit in: x11-misc/e16menuedit2/files/, x11-misc/e16menuedit2/
commit: b7b6297354122788f6f529d9a63b890dd59d6035 Author: David Seifert gentoo org> AuthorDate: Sat Oct 7 22:19:42 2023 + Commit: David Seifert gentoo org> CommitDate: Sat Oct 7 22:19:42 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b62973 x11-misc/e16menuedit2: update EAPI 6 -> 8 Signed-off-by: David Seifert gentoo.org> ...2-0.0.3.ebuild => e16menuedit2-0.0.3-r1.ebuild} | 22 +- ...ult-docs.patch => e16menuedit2-autotools.patch} | 14 -- .../files/e16menuedit2-missing-include.patch | 10 ++ .../files/e16menuedit2-no-common.patch | 8 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 similarity index 62% rename from x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild rename to 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 ' 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 similarity index 51% rename from x11-misc/e16menuedit2/files/e16menuedit2-no-default-docs.patch rename to 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.orig2019-03-08 00:52:08.0 +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 ..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 + #include + #include ++#include + #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.0 +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"
[gentoo-commits] repo/gentoo:master commit in: x11-misc/e16menuedit2/
commit: fddca3da275afe45e91e8d25fced9d564e2efca8 Author: Sam James gentoo org> AuthorDate: Mon Apr 19 19:29:50 2021 + Commit: Sam James gentoo org> CommitDate: Mon Apr 19 19:30:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fddca3da x11-misc/e16menuedit2: move pkgconfig dep for older EAPIs Package-Manager: Portage-3.0.18-prefix, Repoman-3.0.3 Signed-off-by: Sam James gentoo.org> x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild index 9c379752fcb..44b1cc54d69 100644 --- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild +++ b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,11 +14,9 @@ KEYWORDS="~amd64 ~x86" LICENSE="MIT-with-advertising" SLOT="0" -BDEPEND=" - virtual/pkgconfig -" DEPEND=" >=gnome-base/libglade-2.4 + virtual/pkgconfig x11-libs/gtk+:2 x11-wm/e16 "
[gentoo-commits] repo/gentoo:master commit in: x11-misc/e16menuedit2/, x11-misc/e16menuedit2/files/
commit: a1ae67275707d149aaf6daba5387dcbb2d94325c Author: Andrew Savchenko gentoo org> AuthorDate: Sun Oct 11 08:19:51 2020 + Commit: Andrew Savchenko gentoo org> CommitDate: Sun Oct 11 08:19:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ae6727 x11-misc/e16menuedit2: fix build with -fno-common Closes: https://bugs.gentoo.org/707426 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andrew Savchenko gentoo.org> x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild | 7 +-- .../e16menuedit2/files/e16menuedit2-no-common.patch | 20 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild index e0d251548c5..9c379752fcb 100644 --- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild +++ b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,7 +24,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-no-default-docs.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-no-default-docs.patch" + "${FILESDIR}/${PN}-no-common.patch" +) src_prepare() { sed -i '1i#include ' src/e16menuedit2.c || die diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch new file mode 100644 index 000..4ac213b101f --- /dev/null +++ b/x11-misc/e16menuedit2/files/e16menuedit2-no-common.patch @@ -0,0 +1,20 @@ +--- 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 +@@ -45,6 +45,6 @@ + gboolean table_check_func (GtkTreeModel *model, GtkTreePath *path, + GtkTreeIter *iter, gpointer user_data); + +-gchar *menu_file[MAX_RECURSION]; ++extern gchar *menu_file[MAX_RECURSION]; + + #endif /* _E16MENU_H */ +--- e16menuedit2-0.0.3/src/e16menu.c.orig 2005-02-18 15:09:55.0 +0300 e16menuedit2-0.0.3/src/e16menu.c 2020-10-11 10:51:52.615152314 +0300 +@@ -34,6 +34,7 @@ + #include "treeview.h" + + extern struct global_variables gv; ++gchar *menu_file[MAX_RECURSION]; + + GtkTreeModel *load_menus_from_disk (void) + {
[gentoo-commits] repo/gentoo:master commit in: x11-misc/e16menuedit2/files/, x11-misc/e16menuedit2/
commit: dbd4b64ea61cd01e0f332c9de4bd148c2e80735c Author: Andrew Savchenko gentoo org> AuthorDate: Fri Mar 8 05:31:50 2019 + Commit: Andrew Savchenko gentoo org> CommitDate: Fri Mar 8 05:35:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbd4b64e x11-misc/e16menuedit2: Re-add e16menuedit2 to the tree This is the last component to restore, no name change is needed. EAPI bump is limited to 6 since gnome2.eclass does not support EAPI 7 yet. Closes: https://bugs.gentoo.org/658860 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andrew Savchenko gentoo.org> x11-misc/e16menuedit2/Manifest | 1 + x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild| 32 ++ .../files/e16menuedit2-no-default-docs.patch | 20 ++ x11-misc/e16menuedit2/metadata.xml | 11 4 files changed, 64 insertions(+) diff --git a/x11-misc/e16menuedit2/Manifest b/x11-misc/e16menuedit2/Manifest new file mode 100644 index 000..567250da001 --- /dev/null +++ b/x11-misc/e16menuedit2/Manifest @@ -0,0 +1 @@ +DIST e16menuedit2-0.0.3.tar.gz 370740 BLAKE2B 5d5be198f72afbd7cf22f02d8bb9179c3f877101eccc9b57c3a5e4f2fd05260e807d267d4c7abfd40fc0a41700e876efceb992d27450f2960772321a625c5a85 SHA512 41942028e7d20b5aa46fce8f54f60af46bd08e292a1812d4845d68cbc670699c8fc70a8d71c2749df623a4a083b92bc9539b9241fd7daabbee0deb855ff1be99 diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild new file mode 100644 index 000..e0d251548c5 --- /dev/null +++ b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +GNOME2_EAUTORECONF="yes" +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" + +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" + >=gnome-base/libglade-2.4 + x11-libs/gtk+:2 + x11-wm/e16 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-no-default-docs.patch" ) + +src_prepare() { + sed -i '1i#include ' 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-no-default-docs.patch new file mode 100644 index 000..bb456d52b0d --- /dev/null +++ b/x11-misc/e16menuedit2/files/e16menuedit2-no-default-docs.patch @@ -0,0 +1,20 @@ +--- e16menuedit2-0.0.3/Makefile.am.orig2019-03-08 00:52:08.0 +0300 e16menuedit2-0.0.3/Makefile.am 2019-03-08 00:52:31.930201552 +0300 +@@ -2,15 +2,8 @@ + + SUBDIRS = src po pixmaps help + +-e16menuedit2docdir = ${prefix}/${packagedocdir} +-e16menuedit2doc_DATA = \ +- README\ +- COPYING\ +- AUTHORS\ +- ChangeLog\ +- INSTALL\ +- NEWS\ +-TODO ++e16menuedit2docdir = ${prefix} ++e16menuedit2doc_DATA = + + GLADE_FILES = e16menuedit2.glade + diff --git a/x11-misc/e16menuedit2/metadata.xml b/x11-misc/e16menuedit2/metadata.xml new file mode 100644 index 000..2f0f4890caf --- /dev/null +++ b/x11-misc/e16menuedit2/metadata.xml @@ -0,0 +1,11 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + +birc...@gentoo.org +Andrew Savchenko + + +enlightenment + +
[gentoo-commits] repo/gentoo:master commit in: x11-misc/e16menuedit2/files/, x11-misc/e16menuedit2/
commit: c2a7e577860ae8dbe172681715beb83c477894af Author: Joonas Niilola gmail com> AuthorDate: Sun Jun 17 12:25:59 2018 + Commit: Michał Górny gentoo org> CommitDate: Fri Jun 22 18:49:55 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2a7e577 x11-misc/e16menuedit2: removal Bug: https://bugs.gentoo.org/656020 x11-misc/e16menuedit2/Manifest | 1 - x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild| 31 -- .../files/e16menuedit2-0.0.3-no-docs.patch | 19 - x11-misc/e16menuedit2/metadata.xml | 8 -- 4 files changed, 59 deletions(-) diff --git a/x11-misc/e16menuedit2/Manifest b/x11-misc/e16menuedit2/Manifest deleted file mode 100644 index 567250da001..000 --- a/x11-misc/e16menuedit2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST e16menuedit2-0.0.3.tar.gz 370740 BLAKE2B 5d5be198f72afbd7cf22f02d8bb9179c3f877101eccc9b57c3a5e4f2fd05260e807d267d4c7abfd40fc0a41700e876efceb992d27450f2960772321a625c5a85 SHA512 41942028e7d20b5aa46fce8f54f60af46bd08e292a1812d4845d68cbc670699c8fc70a8d71c2749df623a4a083b92bc9539b9241fd7daabbee0deb855ff1be99 diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild deleted file mode 100644 index 5fc26891b70..000 --- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="yes" - -inherit gnome2 eutils - -DESCRIPTION="Menu editor for enlightenment DR16 written in GTK2" -HOMEPAGE="https://www.enlightenment.org/; -SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz" - -LICENSE="MIT-with-advertising" -SLOT="0" -KEYWORDS="amd64 arm ~ppc sh sparc x86" -IUSE="" - -RDEPEND=" - >=x11-wm/enlightenment-0.16 - >=gnome-base/libglade-2.4 - x11-libs/gtk+:2 -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-no-docs.patch - sed -i '1i#include ' src/e16menuedit2.c - gnome2_src_prepare -} diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-0.0.3-no-docs.patch b/x11-misc/e16menuedit2/files/e16menuedit2-0.0.3-no-docs.patch deleted file mode 100644 index 764ac866033..000 --- a/x11-misc/e16menuedit2/files/e16menuedit2-0.0.3-no-docs.patch +++ /dev/null @@ -1,19 +0,0 @@ Makefile.in -+++ Makefile.in -@@ -220,14 +220,7 @@ - yelphelpdir = @yelphelpdir@ - SUBDIRS = src po pixmaps help --e16menuedit2docdir = ${prefix}/${packagedocdir} -+e16menuedit2docdir = ${prefix} --e16menuedit2doc_DATA = \ -- README\ -- COPYING\ -- AUTHORS\ -- ChangeLog\ -- INSTALL\ -- NEWS\ --TODO -+e16menuedit2doc_DATA = - - GLADE_FILES = e16menuedit2.glade - e16menuedit2datadir = ${prefix}/${packagedatadir}/glade diff --git a/x11-misc/e16menuedit2/metadata.xml b/x11-misc/e16menuedit2/metadata.xml deleted file mode 100644 index 2031ab52a3e..000 --- a/x11-misc/e16menuedit2/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - -http://www.gentoo.org/dtd/metadata.dtd;> - - - - enlightenment - -
[gentoo-commits] repo/gentoo:master commit in: x11-misc/e16menuedit2/
commit: 66e7b9feb6674bec16d4fab4be59fd6b51fedb66 Author: Michał Górny gentoo org> AuthorDate: Mon Apr 16 15:18:11 2018 + Commit: Michał Górny gentoo org> CommitDate: Mon Apr 16 15:34:28 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e7b9fe x11-misc/e16menuedit2: Drop disbanded enlightenment project x11-misc/e16menuedit2/metadata.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/x11-misc/e16menuedit2/metadata.xml b/x11-misc/e16menuedit2/metadata.xml index 7dd8d5e7a69..2031ab52a3e 100644 --- a/x11-misc/e16menuedit2/metadata.xml +++ b/x11-misc/e16menuedit2/metadata.xml @@ -1,10 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - enlightenm...@gentoo.org - Project Enlightenment - + enlightenment