From 265dbe5dbc14c199299496c6db8fce3f76647015 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Sep 2018 18:00:10 +0100 Subject: gentoo resync : 21.09.2018 --- x11-wm/enlightenment/Manifest | 8 +- .../enlightenment/enlightenment-0.21.11-r1.ebuild | 139 -------------------- x11-wm/enlightenment/enlightenment-0.21.7.ebuild | 140 --------------------- x11-wm/enlightenment/enlightenment-0.22.4.ebuild | 101 +++++++++++++++ x11-wm/enlightenment/metadata.xml | 3 +- 5 files changed, 105 insertions(+), 286 deletions(-) delete mode 100644 x11-wm/enlightenment/enlightenment-0.21.11-r1.ebuild delete mode 100644 x11-wm/enlightenment/enlightenment-0.21.7.ebuild create mode 100644 x11-wm/enlightenment/enlightenment-0.22.4.ebuild (limited to 'x11-wm/enlightenment') diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest index 618cdef6ecca..9e4086e1edf5 100644 --- a/x11-wm/enlightenment/Manifest +++ b/x11-wm/enlightenment/Manifest @@ -1,10 +1,8 @@ AUX enlightenment-0.21.11-quickstart.diff 478 BLAKE2B 5352107aad73aff99689cea903f0b7075bbf92623907e573f0be65a00e28654e0ba8f4e00557c01a163df97e96911c0a8cdaf6f2cf4623bc73ac66dce60a6458 SHA512 ca90e65aa3d4b6baa328c9fa6d3e912573ac049ec38cd0074ba7dc64efcde8ff51bf428534bc48d53834bdd49f42739272c68e685c908b0786ac3aaf1cb64c27 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a AUX quickstart.diff 474 BLAKE2B b5b46ccf535f08e1a7d8be64f2d548148efc24c5c9af31a1f0bfd67a94948eb535265d9b13d8fb65047ec9f22d924d16268bb2fa8ac03855e5513b0c60f771db SHA512 b8df654dd1246ea6391017fe9856e38d209b250625f8343aa4943a4eeed980447eb52c6a15fe170bcab90b76e5670ee9c7f98358bb87990877e312cc4cea8f6c -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 -EBUILD enlightenment-0.21.11-r1.ebuild 2930 BLAKE2B 3230cd10fd2342364ad35ee833d51a45a64d84a62cee346669ff7741c6d14529219f0697032bd233071948e856b304ec2fb4da8f181e1ef41a604a378a19fe17 SHA512 a133ac546fb644547802ca025734861174b13ad20c2105f0b0b5f20d6e5e0aa41bfcf33d91a10ac6c7ce74f3699aa28937d975b99eebed474410f489e3f0b8a3 -EBUILD enlightenment-0.21.7.ebuild 3549 BLAKE2B fc55bb1649adbbc9392b9191127935ddc296ec74713190568454815ab38dd5b251176047ca485455757f70bffaa85be93871229c01ea2d54ef8a675ed6ebd092 SHA512 e5aa1003f2fc30c907d856a2b691686d260acf6c4e3fc3406542e46b197042c338866d23ff8241a02fa80341349b732387985427637c6866d6a5013b937df305 +DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba EBUILD enlightenment-0.22.3.ebuild 2761 BLAKE2B afd66034af88b166bec62657b0d5d058697178fb42f94184f6bf099526d1755ba317fd96142a9ddd7590bcc65548b30fa06e1db75828fee67583e6bfcb270612 SHA512 5a32871dfa8c5671efc1870249411ca1ecd3b61737cdf11b7f662006293456083ea95223ea2e8b5033952fa1d96494ca437f1a24c34fcfc6c8d99cc400ab275f -MISC metadata.xml 859 BLAKE2B 265af2c39eeabf8258dee417bb364125df91585b97219914f56f9d1214866de51ae0aba91d75183d33960a5ca62f8c124374279fc0e27ee2a6bee6eb9f1f6b47 SHA512 c1c22af63670478cc4cb8e24c544bce45b2fef0314be7d9c5ee6b16d5ca3e2fd447ce0a26d68d860f1ad0384829fa5e28b716180fec3e92848ab84330711b211 +EBUILD enlightenment-0.22.4.ebuild 2193 BLAKE2B fee6fa3c14c0154ba0d225e99f869973e8e7a61cc58f47bb7793e14793db5913eec30f5132d6a4183b24085b9dbe11dc60a72e7367abcf5a52b93e240ca3ca2b SHA512 5fa019773dd99989c519a374f050499e52ce2b54e4270b1b2fd693dbb051eb314df6ca8d0acc79c50c5e48ba48f4fd581979a90fd79c3b9742f1b5b92c2dafa6 +MISC metadata.xml 823 BLAKE2B b52bcbb857584b986c8b371cbc8d743cbb6510817c93bce44b46bd42025a35b7d3f98ce3e409b37f2f2da32228e8daa6baa7a8408b4a223d735113a857197351 SHA512 8a31834065385bed8e7e5ce79dbdd53e8f3a321cfd0c386bf30c4951d2212c6aaac8712f643f442ce566ad22726d157964919c570fc4b897230039558c56b1b2 diff --git a/x11-wm/enlightenment/enlightenment-0.21.11-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.21.11-r1.ebuild deleted file mode 100644 index 69a4add8967f..000000000000 --- a/x11-wm/enlightenment/enlightenment-0.21.11-r1.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# 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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~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 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 connman doc egl nls pam static-libs systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}" - -RDEPEND=" - >=dev-libs/efl-1.20.0[eet,X] - virtual/udev - x11-libs/libXext - x11-libs/libxcb - x11-libs/xcb-util-keysyms - x11-misc/xkeyboard-config - acpi? ( sys-power/acpid ) - connman? ( net-misc/connman ) - egl? ( =dev-libs/efl-1.20*[egl,wayland] ) - pam? ( sys-libs/pam ) - systemd? ( sys-apps/systemd ) - udisks? ( sys-fs/udisks:2 ) - wayland? ( - =dev-libs/efl-1.20*[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 connman) - $(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 - - find "${D}" -name '*.la' -delete || die -} - -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.21.7.ebuild b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild deleted file mode 100644 index 6b17730274f5..000000000000 --- a/x11-wm/enlightenment/enlightenment-0.21.7.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2018 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 xdg-utils - -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} - sys-devel/automake:1.15 -" - -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() { - # sanity check fails after commit e25cf18ca19463a7d05519aa843cc76a189ab75c - # see #648896. Can be restored with future release - # 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 -} - -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.22.4.ebuild b/x11-wm/enlightenment/enlightenment-0.22.4.ebuild new file mode 100644 index 000000000000..677da510e547 --- /dev/null +++ b/x11-wm/enlightenment/enlightenment-0.22.4.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 ~ppc ~x86" +IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi" + +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.21.0[drm,wayland] + dev-libs/wayland + x11-libs/libxkbcommon + x11-libs/pixman + ) +" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + default + xdg_environment_reset +} + +src_configure() { + local emesonargs=( + -D device-udev=true + -D install-sysactions=false + -D mount-udisks=$(usex udisks true false) + -D bluez4=$(usex bluetooth true false) + -D connman=$(usex connman true false) + -D geolocation=$(usex geolocation true false) + -D nls=$(usex nls true false) + -D packagekit=$(usex packagekit true false) + -D pam=$(usex pam true false) + -D systemd=$(usex systemd true false) + -D wayland=$(usex wayland true false) + -D wireless=$(usex wifi true false) + ) + + 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 + -D xwayland=false + ) + fi + + meson_src_configure +} + +src_install() { + insinto /etc/enlightenment + newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf + + if use doc; then + local HTML_DOCS=( doc/. ) + fi + + 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/metadata.xml b/x11-wm/enlightenment/metadata.xml index 4b927b67c714..f29f0f98962f 100644 --- a/x11-wm/enlightenment/metadata.xml +++ b/x11-wm/enlightenment/metadata.xml @@ -9,8 +9,7 @@ Proxy Maintainers - Enable EGL rendering - Use upower/udisks to automount devices + Enable module for package manager integration Enlightenment is classed as a "desktop shell" as it provides everything you need to -- cgit v1.2.3