summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'mate-extra')
-rw-r--r--mate-extra/mate-power-manager/ChangeLog6
-rw-r--r--mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild6
-rw-r--r--mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild92
3 files changed, 8 insertions, 96 deletions
diff --git a/mate-extra/mate-power-manager/ChangeLog b/mate-extra/mate-power-manager/ChangeLog
index 86b5ee7821ea..cd18796a4243 100644
--- a/mate-extra/mate-power-manager/ChangeLog
+++ b/mate-extra/mate-power-manager/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for mate-extra/mate-power-manager
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/ChangeLog,v 1.13 2014/09/19 17:00:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/ChangeLog,v 1.14 2014/09/19 17:04:21 ssuominen Exp $
+
+ 19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+ -mate-power-manager-1.8.0.ebuild:
+ old
19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
mate-power-manager-1.6.3.ebuild:
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild
index fd845b2f8c5e..e8464abcab5a 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild,v 1.6 2014/07/02 09:47:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/mate-power-manager-1.8.0-r1.ebuild,v 1.7 2014/09/19 17:04:21 ssuominen Exp $
EAPI="5"
@@ -28,7 +28,7 @@ COMMON_DEPEND="app-text/rarian:0
>=dev-libs/glib-2.13:2
>=media-libs/libcanberra-0.10:0[gtk]
>=sys-apps/dbus-1:0
- || ( >=sys-power/upower-0.9.1 sys-power/upower-pm-utils )
+ || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 )
>=x11-apps/xrandr-1.2:0
>=x11-libs/cairo-1:0
>=x11-libs/gdk-pixbuf-2.11:2
@@ -55,7 +55,7 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext:*
virtual/pkgconfig:*
man? ( app-text/docbook-sgml-utils:0
- >=app-text/docbook-sgml-dtd-4.3 )"
+ >=app-text/docbook-sgml-dtd-4.3 )"
src_prepare() {
# Upstreamed patches
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild
deleted file mode 100644
index b12b6d8353ef..000000000000
--- a/mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/mate-power-manager-1.8.0.ebuild,v 1.3 2014/05/31 20:40:24 tomwij Exp $
-
-EAPI="5"
-
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop system"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+applet gnome-keyring man policykit test unique"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-COMMON_DEPEND="app-text/rarian:0
- >=dev-libs/dbus-glib-0.70:0
- >=dev-libs/glib-2.13:2
- >=media-libs/libcanberra-0.10:0[gtk]
- >=sys-apps/dbus-1:0
- || (
- ( >=sys-power/upower-0.9.1 <sys-power/upower-0.99 )
- sys-power/upower-pm-utils
- )
- >=x11-apps/xrandr-1.2:0
- >=x11-libs/cairo-1:0
- >=x11-libs/gdk-pixbuf-2.11:2
- >=x11-libs/gtk+-2.17.7:2
- x11-libs/libX11:0
- x11-libs/libXext:0
- x11-libs/libXrandr:0
- >=x11-libs/libnotify-0.7:0
- x11-libs/pango:0
- applet? ( >=mate-base/mate-panel-1.6:0 )
- gnome-keyring? ( >=gnome-base/gnome-keyring-3:0 )
- unique? ( >=dev-libs/libunique-0.9.4:1 )"
-
-RDEPEND="${COMMON_DEPEND}
- policykit? ( >=mate-extra/mate-polkit-1.6:0 )"
-
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.3
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- >=dev-util/intltool-0.35:*
- x11-proto/randrproto:0
- >=x11-proto/xproto-7.0.15:0
- sys-devel/gettext:*
- virtual/pkgconfig:*
- man? ( app-text/docbook-sgml-utils:0
- >=app-text/docbook-sgml-dtd-4.3 )"
-
-src_prepare() {
- gnome2_src_prepare
-
- # This needs to be after eautoreconf to prevent problems like bug #356277
- # Remove the docbook2man rules here since it's not handled by a proper
- # parameter in configure.in.
- if ! use man; then
- sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
- || die "docbook sed failed"
- fi
-}
-
-src_configure() {
- gnome2_src_configure \
- $(use_enable applet applets) \
- $(use_enable test tests) \
- $(use_enable unique) \
- $(use_with gnome-keyring keyring) \
- --enable-compile-warnings=minimum \
- --enable-unique \
- --with-gtk=2.0
-}
-
-DOCS="AUTHORS HACKING NEWS README TODO"
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
-
- dbus-launch Xemake check || die "Test phase failed"
-}