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

[Alexandre Restovtsev]

commit:     6ff28c4af0af355a10570b0ebe2221bd0c502488
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Aug 30 20:29:44 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Aug 30 20:36:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6ff28c4a

gnome-extra/gnome-power-manager: 3.1.3 → 3.1.90

Version bump, lots of functionality removed (moved to
gnome-settings-daemon).

---
 ....3.ebuild => gnome-power-manager-3.1.90.ebuild} |   28 +++----------------
 .../gnome-power-manager-9999.ebuild                |   28 +++----------------
 2 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.1.3.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.1.90.ebuild
similarity index 75%
rename from gnome-extra/gnome-power-manager/gnome-power-manager-3.1.3.ebuild
rename to gnome-extra/gnome-power-manager/gnome-power-manager-3.1.90.ebuild
index d39145d..17576f7 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.1.3.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.1.90.ebuild
@@ -20,42 +20,29 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="doc test"
+IUSE="test"
 
 # FIXME: Interactive testsuite (upstream ? I'm so...pessimistic)
 RESTRICT="test"
 
-# Latest libcanberra is needed due to gtk+:3 API changes
 COMMON_DEPEND=">=dev-libs/glib-2.25.9
 	>=x11-libs/gtk+-2.91.7:3
-	>=gnome-base/gnome-keyring-0.6.0
-	>=x11-libs/libnotify-0.7.0
 	>=x11-libs/cairo-1.0.0
-	>=sys-power/upower-0.9.1
-	>=x11-apps/xrandr-1.3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender"
+	>=sys-power/upower-0.9.1"
 RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/consolekit-0.4[policykit]
 	sys-auth/polkit
 	gnome-extra/polkit-gnome"
 DEPEND="${COMMON_DEPEND}
 	x11-proto/randrproto
-	x11-proto/xproto
 
 	sys-devel/gettext
 	app-text/scrollkeeper
-	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-sgml-utils
+	app-text/docbook-sgml-dtd:4.1
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.35
 	>=app-text/gnome-doc-utils-0.3.2
-	doc? (
-		app-text/xmlto
-		app-text/docbook-sgml-utils
-		app-text/docbook-xml-dtd:4.4
-		app-text/docbook-sgml-dtd:4.1
-		app-text/docbook-xml-dtd:4.1.2 )
 	test? ( sys-apps/dbus )"
 
 # docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
@@ -65,15 +52,10 @@ DEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_enable test tests)
-		$(use_enable doc docbook-docs)
 		--disable-strict
 		--enable-compile-warnings=minimum
 		--disable-schemas-compile"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	if ! use doc; then
-		G2CONF="${G2CONF} DOCBOOK2MAN=$(type -p false)"
-	fi
+	DOCS="AUTHORS ChangeLog NEWS README"
 }
 
 src_prepare() {

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 d39145d..17576f7 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-9999.ebuild
@@ -20,42 +20,29 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="doc test"
+IUSE="test"
 
 # FIXME: Interactive testsuite (upstream ? I'm so...pessimistic)
 RESTRICT="test"
 
-# Latest libcanberra is needed due to gtk+:3 API changes
 COMMON_DEPEND=">=dev-libs/glib-2.25.9
 	>=x11-libs/gtk+-2.91.7:3
-	>=gnome-base/gnome-keyring-0.6.0
-	>=x11-libs/libnotify-0.7.0
 	>=x11-libs/cairo-1.0.0
-	>=sys-power/upower-0.9.1
-	>=x11-apps/xrandr-1.3
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender"
+	>=sys-power/upower-0.9.1"
 RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/consolekit-0.4[policykit]
 	sys-auth/polkit
 	gnome-extra/polkit-gnome"
 DEPEND="${COMMON_DEPEND}
 	x11-proto/randrproto
-	x11-proto/xproto
 
 	sys-devel/gettext
 	app-text/scrollkeeper
-	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-sgml-utils
+	app-text/docbook-sgml-dtd:4.1
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.35
 	>=app-text/gnome-doc-utils-0.3.2
-	doc? (
-		app-text/xmlto
-		app-text/docbook-sgml-utils
-		app-text/docbook-xml-dtd:4.4
-		app-text/docbook-sgml-dtd:4.1
-		app-text/docbook-xml-dtd:4.1.2 )
 	test? ( sys-apps/dbus )"
 
 # docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
@@ -65,15 +52,10 @@ DEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_enable test tests)
-		$(use_enable doc docbook-docs)
 		--disable-strict
 		--enable-compile-warnings=minimum
 		--disable-schemas-compile"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	if ! use doc; then
-		G2CONF="${G2CONF} DOCBOOK2MAN=$(type -p false)"
-	fi
+	DOCS="AUTHORS ChangeLog NEWS README"
 }
 
 src_prepare() {