From f7b34c1c2f9d8649c30a8f2c726b0231feb6fd84 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 09:15:49 +0000 Subject: [PATCH] enlightenment: remove systemd build option (#1736) And use vlicense --- srcpkgs/enlightenment/template | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template index 21f5e2527a..1b735d08a6 100644 --- a/srcpkgs/enlightenment/template +++ b/srcpkgs/enlightenment/template @@ -1,16 +1,15 @@ # Template file for 'enlightenment' pkgname=enlightenment version=0.19.5 -revision=3 +revision=4 lib32disabled=yes # Package build options -build_options="systemd wayland" +build_options="wayland" build_style=gnu-configure -configure_args="--enable-pam --disable-bluez4 $(vopt_enable systemd) +configure_args="--enable-pam --disable-bluez4 --disable-systemd $(vopt_if wayland '--enable-wayland-egl --enable-wayland-clients' '--disable-wayland-egl')" hostmakedepends="pkg-config efl" makedepends="pam-devel pixman-devel elementary-devel - $(vopt_if systemd systemd-devel) $(vopt_if wayland 'libxkbcommon-devel MesaLib-devel wayland-devel')" depends="evas_generic_loaders emotion_generic_players hicolor-icon-theme desktop-file-utils" conf_files="/etc/enlightenment/sysactions.conf" @@ -22,15 +21,13 @@ distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${ve checksum=9634464281a58823ead37dc34b6818802378b03b5a293f2f0529c1ec68762939 post_install() { - if [ -z "$build_option_systemd" ]; then - # Use our native tools to shutdown/suspend. - sed -i 's/^action:.*halt.*/action: halt shutdown -h now/g' ${DESTDIR}/etc/${pkgname}/sysactions.conf - sed -i 's/^action:.*reboot.*/action: reboot shutdown -r now/g' ${DESTDIR}/etc/${pkgname}/sysactions.conf - sed -i 's/^action:.*suspend.*/action: suspend zzz/g' ${DESTDIR}/etc/${pkgname}/sysactions.conf - sed -i 's/^action:.*hibernate.*/action: hibernate ZZZ/g' ${DESTDIR}/etc/${pkgname}/sysactions.conf - fi - vmkdir usr/share/licenses/${pkgname} - install -m644 COPYING* ${DESTDIR}/usr/share/licenses/${pkgname} + # Use our native tools to shutdown/suspend. + sed -i 's/^action:.*halt.*/action: halt shutdown -h now/g' ${DESTDIR}/etc/${pkgname}/sysactions.conf + sed -i 's/^action:.*reboot.*/action: reboot shutdown -r now/g' ${DESTDIR}/etc/${pkgname}/sysactions.conf + sed -i 's/^action:.*suspend.*/action: suspend zzz/g' ${DESTDIR}/etc/${pkgname}/sysactions.conf + sed -i 's/^action:.*hibernate.*/action: hibernate ZZZ/g' ${DESTDIR}/etc/${pkgname}/sysactions.conf + + vlicense COPYING vinstall ${FILESDIR}/e-applications.menu 644 etc/xdg/menus rm -rf ${DESTDIR}/usr/share/${pkgname}/doc }