From 47719cf6163184b5a73a260ccff6ac022d5c510a Mon Sep 17 00:00:00 2001 From: Joonas Niilola Date: Fri, 25 May 2018 17:30:51 +0300 Subject: [PATCH 1/2] x11-wm/enlightenment: bump E21 to 0.21.11 Bug: https://bugs.gentoo.org/637034 Bug: https://bugs.gentoo.org/615426 Package-Manager: Portage[mgorny]-2.3.36.1 --- x11-wm/enlightenment/Manifest | 1 + .../enlightenment-0.21.11.ebuild | 139 ++++++++++++++++++ .../enlightenment-0.21.11-quickstart.diff | 13 ++ x11-wm/enlightenment/metadata.xml | 1 + 4 files changed, 154 insertions(+) create mode 100644 x11-wm/enlightenment/enlightenment-0.21.11.ebuild create mode 100644 x11-wm/enlightenment/files/enlightenment-0.21.11-quickstart.diff diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest index cbef05e4118d5..c41a559a6ae42 100644 --- a/x11-wm/enlightenment/Manifest +++ b/x11-wm/enlightenment/Manifest @@ -1,5 +1,6 @@ DIST e16-1.0.17.tar.gz 2417299 BLAKE2B 324c8d3cd4b9e18e7c7936065be24897e26838727f64b08d3d371bc898b421831ed37eb30ea859ab33eb58898984e48a580404a6632977d84e564096fba284e4 SHA512 d6ad565cf638de5240fbcd0f1cd37977c69e6af31a4ff9127e9c570fdf57a56bde50978620fbc34508d02661effa17f0c8b91ca23faebc0b77f9d40e166ba021 DIST enlightenment-0.20.5.tar.xz 25039672 BLAKE2B b9f18ecb5afbd4f8675d0c5e9315173d6980e98d77e09c1e818161a92be727a504081c9944dd78519ff2eb02a146b8c3db276bd9a568f82c1584b74c4c7e7d07 SHA512 0d66d23b3462d6bf293229256d88d486d05135ff7bc7ab4258c3923c853f1935a1850b3a3ff0dabb1aae99a31dafb578f5cbb5678d08df490d3c6837b874a911 DIST enlightenment-0.20.6.tar.xz 25030572 BLAKE2B 7ce9b89ec56a741e81bb6ebae690c84ef89b53e7201723f0d74c99b006957f8c26cd8d4b914015aa7956d23f83beeb2ca2a0e9e145d9b2038a6a337acccd43bd SHA512 97179929c039535f6f03fbd1272bde59e25f62b35e17e859379258dac771183562348f7a5c0148c76bcb05b86c21c24950117901f0c2800ac070ba7a27aeee29 +DIST enlightenment-0.21.11.tar.xz 25313532 BLAKE2B 3128137fe81a5b3dccc909eee8aac6845648c088b4cc8de9965408445579ed6aa01bdd879b726d21449c674f07a78386348525d61c0c0d786493d638ec4ae2b4 SHA512 3dee0f7a49fff992a81ce82a730cf8f0cec52a9805dcdd643a35a0bb8c7a27c6af82c136219553684c24c8e2ee2e8623f04858fddab56cdff7477ed2c9cc0ddf DIST enlightenment-0.21.7.tar.xz 25307500 BLAKE2B 54b0bb7f76390d46f7eec40aecafb1b8769ba659acaffe8ade61ef9cd6fcb28d843bc185a3cc6c478fa30f917946d331569a394132c3351215a3d1d051d7d2ac SHA512 9d10116990f83b6a2f066b81fab08a9b49779df22d92b5823bf579d786a3f4602094cf8c4d08b3e23a1cfc0cd7032004b2e389e234a189fb2479d23287bf1277 DIST enlightenment-0.22.3.tar.xz 25648576 BLAKE2B 1abb1fab18c5932b65f1183875bbe0955ce1d608758af0855c550f5581c774bd19dd0b6c8dd8c724b668ff843e1ed4928531f30b60436d9182a07a65fa2af9e3 SHA512 01a9386ee009c76c46cee7176cdeb7f4e97977bdd5014caa51cceeff228ad72f97a362d1eff7e0240e3e2df8b24a6c9d1516c8ab05bd82d288abcfde0d171abd diff --git a/x11-wm/enlightenment/enlightenment-0.21.11.ebuild b/x11-wm/enlightenment/enlightenment-0.21.11.ebuild new file mode 100644 index 0000000000000..b87b62d2c3202 --- /dev/null +++ b/x11-wm/enlightenment/enlightenment-0.21.11.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit 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 ~x86" + +E_CONF_MODS=( + applications bindings dialogs display + interaction intl menus paths + performance randr shelves theme + window-manipulation window-remembers +) + +E_NORM_MODS=( + appmenu backlight battery bluez4 + clock conf connman cpufreq + everything fileman fileman-opinfo gadman + geolocation ibar ibox lokker + mixer msgbus music-control notification + packagekit pager pager-plain quickaccess + shot start syscon systray + tasks teamwork temperature tiling + time winlist wireless wizard + wl-desktop-shell wl-drm wl-text-input wl-weekeyboard + wl-wl wl-x11 xkbswitch xwayland +) + +IUSE_E_MODULES=( + ${E_CONF_MODS[@]/#/enlightenment_modules_conf-} + ${E_NORM_MODS[@]/#/enlightenment_modules_} +) + +IUSE="acpi doc egl nls pam static-libs systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}" + +RDEPEND=" + >=dev-libs/efl-1.17.0[eet,X] + virtual/udev + x11-libs/libXext + x11-libs/libxcb + x11-libs/xcb-util-keysyms + x11-misc/xkeyboard-config + acpi? ( sys-power/acpid ) + egl? ( >=dev-libs/efl-1.18.0[egl,wayland] ) + pam? ( sys-libs/pam ) + systemd? ( sys-apps/systemd ) + udisks? ( sys-fs/udisks:2 ) + wayland? ( + >=dev-libs/efl-1.18.0[drm,wayland] + >=dev-libs/wayland-1.11.0 + x11-libs/libxkbcommon + x11-libs/pixman + ) +" +DEPEND=" + ${RDEPEND} + sys-devel/automake:1.15 + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +src_prepare() { + default + + eapply "${FILESDIR}"/"${P}"-quickstart.diff + + xdg_environment_reset + + sed -i 's/Categories=Audio/Categories=AudioVideo/g' src/modules/mixer/emixer.desktop || die +} + +src_configure() { + local myconf=( + --disable-install-sysactions + --disable-policy-mobile + --enable-device-udev + $(use_enable egl wayland-egl) + $(use_enable nls) + $(use_enable pam) + $(use_enable static-libs static) + $(use_enable systemd) + $(use_enable udisks mount-udisks) + $(use_enable wayland) + ) + + local u c + for u in ${IUSE_E_MODULES[@]} ; do + c=${u#enlightenment_modules_} + + case ${c} in + wl-*|xwayland) + if ! use wayland ; then + myconf+=( --disable-${c} ) + continue + fi + + ;; + esac + + myconf+=( $(use_enable ${u} ${c}) ) + + done + + econf "${myconf[@]}" +} + +src_install() { + insinto /etc/enlightenment + newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf + + if use doc ; then + local HTML_DOCS=( doc/. ) + fi + + einstalldocs + V=1 emake install DESTDIR="${D}" || die + + if ! use static-libs ; then + find "${D}" -name '*.la' -delete || die + fi +} + +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/files/enlightenment-0.21.11-quickstart.diff b/x11-wm/enlightenment/files/enlightenment-0.21.11-quickstart.diff new file mode 100644 index 0000000000000..b54dfe2aba982 --- /dev/null +++ b/x11-wm/enlightenment/files/enlightenment-0.21.11-quickstart.diff @@ -0,0 +1,13 @@ +Index: src/bin/e_main.c +=================================================================== +--- a/src/bin/e_main.c (revision 61690) ++++ b/src/bin/e_main.c (working copy) +@@ -93,7 +93,7 @@ + static Eina_Bool _e_main_cb_startup_fake_end(void *data __UNUSED__); + + /* local variables */ +-static Eina_Bool really_know = EINA_FALSE; ++static Eina_Bool really_know = EINA_TRUE; + static Eina_Bool locked = EINA_FALSE; + static Eina_Bool inloop = EINA_FALSE; + static jmp_buf x_fatal_buff; diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml index 9b10f15ca40fa..c5dc2af1c12c9 100644 --- a/x11-wm/enlightenment/metadata.xml +++ b/x11-wm/enlightenment/metadata.xml @@ -9,6 +9,7 @@ Proxy Maintainers + Enable EGL rendering Enable pango font rendering Use upower/udisks to automount devices Enable support for the X xrandr extension From 7fa6f0889e870d5b195dee3c66133a087cd4721d Mon Sep 17 00:00:00 2001 From: Joonas Niilola Date: Fri, 25 May 2018 17:39:46 +0300 Subject: [PATCH 2/2] x11-wm/enlightenment: remove horribly outdated 0.17.9999 Doesn't build. -9999 makes little sense anymore since E's releases are quite frequent now. Closes: https://bugs.gentoo.org/642062 Package-Manager: Portage[mgorny]-2.3.36.1 --- .../enlightenment-0.17.9999.ebuild | 125 ------------------ 1 file changed, 125 deletions(-) delete mode 100644 x11-wm/enlightenment/enlightenment-0.17.9999.ebuild diff --git a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild deleted file mode 100644 index 1b788a54f5966..0000000000000 --- a/x11-wm/enlightenment/enlightenment-0.17.9999.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -MY_P=${P/_/-} - -if [[ ${PV} == *9999 ]] ; then - EGIT_SUB_PROJECT="core" - EGIT_URI_APPEND="${PN}" -else - SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" -fi - -inherit enlightenment - -DESCRIPTION="Enlightenment DR17 window manager" - -LICENSE="BSD-2" -SLOT="0.17/${PV%%_*}" - -__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 quickaccess - shot start syscon systray tasks teamwork temperature tiling time - winlist wireless 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 ukit wayland ${IUSE_E_MODULES[@]/#/+}" - -RDEPEND=" - pam? ( sys-libs/pam ) - systemd? ( sys-apps/systemd ) - wayland? ( - dev-libs/efl[wayland] - >=dev-libs/wayland-1.10.0 - >=x11-libs/pixman-0.31.1 - >=x11-libs/libxkbcommon-0.3.1 - ) - >=dev-libs/efl-1.18[X] - x11-libs/xcb-util-keysyms" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/quickstart.diff - 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) - $(use_enable nls) - $(use_enable pam) - $(use_enable systemd) - --enable-device-udev - $(use_enable ukit mount-udisks) - $(use_enable wayland) - ) - local u c - 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 -} - -src_install() { - enlightenment_src_install - insinto /etc/enlightenment - newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf -}