Make applet support optional, bug #354399.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 131 insertions, 3 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 242461c436ed..175b3a508b3c 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.153 2011/03/22 19:26:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.154 2011/05/08 14:24:12 eva Exp $
+
+*gnome-power-manager-2.32.0-r1 (08 May 2011)
+
+  08 May 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-power-manager-2.32.0-r1.ebuild, metadata.xml:
+  Make applet support optional, bug #354399.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org>
   gnome-power-manager-2.32.0.ebuild:
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 7ccfa8a03bc3..bc4630ee9d24 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-power-manager-2.32.0-libnotify-0.7.patch 1106 RMD160 36510c89182bbbd2ae29bf8a3a78021a21b3d4cc SHA1 46be9d07d8d6b3f7387dcdc78156732d5f0e4ae7 SHA256 50e2f726281805f2b1eb3fbce2e8aa7a4258de12a20bb09e57527235c82760d2
 DIST gnome-power-manager-2.32.0.tar.bz2 3892164 RMD160 77e8b95ba6d34d83b94b410d860f23d2efb953c8 SHA1 829d65addba1dc3a7e91ebb871525dc16223a082 SHA256 17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476
+EBUILD gnome-power-manager-2.32.0-r1.ebuild 3125 RMD160 76cf2b52219293c163a13599ebf4fbad7cd9e934 SHA1 9f8940f7394b4fd77f06de8c080cf67c073ae6d3 SHA256 1c5a4799d04d3dd0aabca45e33150d32f0cde4e73610724d866d03fd7e34efee
 EBUILD gnome-power-manager-2.32.0.ebuild 3071 RMD160 49dd288e5a74c55ac340418605a3ba5fba67a75b SHA1 65406135a6080b201f2febef1f154c6e56d2041d SHA256 0b35c5dbe1ee81e7858ad9112d81ae70a0509f2935971fbc0a3829d8160f83f6
-MISC ChangeLog 25519 RMD160 dc38229eb0982154f098326dd30c10a6dc4b29df SHA1 377a76f68726a18f6413f8ad141891e6651c63b6 SHA256 f2c816d150165e8760c6887d263e34392a6045e7bb82cff8fca90fa938485d53
-MISC metadata.xml 328 RMD160 e83b5cef91422ece7e4991cc9f9422220d36b775 SHA1 c25df9c021e54eaf6c9add8db1c9954ac710b95e SHA256 2507b21284e65f9e7f5608d9865921192d0d6cdf46a35a705b0b2cb220583794
+MISC ChangeLog 25717 RMD160 50dda1381a4c1ab5857a850164f9d7034fe668c6 SHA1 28e2a40d7897bda77c81688f9e44cb6696a525a2 SHA256 4dc1c138d38674025a960834ebf0e8e2256388bf6d8aa62081be98f0d1df455c
+MISC metadata.xml 401 RMD160 f8df805516184795fc0eae8621e623000179dcf7 SHA1 f34033fb88478710119be397997f9fdb6fba56d9 SHA256 6c07ca73308c0284c064e45eecff3b959b6d84c5cdf0b557eca7b4fc398ea639
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3Gp5IACgkQ1fmVwcYIWAbcxACfaoCAF5K7+xn1oueXgnNSRcKt
+4IQAn2YT4yIRdaJPGpZpFV+7AmfHJ7/7
+=GSoq
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r1.ebuild
new file mode 100644
index 000000000000..0fccede3f9da
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r1.ebuild,v 1.1 2011/05/08 14:24:12 eva Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Gnome Power Manager"
+HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+applet doc policykit test"
+
+# FIXME: Interactive testsuite (upstream ? I'm so...pessimistic)
+RESTRICT="test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.13.0:2
+	>=x11-libs/gtk+-2.17.7:2
+	>=gnome-base/gnome-keyring-0.6.0
+	>=dev-libs/dbus-glib-0.71
+	>=x11-libs/libnotify-0.4.3
+	>=x11-libs/libwnck-2.10.0:1
+	>=x11-libs/cairo-1
+	>=gnome-base/gconf-2.10:2[policykit?]
+	>=media-libs/libcanberra-0.10[gtk]
+	>=sys-power/upower-0.9.1
+	>=dev-libs/libunique-1.1:1
+	>=x11-apps/xrandr-1.3
+	>=x11-proto/xproto-7.0.15
+	x11-libs/libX11
+	x11-libs/libXext
+	applet? (
+		|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/consolekit-0.4[policykit?]
+	policykit? ( gnome-extra/polkit-gnome )"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/randrproto
+
+	sys-devel/gettext
+	app-text/scrollkeeper
+	app-text/docbook-xml-dtd:4.3
+	>=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 )"
+
+# 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.
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable applet applets)
+		$(use_enable doc docbook-docs)
+		$(use_enable policykit gconf-defaults)
+		$(use_enable test tests)
+		--enable-compile-warnings=minimum"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
+	gnome2_src_prepare
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed libtoolize failed"
+
+	# Drop debugger CFLAGS from configure
+	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
+		-i configure.ac configure || die "debugger sed failed"
+
+	# glibc splits this out, whereas other libc's do not tend to
+	if use elibc_glibc; then
+		sed -e 's/-lresolv//' \
+			-i configure.ac configure || die "resolv sed failed"
+	fi
+
+	# FIXME: This is required to prevent maintainer mode after "debugger sed"
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+
+	# This needs to be after eautoreconf to prevent problems like bug #356277
+	if ! use doc; then
+		# Remove the docbook2man rules here since it's not handled by a proper
+		# parameter in configure.in.
+		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
+			|| die "docbook sed failed"
+	fi
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	dbus-launch Xemake check || die "Test phase failed"
+}
diff --git a/gnome-extra/gnome-power-manager/metadata.xml b/gnome-extra/gnome-power-manager/metadata.xml
index be43eccdb570..e7934f2eab69 100644
--- a/gnome-extra/gnome-power-manager/metadata.xml
+++ b/gnome-extra/gnome-power-manager/metadata.xml
@@ -6,5 +6,8 @@
 		Power Manager daemon for the GNOME desktop environment that makes it
 		easy to manage your laptop or desktop system.
 	</longdescription>
+	<use>
+		<flag name='applet'>Build battery monitor applet</flag>
+	</use>
 </pkgmetadata>