commit: b716da62a3e09bf4917b269af5d225897e81d309 Author: Joonas Niilola <juippis <AT> gmail <DOT> com> AuthorDate: Mon Sep 17 04:43:47 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Sep 18 06:59:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b716da62
x11-wm/enlightenment: drop old 0.21.* Package-Manager: Portage[mgorny]-2.3.43.3 x11-wm/enlightenment/Manifest | 2 - .../enlightenment/enlightenment-0.21.11-r1.ebuild | 139 -------------------- x11-wm/enlightenment/enlightenment-0.21.7.ebuild | 140 --------------------- x11-wm/enlightenment/metadata.xml | 2 - 4 files changed, 283 deletions(-) diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest index 49d83eda3d5..fe91a567097 100644 --- a/x11-wm/enlightenment/Manifest +++ b/x11-wm/enlightenment/Manifest @@ -1,4 +1,2 @@ -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 DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba 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 69a4add8967..00000000000 --- 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 6b17730274f..00000000000 --- 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/metadata.xml b/x11-wm/enlightenment/metadata.xml index 8af72188ab2..f29f0f98962 100644 --- a/x11-wm/enlightenment/metadata.xml +++ b/x11-wm/enlightenment/metadata.xml @@ -9,9 +9,7 @@ <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="egl">Enable EGL rendering</flag> <flag name="packagekit">Enable module for package manager integration</flag> - <flag name="ukit">Use upower/udisks to automount devices</flag> </use> <longdescription> Enlightenment is classed as a "desktop shell" as it provides everything you need to
