bump to 2.22.1, bugs fixes and restrict tests, bug #196490

Package-Manager: portage-2.1.4.4

3 files changed, 101 insertions, 6 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 5579633ff926..9456bd0718ed 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.86 2008/03/26 22:35:51 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.87 2008/03/30 00:04:00 eva Exp $
+
+  30 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-power-manager-2.22.1.ebuild:
+  bump to 2.22.1, bugs fixes and restrict tests, bug #196490
+
+*gnome-power-manager-2.22.1 (29 Mar 2008)
+
+  29 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-power-manager-2.22.1.ebuild:
+  bump to 2.22.1, bug fixes.
 
 *gnome-power-manager-2.22.0 (26 Mar 2008)
 
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index b4e9787c7206..2227eec4ab98 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -7,17 +7,19 @@ DIST gnome-power-manager-2.20.0.tar.bz2 2588839 RMD160 6f5cc9e9c57c1e913f0ef8a1d
 DIST gnome-power-manager-2.20.1.tar.bz2 2592825 RMD160 1ce9ff026cbadd8ab7473ca3f328e1210fb99d05 SHA1 ebee92e53827982993de3aa9dc6bb3283f7ce1fe SHA256 49b9bd62e521f08eae5cf1eb8fa4b1c7440ddfb664e16833af5fd13b97bc7d80
 DIST gnome-power-manager-2.20.2.tar.bz2 3020529 RMD160 d798acf683c74901465caf4b144a3cf40dd33eab SHA1 7cda3b71ae8ccc5825f194b6865326b9727f0da9 SHA256 60c9f8e6893123d1837f3cd1fcf834e66bc6f69b9efea5e590b1a9a97e1850c2
 DIST gnome-power-manager-2.22.0.tar.bz2 2999358 RMD160 f29c630d1f8cd287cb49f09f72f30d065178a5cd SHA1 dc47ee5ab84a50dac307defc65635eff6cb3de10 SHA256 a28500e52844286ef85f7fc773151be62c9cf6ce10ad51eceec99aa57304e70b
+DIST gnome-power-manager-2.22.1.tar.bz2 3002440 RMD160 88522f58589ece86127a84ebf52f87c0c462aa91 SHA1 bba77f4403643f10a26d7abf5a4681cd50ff08d4 SHA256 967dc61382e85dd6d8a8da74e9847760bbb429a3fdb97ab2f4f69bf574b0c1c4
 EBUILD gnome-power-manager-2.16.3.ebuild 2200 RMD160 0bd2ff57cd7a102afe706cd633aed25a9e69f73d SHA1 64a8f083c6634e989e211e4963c94dda146e8730 SHA256 c4e73b46448b22e712173ad1ad019633ebc578dd831ff6d4ab03ae86126ff9a1
 EBUILD gnome-power-manager-2.20.0-r1.ebuild 2737 RMD160 582a0acf497ceedffb2a3d110a67e9b62dd2f581 SHA1 0f303f1ed03b7f271358c2c017a101c95cf777a0 SHA256 0c3158d15623ebee741f574478bc8278f0cb0ba8c6c3f7be0c048a4c21da6503
 EBUILD gnome-power-manager-2.20.1.ebuild 2439 RMD160 453483baf51b25b78dd78b7b34fb6c26688f5ee2 SHA1 baf4c4fb29a33b6b143c6a0723f11d1f12d4db93 SHA256 b6a4672288468325734eb852bffc10ca7eaf5000b2c0435eb4bde900423b44cc
 EBUILD gnome-power-manager-2.20.2.ebuild 2473 RMD160 70d593078b9df3e8ae1a73a7389c452379cf9d72 SHA1 d3f5eb7271425deb769d1a2f4a11044e978b45c7 SHA256 f23f5b8b9022544512e0d568cb981626af9a642a8c705e43ec07fe0ac3e9d3b2
 EBUILD gnome-power-manager-2.22.0.ebuild 2474 RMD160 cccc385b70e8d8ce51cdfdc79f8eb90b698c3163 SHA1 657b10211b8bde3acbcd3d11dec0166fe6ab0162 SHA256 820b5772c72f99abc57029f20804d0342d5bebe87866d80661c14ff996c3c292
