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

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     7f9365415c4c7d9e32de513070d6c6bdaf5cafff
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 20:57:41 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 20:58:05 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7f936541

gnome-extra/gnome-power-manager: moved to gentoo-x86 + sync live ebuild

---
 .../gnome-power-manager-3.10.1.ebuild              | 61 ----------------------
 .../gnome-power-manager-9999.ebuild                | 26 ++++-----
 2 files changed, 13 insertions(+), 74 deletions(-)

diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.10.1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.10.1.ebuild
deleted file mode 100644
index 3134746..0000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.10.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="GNOME power management service"
-HOMEPAGE="http://projects.gnome.org/gnome-power-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/cairo-1
-	>=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() {
-	# Drop debugger CFLAGS from configure
-	# 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"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable test tests) \
-		--enable-compile-warnings=minimum
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}

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 ce8a1bb..eeee01a 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -10,8 +10,8 @@ if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
-DESCRIPTION="Gnome Power Manager"
-HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
+DESCRIPTION="GNOME power management service"
+HOMEPAGE="http://projects.gnome.org/gnome-power-manager/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,7 +23,7 @@ else
 fi
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.31.10
+	>=dev-libs/glib-2.36:2
 	>=x11-libs/gtk+-3.3.8:3
 	>=x11-libs/cairo-1
 	>=sys-power/upower-0.9.1
@@ -48,21 +48,21 @@ DEPEND="${COMMON_DEPEND}
 # docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
 
 src_prepare() {
-	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
+	# 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"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable test tests) \
+		--enable-compile-warnings=minimum
 }
 
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
+	Xemake check
 }