From 9d3cc75bf12c54e9dbe4d1357b1347ee509b845c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Mar 2017 23:46:51 +0000 Subject: tidy up a bit --- app-emulation/snapd/Manifest | 1 - app-emulation/snapd/snapd-2.15.2.ebuild | 63 ---------------- app-text/pastebinit/Manifest | 1 - .../files/defaultPB_debian_pastebin.patch | 12 --- app-text/pastebinit/pastebinit-1.5.ebuild | 60 --------------- mate-base/mate/mate-1.10.0-r2.ebuild | 79 -------------------- mate-base/mate/mate-1.12-r1.ebuild | 85 ---------------------- sys-apps/snap-confine/Manifest | 1 - sys-apps/snap-confine/snap-confine-1.0.43.ebuild | 33 --------- x11-base/xorg-drivers/xorg-drivers-1.17.ebuild | 27 ------- x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild | 31 -------- xfce-base/xfce4-meta/xfce4-meta-4.12-r1.ebuild | 27 ------- xfce-extra/xfce4-places-plugin/Manifest | 1 - ...fce4-places-plugin-1.7.0-undefined-symbol.patch | 54 -------------- .../xfce4-places-plugin-1.7.0-r1.ebuild | 41 ----------- xfce-extra/xfce4-power-manager/Manifest | 1 - ....3.0-restore_brightness_level_after_sleep.patch | 70 ------------------ .../xfce4-power-manager-1.4.4.ebuild | 57 --------------- 18 files changed, 644 deletions(-) delete mode 100644 app-emulation/snapd/Manifest delete mode 100644 app-emulation/snapd/snapd-2.15.2.ebuild delete mode 100644 app-text/pastebinit/Manifest delete mode 100644 app-text/pastebinit/files/defaultPB_debian_pastebin.patch delete mode 100644 app-text/pastebinit/pastebinit-1.5.ebuild delete mode 100644 mate-base/mate/mate-1.10.0-r2.ebuild delete mode 100644 mate-base/mate/mate-1.12-r1.ebuild delete mode 100644 sys-apps/snap-confine/Manifest delete mode 100644 sys-apps/snap-confine/snap-confine-1.0.43.ebuild delete mode 100644 x11-base/xorg-drivers/xorg-drivers-1.17.ebuild delete mode 100644 x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild delete mode 100644 xfce-base/xfce4-meta/xfce4-meta-4.12-r1.ebuild delete mode 100644 xfce-extra/xfce4-places-plugin/Manifest delete mode 100644 xfce-extra/xfce4-places-plugin/files/xfce4-places-plugin-1.7.0-undefined-symbol.patch delete mode 100644 xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0-r1.ebuild delete mode 100644 xfce-extra/xfce4-power-manager/Manifest delete mode 100644 xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.3.0-restore_brightness_level_after_sleep.patch delete mode 100644 xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.4.ebuild diff --git a/app-emulation/snapd/Manifest b/app-emulation/snapd/Manifest deleted file mode 100644 index fd2e40df..00000000 --- a/app-emulation/snapd/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST snapd-2.15.2.tar.gz 684471 SHA256 d9c8c098f74c7ba9215ca0f0bf1083e15db2e150b0d1ee9b11d664c244f9b4cb SHA512 1b05fc66ec2f70e45bebdf280e3270401e268da3691e8b39eaa4f594b29e583342d065bd70a7f6678c13793c0f374944b35647b53e93fb9832367139b61411bb WHIRLPOOL 2c9fa5c6f0404e086cee16c9337e415b6a0e5faa7cdc4a421e12bac174c2be38b7d272c1707323c3ebc34ec6f109b69f368f2ee7cdba6b2e51d60e2332047106 diff --git a/app-emulation/snapd/snapd-2.15.2.ebuild b/app-emulation/snapd/snapd-2.15.2.ebuild deleted file mode 100644 index 5d42f6e6..00000000 --- a/app-emulation/snapd/snapd-2.15.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit golang-vcs-snapshot -inherit systemd - -EGO_PN=github.com/snapcore/snapd -EGO_SRC=github.com/snapcore/snapd/... -EGIT_COMMIT="181f66ac30bc3a2bfb8e83c809019c037d34d1f3" - -DESCRIPTION="Service and tools for management of snap packages" -HOMEPAGE="http://snapcraft.io/" -SRC_URI="https://github.com/snapcore/${PN}/archive/${PV}.tar.gz -> ${PF}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64" -RESTRICT="mirror" -RDEPEND="sys-apps/snap-confine - sys-fs/squashfs-tools:*" -DEPEND="${RDEPEND} - dev-vcs/git - dev-vcs/bzr" -src_compile() { - cp -sR "$(go env GOROOT)" "${T}/goroot" || die - rm -rf "${T}/goroot/src/${EGO_SRC}" || die - rm -rf "${T}/goroot/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_SRC}" || die - export GOROOT="${T}/goroot" - export GOPATH="${WORKDIR}/${P}" - cd src/${EGO_PN} && ./get-deps.sh - go install -v "${EGO_PN}/cmd/snapd" || die - go install -v "${EGO_PN}/cmd/snap" || die -} - -src_install() { - export GOPATH="${WORKDIR}/${P}" - exeinto /usr/bin - dobin "$GOPATH/bin/snap" - exeinto /usr/lib/snapd/ - doexe "$GOPATH/bin/snapd" - cd "src/${EGO_PN}" || die - systemd_dounit debian/snapd.{service,socket} - systemd_dounit debian/snapd.refresh.{service,timer} - sed -i -e 's/RandomizedDelaySec=/#RandomizedDelaySec=/' debian/snapd.refresh.timer - systemd_dounit debian/snapd.frameworks.target - systemd_dounit debian/snapd.frameworks-pre.target - dodir /etc/profile.d/ - echo 'PATH=$PATH:/snap/bin' > ${D}/etc/profile.d/snapd.sh -} - -pkg_postinst() { - systemctl enable snapd.socket - systemctl enable snapd.refresh.timer -} - -pkg_postrm() { - systemctl disable snapd.service - systemctl stop snapd.service - systemctl disable snapd.socket - systemctl disable snapd.refresh.timer -} diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest deleted file mode 100644 index 867689b9..00000000 --- a/app-text/pastebinit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pastebinit-1.5.tar.bz2 42941 SHA256 42e5a84ce7e46825fb3b6478e11893fad357197327257e474bd0d3549f438457 SHA512 cc4b7c46ab7932be3a1064ce7a1d91da3ebf4b132ad44b0090c8d431bfc68e945357344e59ac1239e37b3178de124930c5c8dc552b42f16c39c0452ac9ab8099 WHIRLPOOL 0d20dd1ab5cb10436fc23fae27f090195400cfcfca1b24b860e27f1e5d38d7341c08ae1c8d7cc747e4127e3c8ae634355f796a6308a5a61671210c9581b22481 diff --git a/app-text/pastebinit/files/defaultPB_debian_pastebin.patch b/app-text/pastebinit/files/defaultPB_debian_pastebin.patch deleted file mode 100644 index 715c69d2..00000000 --- a/app-text/pastebinit/files/defaultPB_debian_pastebin.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur a/pastebinit b/pastebinit ---- a/pastebinit 2016-03-01 05:52:32.000000000 +0000 -+++ b/pastebinit 2016-09-08 11:19:48.617003007 +0100 -@@ -34,7 +34,7 @@ - from urllib.request import FancyURLopener - - # Set the default pastebin --defaultPB = "pastebin.com" -+defaultPB = "paste.debian.net" - - # Now try to override it with a distributor pastebin - try: diff --git a/app-text/pastebinit/pastebinit-1.5.ebuild b/app-text/pastebinit/pastebinit-1.5.ebuild deleted file mode 100644 index 0e0db7ca..00000000 --- a/app-text/pastebinit/pastebinit-1.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -PYTHON_REQ_USE="xml" - -inherit python-single-r1 - -DESCRIPTION="A software that lets you send anything you want directly to a pastebin" -HOMEPAGE="https://launchpad.net/pastebinit" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="crypt" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-python/configobj[${PYTHON_USEDEP}] - crypt? ( app-crypt/gnupg )" -DEPEND="app-text/docbook-xsl-stylesheets" - -src_prepare() { - local mo="" - - for lang in ${LINGUAS}; do - if [ -f po/${lang}.po ]; then - mo="${mo} ${lang}.mo" - fi - done - - sed -i -e "/^build-mo/s/:.*/:${mo}/" po/Makefile || die - sed -i -e "/#!/s/python3/python/" pastebinit || die - # set default pastebin service to debian - epatch ${FILESDIR}/defaultPB_debian_pastebin.patch -} - -src_compile() { - emake -C po - xsltproc --nonet \ - "${EROOT}"usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \ - pastebinit.xml || die -} - -src_install() { - dobin pastebinit utils/pbput - python_fix_shebang "${ED}usr/bin/${PN}" - dosym pbput /usr/bin/pbget - use crypt && dosym pbput /usr/bin/pbputs - dodoc README - doman pastebinit.1 utils/*.1 - insinto /usr/share/locale - [[ -d po/mo ]] && doins -r po/mo/* - insinto /usr/share - doins -r pastebin.d -} diff --git a/mate-base/mate/mate-1.10.0-r2.ebuild b/mate-base/mate/mate-1.10.0-r2.ebuild deleted file mode 100644 index b85310f1..00000000 --- a/mate-base/mate/mate-1.10.0-r2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit versionator - -MATE_MV="$(get_version_component_range 1-2)" - -SRC_URI="" -DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment" -HOMEPAGE="http://mate-desktop.org" - -LICENSE="metapackage" - -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="+base -bluetooth +notification +themes +extras" - -S="${WORKDIR}" - -RDEPEND=" - =mate-base/mate-desktop-${MATE_MV}*:0 - =mate-base/mate-menus-${MATE_MV}*:0 - =mate-base/mate-panel-${MATE_MV}*:0 - =mate-base/mate-session-manager-${MATE_MV}*:0 - =mate-base/mate-settings-daemon-${MATE_MV}*:0 - =x11-wm/marco-${MATE_MV}*:0 - base? ( - =mate-base/caja-${MATE_MV}*:0 - =mate-base/mate-applets-meta-${MATE_MV}*:0 - =mate-base/mate-control-center-${MATE_MV}*:0 - =mate-extra/mate-media-${MATE_MV}*:0 - =x11-misc/mozo-${MATE_MV}*:0 - =x11-terms/mate-terminal-${MATE_MV}*:0 - ) - bluetooth? ( net-wireless/blueman:0 ) - themes? ( - =x11-themes/mate-backgrounds-${MATE_MV}*:0 - =x11-themes/mate-icon-theme-${MATE_MV}*:0 - =x11-themes/mate-themes-meta-${MATE_MV}*:0 - ) - extras? ( - =app-arch/engrampa-${MATE_MV}*:0 - =app-editors/pluma-${MATE_MV}*:0 - =app-text/atril-${MATE_MV}*:0 - sci-calculators/galculator - =mate-extra/caja-extensions-${MATE_MV}*:0 - =mate-extra/mate-netbook-${MATE_MV}*:0 - =mate-extra/mate-power-manager-${MATE_MV}*:0 - =mate-extra/mate-screensaver-${MATE_MV}*:0 - =mate-extra/mate-system-monitor-${MATE_MV}*:0 - =mate-extra/mate-utils-${MATE_MV}*:0 - =media-gfx/eom-${MATE_MV}*:0 - =net-analyzer/mate-netspeed-${MATE_MV}*:0 - ) -" - -PDEPEND=" - notification? ( x11-misc/mate-notification-daemon ) - virtual/notification-daemon:0" - -pkg_postinst() { - elog "For installation, usage and troubleshooting details regarding MATE;" - elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE" - elog "" - if ! has_version x11-misc/mate-notification-daemon; then - elog "If you experience any issues with notifications, please try using" - elog "x11-misc/mate-notification-daemon instead your currently installed daemon" - elog "" - fi - elog "MATE 1.10 had some packages renamed, replaced and/or dropped; for more" - elog "details, see http://mate-desktop.org/blog/2015-06-11-mate-1-10-released/" - elog "" - elog "Some packages that are not included in this meta-package but may be of interest:" - elog " mate-extra/caja-dropbox" - elog " mate-extra/mate-user-share" -} diff --git a/mate-base/mate/mate-1.12-r1.ebuild b/mate-base/mate/mate-1.12-r1.ebuild deleted file mode 100644 index 29e4b567..00000000 --- a/mate-base/mate/mate-1.12-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -if [[ ${PV} == 9999 ]]; then - MATE_BRANCH=9999 - MATE_THEMES_V=9999 -else - inherit versionator - MATE_BRANCH="$(get_version_component_range 1-2)" - MATE_THEMES_V=3 - KEYWORDS="amd64 ~arm x86" -fi - -SRC_URI="" -DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment" -HOMEPAGE="http://mate-desktop.org" - -LICENSE="metapackage" - -SLOT="0" -IUSE="+base -bluetooth gtk3 help +notification +themes +extras" - -S="${WORKDIR}" - -RDEPEND=" - =mate-base/mate-desktop-${MATE_BRANCH}*:0[gtk3(-)?] - =mate-base/mate-menus-${MATE_BRANCH}*:0 - =mate-base/mate-panel-${MATE_BRANCH}*:0[gtk3(-)?] - =mate-base/mate-session-manager-${MATE_BRANCH}*:0[gtk3(-)?] - =mate-base/mate-settings-daemon-${MATE_BRANCH}*:0[gtk3(-)?] - =x11-wm/marco-${MATE_BRANCH}*:0[gtk3(-)?] - base? ( - =mate-base/caja-${MATE_BRANCH}*:0[gtk3(-)?] - =mate-base/mate-applets-meta-${MATE_BRANCH}*:0[gtk3(-)?] - =mate-base/mate-control-center-${MATE_BRANCH}*:0[gtk3(-)?] - =mate-extra/mate-media-${MATE_BRANCH}*:0[gtk3(-)?] - =x11-misc/mozo-${MATE_BRANCH}*:0[gtk3(-)?] - =x11-terms/mate-terminal-${MATE_BRANCH}*:0[gtk3(-)?] - ) - bluetooth? ( net-wireless/blueman:0 ) - themes? ( - =x11-themes/mate-backgrounds-${MATE_BRANCH}*:0 - =x11-themes/mate-icon-theme-${MATE_BRANCH}*:0 - >=x11-themes/mate-themes-meta-${MATE_THEMES_V}:0 - ) - extras? ( - =app-arch/engrampa-${MATE_BRANCH}*:0[gtk3(-)?] - =app-editors/pluma-${MATE_BRANCH}*:0[gtk3(-)?] - =app-text/atril-${MATE_BRANCH}*:0[gtk3(-)?] - =mate-extra/caja-extensions-${MATE_BRANCH}*:0[gtk3(-)?] - =mate-extra/mate-netbook-${MATE_BRANCH}*:0[gtk3(-)?] - =mate-extra/mate-power-manager-${MATE_BRANCH}*:0[gtk3(-)?] - =mate-extra/mate-screensaver-${MATE_BRANCH}*:0[gtk3(-)?] - =mate-extra/mate-system-monitor-${MATE_BRANCH}*:0[gtk3(-)?] - =mate-extra/mate-utils-${MATE_BRANCH}*:0[gtk3(-)?] - =media-gfx/eom-${MATE_BRANCH}*:0[gtk3(-)?] - =net-analyzer/mate-netspeed-${MATE_BRANCH}*:0[gtk3(-)?] - sci-calculators/galculator - ) - help? ( - gnome-extra/yelp:0 - =mate-extra/mate-user-guide-${MATE_BRANCH}*:0 - ) -" - -PDEPEND=" - notification? ( =x11-misc/mate-notification-daemon-${MATE_BRANCH}*:0[gtk3(-)?] ) - virtual/notification-daemon:0" - -pkg_postinst() { - elog "For installation, usage and troubleshooting details regarding MATE;" - elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE" - elog "" - if ! has_version x11-misc/mate-notification-daemon; then - elog "If you experience any issues with notifications, please try using" - elog "x11-misc/mate-notification-daemon instead your currently installed daemon" - elog "" - fi - elog "Some packages that are not included in this meta-package but may be of interest:" - elog " mate-extra/caja-dropbox" - elog " mate-extra/mate-user-share" -} diff --git a/sys-apps/snap-confine/Manifest b/sys-apps/snap-confine/Manifest deleted file mode 100644 index 8739c73d..00000000 --- a/sys-apps/snap-confine/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST snap-confine-1.0.43.tar.gz 212433 SHA256 73920a610e7815eb395d4e5dc4879627821e7ac197624970009895aaffcc8962 SHA512 e6146cee995533cd0996902e29b5b70066e238f1c122e6d486d0eeddd32168b2bba58fa546c68d2d24d28898d46b8a156f02f62976de0cd4bf0ad731182db23f WHIRLPOOL cda64992b2d2e5f1f7eb164dc753ea16d998df3e7a6493c4b7901c511d315b23e4a444363c028ab9a0298dd87a8df65d7da409a38b61361f8e74352d6540e417 diff --git a/sys-apps/snap-confine/snap-confine-1.0.43.ebuild b/sys-apps/snap-confine/snap-confine-1.0.43.ebuild deleted file mode 100644 index 4bec088d..00000000 --- a/sys-apps/snap-confine/snap-confine-1.0.43.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -DESCRIPTION="The snap-confine program helps to launch snappy applications" -HOMEPAGE="http://snapcraft.io/" -SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${P}.tar.gz" -RESTRICT="mirror" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64" - -DEPEND="dev-python/docutils - sys-devel/autoconf - sys-devel/automake - sys-devel/gcc - sys-devel/make - virtual/libudev" - -src_configure() { - econf --disable-apparmor -} - -src_compile() { - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install - dodoc README.md PORTING -} diff --git a/x11-base/xorg-drivers/xorg-drivers-1.17.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.17.ebuild deleted file mode 100644 index 9249d985..00000000 --- a/x11-base/xorg-drivers/xorg-drivers-1.17.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -DESCRIPTION="Meta package containing deps on all xorg drivers (dummy version)" -HOMEPAGE="https://www.gentoo.org/" -SRC_URI="" - -LICENSE="metapackage" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" - -IUSE="" - -PDEPEND=" - !x11-drivers/xf86-input-citron - !x11-drivers/xf86-video-cyrix - !x11-drivers/xf86-video-impact - !x11-drivers/xf86-video-nsc - !x11-drivers/xf86-video-sunbw2 - !<=x11-drivers/xf86-video-ark-0.7.5 - !<=x11-drivers/xf86-video-newport-0.2.4 - !<=x11-drivers/xf86-video-sis-0.10.7 - !<=x11-drivers/xf86-video-v4l-0.2.0 -" diff --git a/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild deleted file mode 100644 index 9cf7124a..00000000 --- a/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -DESCRIPTION="Meta package containing deps on all xorg drivers (dummy version)" -HOMEPAGE="https://www.gentoo.org/" -SRC_URI="" - -LICENSE="metapackage" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" - -IUSE="" - -PDEPEND=" - !x11-drivers/xf86-input-citron - !x11-drivers/xf86-video-cyrix - !x11-drivers/xf86-video-impact - !x11-drivers/xf86-video-nsc - !x11-drivers/xf86-video-sunbw2 - !<=x11-drivers/xf86-video-ark-0.7.5 - !<=x11-drivers/xf86-video-newport-0.2.4 - !<=x11-drivers/xf86-video-sis-0.10.7 - !<=x11-drivers/xf86-video-v4l-0.2.0 - ! -Date: Sat, 31 May 2014 20:09:56 +0300 -Subject: Restore screen power after sleep - -With this patch xfpm will cache the brightness level before going -to sleep and set it back to that level after resuming from sleep. - -diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c -index e18c617..e49338e 100644 ---- a/common/xfpm-brightness.c -+++ b/common/xfpm-brightness.c -@@ -382,7 +382,7 @@ xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level) - } - - static gboolean --xfpm_brightness_helper_set_level (XfpmBrightness *brg, gint level) -+xfpm_brightness_helper_set_level (XfpmBrightness *brg, gint32 level) - { - gboolean ret; - GError *error = NULL; -diff --git a/src/xfpm-power.c b/src/xfpm-power.c -index 9d98fab..b42210b 100644 ---- a/src/xfpm-power.c -+++ b/src/xfpm-power.c -@@ -60,6 +60,7 @@ - #include "egg-idletime.h" - #include "xfpm-systemd.h" - #include "xfpm-suspend.h" -+#include "xfpm-brightness.h" - - - static void xfpm_power_finalize (GObject *object); -@@ -312,6 +313,8 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force) - #ifdef WITH_NETWORK_MANAGER - gboolean network_manager_sleep; - #endif -+ XfpmBrightness *brightness; -+ gint32 brightness_level; - - if ( power->priv->inhibited && force == FALSE) - { -@@ -344,6 +347,10 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force) - #endif - - g_signal_emit (G_OBJECT (power), signals [SLEEPING], 0); -+ /* Get the current brightness level so we can use it after we suspend */ -+ brightness = xfpm_brightness_new(); -+ xfpm_brightness_setup (brightness); -+ xfpm_brightness_get_level (brightness, &brightness_level); - - #ifdef WITH_NETWORK_MANAGER - g_object_get (G_OBJECT (power->priv->conf), -@@ -429,6 +436,11 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force) - } - - g_signal_emit (G_OBJECT (power), signals [WAKING_UP], 0); -+ /* Check/update any changes while we slept */ -+ xfpm_power_get_properties (power); -+ /* Restore the brightness level from before we suspended */ -+ xfpm_brightness_set_level (brightness, brightness_level); -+ - #ifdef WITH_NETWORK_MANAGER - if ( network_manager_sleep ) - { --- -cgit v0.10.1 - diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.4.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.4.ebuild deleted file mode 100644 index af07cbdc..00000000 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.4.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit linux-info xfconf - -DESCRIPTION="Power manager for the Xfce desktop environment" -HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager" -SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" -IUSE="debug kernel_linux lxpanel networkmanager policykit systemd +xfce_plugins_power" - -COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2:= - >=dev-libs/glib-2.30:= - >=sys-apps/dbus-1.6.18:= - || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23-r2 ) - >=x11-libs/gtk+-2.24:2= - >=x11-libs/libnotify-0.7 - x11-libs/libX11:= - >=x11-libs/libXrandr-1.2:= - x11-libs/libXext:= - >=xfce-base/xfconf-4.10:= - >=xfce-base/libxfce4ui-4.10:= - >=xfce-base/libxfce4util-4.10:= - lxpanel? ( lxde-base/lxpanel:= ) - policykit? ( >=sys-auth/polkit-0.112 ) - xfce_plugins_power? ( >=xfce-base/xfce4-panel-4.10:= )" -# USE="systemd" is for ensuring hibernate/suspend works by enforcing correct runtime -only dependencies -RDEPEND="${COMMON_DEPEND} - networkmanager? ( net-misc/networkmanager ) - !systemd? ( || ( sys-power/pm-utils sys-power/upower-pm-utils ) )" -DEPEND="${COMMON_DEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - x11-proto/xproto" - -pkg_setup() { - if use kernel_linux; then - CONFIG_CHECK="~TIMER_STATS" - linux-info_pkg_setup - fi - - XFCONF=( - $(use_enable policykit polkit) - $(use_enable networkmanager network-manager) - $(use_enable xfce_plugins_power xfce4panel) - $(use_enable lxpanel lxdepanel) - $(xfconf_use_debug) - ) - - DOCS=( AUTHORS NEWS README TODO ) -} -- cgit v1.2.3