-MISC ChangeLog 13404 RMD160 47563fd841352ee76219fdc017f16deb7b1692de SHA1 bbcd70945a00963f39123e4d488f0d61964f0589 SHA256 19d43d706fa4c5f7b5dab63e6066462236df456b51c1753952aa9243c20886b8
+EBUILD gnome-power-manager-2.22.1.ebuild 2246 RMD160 aad0de4c9b4394835499f1c089abf63505626a5b SHA1 1f3f660ecbb65bb797e9ad08f933172044ea0b7d SHA256 474a4b67bedceab87aa420384f07676732fd900cb4b5382a10254982ac189c18
+MISC ChangeLog 13723 RMD160 38704f6ef2be68ef84840b0acce47f53d3c8ea30 SHA1 cdff1851c91224b6ddb831fa105eaee4cdccaa5a SHA256 c672836ca1bf7a46e7d9c46a4e03e464cb2a60c4ff71e24f79831bc78224177d
 MISC metadata.xml 328 RMD160 e83b5cef91422ece7e4991cc9f9422220d36b775 SHA1 c25df9c021e54eaf6c9add8db1c9954ac710b95e SHA256 2507b21284e65f9e7f5608d9865921192d0d6cdf46a35a705b0b2cb220583794
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH6s/Q1fmVwcYIWAYRAgxvAKCTk2l6aevzq9e7QAKooU9LdFXRWQCdGeDl
-6WhWVRa3i1e7peUnmmlo8FE=
-=1Nz4
+iEYEARECAAYFAkfu2PcACgkQ1fmVwcYIWAZXfwCgmCg2RXZ23uzDASQq8csiGiFh
+CRAAoI0iPk4ml3hve28Y0bsQpJEytY4U
+=8Ogj
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.1.ebuild
new file mode 100644
index 000000000000..229f6d195961
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.22.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2008 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.22.1.ebuild,v 1.1 2008/03/30 00:04:00 eva Exp $
+
+inherit gnome2 eutils virtualx
+
+DESCRIPTION="Gnome Power Manager"
+HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
+IUSE="doc test"
+
+# See bug #196490
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/glib-2.6.0
+		 >=x11-libs/gtk+-2.11.0
+		 >=gnome-base/gnome-keyring-0.6.0
+		 >=gnome-base/libgnome-2.14.0
+		 >=gnome-base/libgnomeui-2.14.0
+		 >=sys-apps/hal-0.5.9
+		 >=dev-libs/dbus-glib-0.71
+		 >=gnome-base/libglade-2.5.0
+		 >=x11-libs/libnotify-0.4.3
+		 >=x11-libs/libwnck-2.10.0
+		 >=x11-libs/cairo-1.0.0
+		 >=gnome-base/gnome-panel-2
+		 >=gnome-base/gconf-2
+		  =media-libs/gstreamer-0.10*
+		   x11-libs/libX11
+		   x11-libs/libXext"
+DEPEND="${RDEPEND}
+		  sys-devel/gettext
+		 ~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.
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable test tests)
+		$(use_enable doc docbook-docs)
+		--with-dpms-ext
+		--disable-policykit
+		--enable-xevents
+		--enable-applets"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	if use doc; then
+		# Actually install all html files, not just the index
+		sed -i -e 's:\(htmldoc_DATA = \).*:\1$(SPEC_HTML_FILES):' \
+			"${S}/docs/Makefile.in"
+	else
+		# Remove the docbook2man rules here since it's not handled by a proper
+		# parameter in configure.in.
+		sed -i -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' "${S}/man/Makefile.in"
+	fi
+
+	# glibc splits this out, whereas other libc's do not tend to
+	use elibc_glibc || sed -i -e 's/-lresolv//' configure
+}
+
+src_test() {
+	Xemake check || die "Test phase failed"
+}