From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3404C1388C1 for ; Wed, 30 Dec 2015 20:40:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8786B21C00F; Wed, 30 Dec 2015 20:40:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A95D21C044 for ; Wed, 30 Dec 2015 20:40:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70DC7340896 for ; Wed, 30 Dec 2015 20:40:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C169CF5 for ; Wed, 30 Dec 2015 20:40:52 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1451508036.d3f9fea057b6344b3de1b209a64c705b5839a4d5.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/enlightenment/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/enlightenment/enlightenment-0.17.9999.ebuild x11-wm/enlightenment/metadata.xml X-VCS-Directories: x11-wm/enlightenment/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: d3f9fea057b6344b3de1b209a64c705b5839a4d5 X-VCS-Branch: master Date: Wed, 30 Dec 2015 20:40:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1f7a0290-413e-47ae-ba51-d0597c321e56 X-Archives-Hash: 8b1120ffa2b022124c8250d577b23a02 commit: d3f9fea057b6344b3de1b209a64c705b5839a4d5 Author: Mike Frysinger gentoo org> AuthorDate: Wed Dec 30 19:13:03 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Dec 30 20:40:36 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f9fea0 x11-wm/enlightenment: update configure flags and module lists .../enlightenment/enlightenment-0.17.9999.ebuild | 85 ++++++++++++++++------ x11-wm/enlightenment/metadata.xml | 13 ++++ 2 files changed, 74 insertions(+), 24 deletions(-) diff --git a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild index 7d245d5..3b6c43a 100644 --- a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild +++ b/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild @@ -21,25 +21,29 @@ DESCRIPTION="Enlightenment DR17 window manager" LICENSE="BSD-2" SLOT="0.17/${PV%%_*}" -# The @ is just an anchor to expand from -__EVRY_MODS="" -__CONF_MODS=" - +@applications +@comp +@dialogs +@display - +@interaction +@intl +@menus - +@paths +@performance +@randr +@shelves +@theme +@wallpaper2 - +@window-manipulation +@window-remembers" -__NORM_MODS=" - @access +@appmenu +@backlight +@bluez4 +@battery +@clock - +@connman +@contact +@cpufreq +@everything +@fileman - +@fileman-opinfo +@gadman +@ibar +@ibox +@illume2 +@mixer +@msgbus - +@music-control +@notification +@pager +@quickaccess +@shot - +@start +@syscon +@systray +@tasks +@teamwork +@temperature +@tiling - +@winlist +@wizard @wl-desktop-shell @wl-screenshot +@xkbswitch" -IUSE_E_MODULES=" - ${__CONF_MODS//@/enlightenment_modules_conf-} - ${__NORM_MODS//@/enlightenment_modules_}" +__CONF_MODS=( + applications bindings dialogs display + interaction intl menus + paths performance randr shelves theme + window-manipulation window-remembers +) +__NORM_MODS=( + appmenu backlight bluez4 battery + clock conf connman cpufreq everything + fileman fileman-opinfo gadman geolocation + ibar ibox lokker + mixer msgbus music-control notification + pager packagekit pager-plain policy-mobile quickaccess + shot start syscon systray tasks teamwork temperature tiling + winlist wizard wl-desktop-shell wl-drm wl-text-input + wl-weekeyboard wl-wl wl-x11 xkbswitch xwayland +) +IUSE_E_MODULES=( + ${__CONF_MODS[@]/#/enlightenment_modules_conf-} + ${__NORM_MODS[@]/#/enlightenment_modules_} +) -IUSE="pam spell static-libs systemd +udev ukit wayland ${IUSE_E_MODULES}" +IUSE="pam spell static-libs systemd +udev ukit wayland ${IUSE_E_MODULES[@]/#/+}" RDEPEND=" pam? ( sys-libs/pam ) @@ -50,8 +54,8 @@ RDEPEND=" >=x11-libs/pixman-0.31.1 >=x11-libs/libxkbcommon-0.3.1 ) - >=dev-libs/efl-${PV}[X] - >=media-libs/elementary-${PV} + >=dev-libs/efl-1.16[X] + >=media-libs/elementary-1.16 x11-libs/xcb-util-keysyms" DEPEND="${RDEPEND}" @@ -62,23 +66,56 @@ src_prepare() { enlightenment_src_prepare } +# Sanity check to make sure module lists are kept up-to-date. +check_modules() { + local detected=$( + awk -F'[\\[\\](, ]' '$1 == "AC_E_OPTIONAL_MODULE" { print $3 }' \ + configure.ac | sed 's:_:-:g' | LC_COLLATE=C sort + ) + local sorted=$( + printf '%s\n' ${IUSE_E_MODULES[@]/#enlightenment_modules_} | \ + LC_COLLATE=C sort + ) + if [[ ${detected} != "${sorted}" ]] ; then + local out new old + eerror "The ebuild needs to be kept in sync." + echo "${sorted}" > ebuild-iuse + echo "${detected}" > configure-detected + out=$(diff -U 0 ebuild-iuse configure-detected | sed -e '1,2d' -e '/^@@/d') + new=$(echo "${out}" | sed -n '/^+/{s:^+::;p}') + old=$(echo "${out}" | sed -n '/^-/{s:^-::;p}') + eerror "Add these modules: $(echo ${new})" + eerror "Drop these modules: $(echo ${old})" + die "please update the ebuild" + fi +} + src_configure() { + check_modules + E_ECONF=( --disable-install-sysactions $(use_enable doc) - --disable-device-hal $(use_enable nls) $(use_enable pam) $(use_enable systemd) --enable-device-udev $(use_enable udev mount-eeze) $(use_enable ukit mount-udisks) - $(use_enable wayland wayland-clients) + $(use_enable wayland) ) local u c - for u in ${IUSE_E_MODULES} ; do - u=${u#+} + for u in ${IUSE_E_MODULES[@]} ; do c=${u#enlightenment_modules_} + # Disable modules by hand since we default to enabling them all. + case ${c} in + wl-*|xwayland) + if ! use wayland ; then + E_ECONF+=( --disable-${c} ) + continue + fi + ;; + esac E_ECONF+=( $(use_enable ${u} ${c}) ) done enlightenment_src_configure diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml index 41964c0..2ebc721 100644 --- a/x11-wm/enlightenment/metadata.xml +++ b/x11-wm/enlightenment/metadata.xml @@ -68,14 +68,19 @@ Enlightenment Features: Enlightenment's integrated file manager Can be placed on the desktop or in a shelf Module to manage gadgets on the desktop + Geolocation Iconic application launcher A home for your iconified applications Illume2 - next generation of illume - special WM mode for embedded devices and set of plugins with same purpose + Screen locker A module to provide a mixer for changing volume DBus Extension Control your music in your shelf notification-daemon alternative. Popup if an event occur + Package manager integration Gadget to allow you to visualize your virtual desktops and the windows they contain + A simpler desktop pager + Enlightenment Quickaccess Launcher Simple screenshot+save/upload module Enlightenment's "Start" button equivalent @@ -88,9 +93,17 @@ Enlightenment Features: A module to show the list of client applications presently running First Run Wizard Enlightenment Wayland Desktop Shell + Wayland DRM (Direct Rendering Manager) compositing module Enlightenment Wayland Screenshot module + Wayland text input support + Wayland virtual keyboard + Wayland-in-Wayland module + Wayland-in-X11 module Keyboard layout configuration and switcher + X/Wayland integration + Settings Panel Allows configuration of Ibar, Restart, and Startup applications + Input Control Settings Configure default dialog properties Configure default dialog properties Used to configure your screen