From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Feb 2020 21:05:55 +0000 Subject: gentoo resync : 10.02.2020 --- x11-wm/enlightenment/Manifest | 5 +- .../enlightenment/enlightenment-0.22.4-r1.ebuild | 102 --------------------- x11-wm/enlightenment/enlightenment-0.23.1.ebuild | 4 +- .../enlightenment-0.22.4-efl-1.22-wayland.patch | 65 ------------- 4 files changed, 3 insertions(+), 173 deletions(-) delete mode 100644 x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild delete mode 100644 x11-wm/enlightenment/files/enlightenment-0.22.4-efl-1.22-wayland.patch (limited to 'x11-wm/enlightenment') diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest index 081fc44b8396..b19bbd8423b8 100644 --- a/x11-wm/enlightenment/Manifest +++ b/x11-wm/enlightenment/Manifest @@ -1,7 +1,4 @@ -AUX enlightenment-0.22.4-efl-1.22-wayland.patch 2288 BLAKE2B 6e8a9f4d47318372c06a74bb6e3c233c36f9e57332519e706602a0472285e0b249c45d3d6fbd3074d6d720f157b6ddcf1a37da60b60f52908ee0f006a9e11239 SHA512 7ba3e501d7df99aa3f0336c1db09edaf5b2acd9eb6d2ad4f8465d92c595edd2b85e6a16c1408dc75502d73778cd2634ce2f409319887f6e53707208cd4128335 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a -DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba DIST enlightenment-0.23.1.tar.xz 26426096 BLAKE2B d781dc951ad8eddd90f633b29a6b1180be63e6052a56e60644b4f738f4c0d42617aeb4f7326cf3284d0b331dd87d605fa0625ea6435f4e36b8f5b3ccce82ca53 SHA512 b5b8a34f6abe47d9b23dbcaf09d2f61f74b3f8d5a97b30a9666916b4bd307a45cb2ad874288419ab40ef06fa57c3b7dc15377dd9acaeb6eb71cd8c0c24fc42cb -EBUILD enlightenment-0.22.4-r1.ebuild 2200 BLAKE2B ec7e475f9a23d34b0505fd4e17d105e46f5ff678c9f886458a7b80cfa04e40545435105c495e6d8842a5d89b26babf6ae4d29215d99386d8870eb06952a668b0 SHA512 d538a3ebe011b66d0c81c0f18a3614a418d39f19c43ae30d1991af447eda682a1198437589914561c7367c60b3239e0f7b3504277cad4c770bb1172e152e9fbb -EBUILD enlightenment-0.23.1.ebuild 2800 BLAKE2B a58c4c71ca9d01f421a215905295cca214635c65d9b945e90fb23da916a740d86e74734d78976a61844eae6d788096bd50bf6533dc899f82863af8f2dcce32ff SHA512 905c40929ba275ee9c04c04fe873e970c147734d9ddd8e60bd925e952755d2e3431287e7b0496077e990df7aea28b1bdee44dbd01a33d7951e8c4f437dff197f +EBUILD enlightenment-0.23.1.ebuild 2777 BLAKE2B 039f6940649fe7b1ac6d95a75bb76e7f923d5f898a34a966359a0cc2db505d1fb627f9a49e5e5bd1179f441e4c4f72cb4acd5b614732d0260c1a37e470fdfc13 SHA512 5bf887ad0f03bca7e60844042c6736331c9fe26a97442a2c9a234891a16206cda2aba3bdcbb44c7655ae1da34a36e692d30184573b894ee273c00c2d2ba28596 MISC metadata.xml 802 BLAKE2B b7b4f3531b89d5aa743c0153171fc9c36e732ba609eb7703961fd65780c59662ebf796cd7c822ab3cfeed7198fbf4fe8f9b481755f6ac5792729f30e4cc13c6c SHA512 4634f5d13c9f6ae6a7ddeb2c50e8882fac00ac17de37e8eabc24d5edd2470a5e35ffcf21a885be572d1d55f12610eb7496b39a29aad5b3d5f48e67ec26be884b diff --git a/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild deleted file mode 100644 index f94da2d87cbc..000000000000 --- a/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson xdg-utils - -DESCRIPTION="Enlightenment window manager" -HOMEPAGE="https://www.enlightenment.org" -SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz" - -LICENSE="BSD-2" -SLOT="0.17/${PV%%_*}" -KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86" -IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland" - -REQUIRED_USE="xwayland? ( wayland )" - -RDEPEND=" - >=dev-libs/efl-1.20.5[eet,X] - virtual/udev - x11-libs/libXext - x11-libs/libxcb - x11-libs/xcb-util-keysyms - x11-misc/xkeyboard-config - acpi? ( sys-power/acpid ) - bluetooth? ( net-wireless/bluez ) - connman? ( dev-libs/efl[connman] ) - geolocation? ( app-misc/geoclue:2.0 ) - packagekit? ( app-admin/packagekit-base ) - pam? ( sys-libs/pam ) - systemd? ( sys-apps/systemd ) - udisks? ( sys-fs/udisks:2 ) - wayland? ( - >=dev-libs/efl-1.22.0[drm,wayland] - dev-libs/wayland - x11-libs/libxkbcommon - x11-libs/pixman - ) - xwayland? ( - dev-libs/efl[X,wayland] - x11-base/xorg-server[wayland] - ) -" -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}/${P}-efl-1.22-wayland.patch" ) - -src_configure() { - local emesonargs=( - -D device-udev=true - -D install-sysactions=false - - $(meson_use udisks mount-udisks) - $(meson_use bluetooth bluez4) - $(meson_use connman) - $(meson_use geolocation) - $(meson_use nls) - $(meson_use packagekit) - $(meson_use pam) - $(meson_use systemd) - $(meson_use wayland) - $(meson_use wifi wireless) - $(meson_use xwayland) - ) - - if ! use wayland; then - emesonargs+=( - -D wl-buffer=false - -D wl-desktop-shell=false - -D wl-drm=false - -D wl-text-input=false - -D wl-weekeyboard=false - -D wl-wl=false - -D wl-x11=false - ) - fi - - meson_src_configure -} - -src_install() { - insinto /etc/enlightenment - newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf - - use doc && local HTML_DOCS=( doc/. ) - meson_src_install -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/x11-wm/enlightenment/enlightenment-0.23.1.ebuild b/x11-wm/enlightenment/enlightenment-0.23.1.ebuild index 74caaded4b5c..4b8be24627ab 100644 --- a/x11-wm/enlightenment/enlightenment-0.23.1.ebuild +++ b/x11-wm/enlightenment/enlightenment-0.23.1.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=7 @@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz" LICENSE="BSD-2" SLOT="0.17/${PV%%_*}" -KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland" REQUIRED_USE="xwayland? ( wayland )" diff --git a/x11-wm/enlightenment/files/enlightenment-0.22.4-efl-1.22-wayland.patch b/x11-wm/enlightenment/files/enlightenment-0.22.4-efl-1.22-wayland.patch deleted file mode 100644 index 3321390cf62a..000000000000 --- a/x11-wm/enlightenment/files/enlightenment-0.22.4-efl-1.22-wayland.patch +++ /dev/null @@ -1,65 +0,0 @@ -From ea3f6ed68f948cea4b64432a6cdb72fca85e6987 Mon Sep 17 00:00:00 2001 -From: "Carsten Haitzler (Rasterman)" -Date: Fri, 22 Feb 2019 11:12:00 +0000 -Subject: e - unbreak build due to efl changes - ---- - src/bin/e.h | 1 + - src/bin/e_comp_wl.c | 8 ++++---- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/bin/e.h b/src/bin/e.h -index 7d00d819e..abe5ed731 100644 ---- a/src/bin/e.h -+++ b/src/bin/e.h -@@ -17,6 +17,7 @@ - # endif - - #ifdef HAVE_WAYLAND -+# define EFL_EO_API_SUPPORT - # define EFL_BETA_API_SUPPORT - #endif - -diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c -index a9adad104..e56e4e6f8 100644 ---- a/src/bin/e_comp_wl.c -+++ b/src/bin/e_comp_wl.c -@@ -2188,7 +2188,7 @@ _cb_early_frame_cb(void *data, const Efl_Event *event EINA_UNUSED) - if (ec->comp_data->early_frame++ > 15) - { - ec->comp_data->early_frame = 0; -- efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK, -+ efl_event_callback_del(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, - _cb_early_frame_cb, data); - } - } -@@ -2198,14 +2198,14 @@ _e_comp_wl_surface_early_frame(E_Client *ec) - { - if (e_comp_object_damage_exists(ec->frame)) - { -- efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK, -+ efl_event_callback_del(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, - _cb_early_frame_cb, ec); - ec->comp_data->early_frame = 0; - return; - } - if (ec->on_post_updates) return; - if (!ec->comp_data->early_frame) -- efl_event_callback_add(e_comp->evas, EFL_EVENT_ANIMATOR_TICK, -+ efl_event_callback_add(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, - _cb_early_frame_cb, ec); - ec->comp_data->early_frame = 1; - } -@@ -2582,7 +2582,7 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec) - /* make sure this is a wayland client */ - if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return; - -- efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK, -+ efl_event_callback_del(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK, - _cb_early_frame_cb, ec); - ec->comp_data->early_frame = 0; - --- -cgit v1.2.1 - - -- cgit v1.2.3