[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-power-manager/

[Gilles Dartiguelongue]

commit:     a7863e6fae65aa479a9ceec801ca444a39902b86
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 22:06:57 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 22:06:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a7863e6f

gnome-extra/gnome-power-manager: moved to gx86

    * Sync live ebuild with gx86 changes.

---
 .../gnome-power-manager-3.6.0.ebuild               |   69 --------------------
 .../gnome-power-manager-9999.ebuild                |    5 +-
 2 files changed, 2 insertions(+), 72 deletions(-)

diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.6.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.6.0.ebuild
deleted file mode 100644
index 2fff6d0..0000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.6.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Gnome Power Manager"
-HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31.10
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/cairo-1.0.0
-	>=sys-power/upower-0.9.1
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	>=app-text/gnome-doc-utils-0.3.2
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	x11-proto/randrproto
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable test tests)
-		--enable-compile-warnings=minimum
-		--disable-schemas-compile"
-
-	gnome2_src_prepare
-
-	# Drop debugger CFLAGS from configure
-	# XXX: touch configure.ac only if running eautoreconf, otherwise
-	# maintainer mode gets triggered -- even if the order is correct
-	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
-		-i configure || die "debugger sed failed"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}

diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild
index 2fff6d0..ce8a1bb 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit eutils gnome2 virtualx
@@ -25,7 +25,7 @@ fi
 COMMON_DEPEND="
 	>=dev-libs/glib-2.31.10
 	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/cairo-1.0.0
+	>=x11-libs/cairo-1
 	>=sys-power/upower-0.9.1
 "
 RDEPEND="${COMMON_DEPEND}
@@ -48,7 +48,6 @@ DEPEND="${COMMON_DEPEND}
 # docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
 
 src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
 		$(use_enable test tests)
 		--enable-compile-warnings=minimum