Remove old versions, fix ACPI test to be restricted to amd64/x86

Package-Manager: portage-2.1.8.1/cvs/Linux i686

9 files changed, 22 insertions, 346 deletions

diff --git a/sys-apps/devicekit-power/ChangeLog b/sys-apps/devicekit-power/ChangeLog
index 7cd434fe7184..caea54545200 100644
--- a/sys-apps/devicekit-power/ChangeLog
+++ b/sys-apps/devicekit-power/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/devicekit-power
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/ChangeLog,v 1.7 2010/02/23 19:31:23 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/ChangeLog,v 1.8 2010/03/11 13:33:51 nirbheek Exp $
+
+  11 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  devicekit-power-009.ebuild, -devicekit-power-011.ebuild,
+  -devicekit-power-012.ebuild, -devicekit-power-012-r1.ebuild,
+  -files/devicekit-power-012-hibernate-encrypted-swap.patch,
+  -devicekit-power-013.ebuild, devicekit-power-014.ebuild:
+  Remove old versions, fix ACPI test to be restricted to amd64/x86
 
 *devicekit-power-014 (23 Feb 2010)
 
diff --git a/sys-apps/devicekit-power/Manifest b/sys-apps/devicekit-power/Manifest
index cbacd4a373b9..bd92df4c3159 100644
--- a/sys-apps/devicekit-power/Manifest
+++ b/sys-apps/devicekit-power/Manifest
@@ -1,26 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX devicekit-power-007-maintainer-cflags.patch 1286 RMD160 4d9f55caa936969ffe5df1dfdc6dfd00639322d4 SHA1 95dedce5b49dfcb06c935c0dcf5f1c8b23670534 SHA256 a87bdb4703e1c238949d951b1c7fbfedfce95af66ea9334bbaeb21a5e06d274c
 AUX devicekit-power-009-build-gcc-4.1.2.patch 392 RMD160 1dd85f5341aca85372e3f2e77e73b8381c5c56c9 SHA1 decbd6d042a5439e399166ebaebd58aacb076908 SHA256 f1613aece0da2af8d5ad8a67493bab8030f418ccf51f655617c0e21254f891e0
-AUX devicekit-power-012-hibernate-encrypted-swap.patch 805 RMD160 a6d53935c485cdc82954d735d54b5d7b919434da SHA1 e6af5891632dba4992bee374f7e15f2be978f175 SHA256 8520b6f059c0caa9afc0123b9c06dcc9671966c6e113135cbf590901c65a46cb
 DIST DeviceKit-power-009.tar.gz 496455 RMD160 46eabd609d3dc706a7651b4d34b5b6f4d3107738 SHA1 93f1d276d530107d4f49aa035cc03175b7f32ffa SHA256 438ac7f22533e04f5b44e0cf23d8b51a5cb69906ea2bbdef0581dc3c7cf19e55
-DIST DeviceKit-power-011.tar.gz 521445 RMD160 632a16f8b51621fa2723cdc46a6939919d0b54e8 SHA1 c5158e51eebb5eeaa22453e730284156d8c95fc1 SHA256 8f5b9f43c17a43574cd9026d0ff7b2f6b05d2d0e25d2033b8fdd92021fd4383d
-DIST DeviceKit-power-012.tar.gz 523183 RMD160 3c7ebabeffa5472985711939df82af72ba73d3df SHA1 caf5f8c48fbc2b1d6130b1fe282adc9511642178 SHA256 ec7eef2a7e79cb9d6f2df362172b4ee3a0e494ad828e2b0020f79ed52be9bca2
-DIST DeviceKit-power-013.tar.gz 526876 RMD160 55cea6eb2332a0bb0650f892155d3e14097e95c9 SHA1 3b611477a3d1f92bd5666c8be7076f2d39e4a3fb SHA256 bc8b0c29e74b52d44565027908606a0f8999ef1dc76e052f00eee338ee820ec2
 DIST DeviceKit-power-014.tar.gz 545297 RMD160 53334ef8771b229ab6a0e7a3dcfddb65322c3701 SHA1 564dbf627138c6bcf7e18a9fbaa08ab04bc098fe SHA256 ad3e9a8bd9525d66fadc7fa53ef99e0632aa8cca8fd5bc27483956261153b373
-EBUILD devicekit-power-009.ebuild 1584 RMD160 5682b4163d55ddf9060254abe6285aa8939ba7d9 SHA1 c6c5416dd17cd7bf25af9875c8d17f023ed34c9c SHA256 6b196cce773d40a2c63be5fc5f92628d896acd74a9ade94c6504642c6d497e12
-EBUILD devicekit-power-011.ebuild 1606 RMD160 ef60a713509ac40605cfaa61580583f475f46490 SHA1 cf75e9b5b139aeba8b8180cc4f3e719aa60a6eca SHA256 007ebff01e0aee1c128e88b544768ef6db9d7a4cfbdaeca29a66c29f2e5220c1
-EBUILD devicekit-power-012-r1.ebuild 1987 RMD160 783f0dd9767c20d8e7ac549fb6272229f9913940 SHA1 8707716dc526ee47d2f03beeae920122eea5f554 SHA256 8a1ef6da58406ec1801dcf4721f9ce13fc571522bd41f394cbbb069ba0bf40f0
-EBUILD devicekit-power-012.ebuild 1844 RMD160 25bd02ed6e5f361d52aced36cbb2ae272415e1c5 SHA1 9b1f7be0df25204cef6435c43482644fbe581532 SHA256 b3aa6e70ebce98b5673cbaa010504e5d69240624513cff6d8c615ba5ed691ae4
-EBUILD devicekit-power-013.ebuild 1856 RMD160 cc6727ba45915656699a2135fdba68c6513af9d8 SHA1 b7c457f029cd9a210114a399a7c6ab39ed44d460 SHA256 d7dc63580eea129b6a34bcf938c9aefac1d12bbf9b379966c85640afb550ca6a
-EBUILD devicekit-power-014.ebuild 1851 RMD160 f9a445c63dd5894611c521ef0d8426276326ab83 SHA1 4f15fdb9307c179beee299b5218e7f4012ef9557 SHA256 0deafd066ffbd519831f8819a42bda421b59055a32356918fa6973c4959925cb
-MISC ChangeLog 1861 RMD160 6f5f4e9941d4032f6d92989f3cdf680e87854d98 SHA1 29c64603c90bc4dfdb9b1773d0d56d1b74967727 SHA256 4b2e0063d662f6ef7da75220e3277fad2adaddd91970295fe8ffc1bdd0bceb99
+EBUILD devicekit-power-009.ebuild 1661 RMD160 4564c3257031f1a833248a29068e650200c9ac45 SHA1 7fd8ccb9fa7d7eff2f0e9ca1711cb12474e659cf SHA256 248b90b5eb0814efdd44ef06c05c8b2304a3b1726317a1956c6fc06488bbcbce
+EBUILD devicekit-power-014.ebuild 1931 RMD160 816613bfd7a437d4d5ebb4089a48b2b44af4827b SHA1 c20db4cbf7dfe05ec4068f5e4e0a58d3c107e1b7 SHA256 4243941e036c3571ee66dc9f3872d55b0072a695b9fb428ed7fbadee987e7e94
+MISC ChangeLog 2230 RMD160 c4033bf73903bdde24675031ebd67174abdf20b9 SHA1 877a1489671dcfa5f2ea5bfe4fab9875c1810329 SHA256 e805801de6d6abc158d8e684256856bb4e9154ca3b31a3be83c082fa66e566ac
 MISC metadata.xml 164 RMD160 7d567afe05ca87a772eedf19f5b1fd1e2a9798a7 SHA1 e7b1ab05868d9feb1fa1677c052836fd7dd6a171 SHA256 66cdaff449660e99dfaee8d19b47413fc8ced6d5a1eccd3c842a48e9d9668d48
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuELRUACgkQ1fmVwcYIWAZZ9QCcD9837zNwCniF5VxNqU8dncpw
-q3MAn3PCqkZrRoKipKqwq/0h+MFR5Sgd
-=f6oT
------END PGP SIGNATURE-----
diff --git a/sys-apps/devicekit-power/devicekit-power-009.ebuild b/sys-apps/devicekit-power/devicekit-power-009.ebuild
index 4291ba0d9430..550b118dd2d8 100644
--- a/sys-apps/devicekit-power/devicekit-power-009.ebuild
+++ b/sys-apps/devicekit-power/devicekit-power-009.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-009.ebuild,v 1.2 2009/09/08 18:37:48 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-009.ebuild,v 1.3 2010/03/11 13:33:51 nirbheek Exp $
 
 EAPI="2"
 
@@ -49,7 +49,10 @@ pkg_setup() {
 		$(use_enable debug verbose-mode)
 	"
 
-	check_battery
+	# ACPI is only availably on amd64/x86
+	if use amd64 || use x86; then
+		check_battery
+	fi
 }
 
 src_prepare() {
diff --git a/sys-apps/devicekit-power/devicekit-power-011.ebuild b/sys-apps/devicekit-power/devicekit-power-011.ebuild
deleted file mode 100644
index 79cf16231e0b..000000000000
--- a/sys-apps/devicekit-power/devicekit-power-011.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-011.ebuild,v 1.2 2009/11/16 21:57:32 eva Exp $
-
-EAPI="2"
-
-inherit gnome2 linux-info
-
-MY_PN="DeviceKit-power"
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/DeviceKit"
-SRC_URI="http://hal.freedesktop.org/releases/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-
-RDEPEND=">=dev-libs/glib-2.21.5
-	>=dev-libs/dbus-glib-0.76
-	>=sys-fs/udev-145[extras]
-	>=sys-auth/polkit-0.91
-	sys-apps/dbus
-	virtual/libusb:0
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.3 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-function check_battery() {
-	# check sysfs power interface, bug #263959
-	local CONFIG_CHECK="ACPI_SYSFS_POWER"
-	check_extra_config
-}
-
-pkg_setup() {
-	# Pedantic is currently broken
-	G2CONF="${G2CONF}
-		--localstatedir=/var
-		--disable-ansi
-		--enable-man-pages
-		$(use_enable debug verbose-mode)
-		$(use_enable test tests)
-	"
-
-	check_battery
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix crazy cflags
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
-		|| die "sed 1 failed"
-	# Drop this command line option, because only available since gcc 4.3,
-	# bug 289873.
-	sed 's:WARNINGFLAGS_C=\"$WARNINGFLAGS_C -Wtype-limits\"::g' -i configure.ac configure \
-		|| die "sed 2 failed"
-}
diff --git a/sys-apps/devicekit-power/devicekit-power-012-r1.ebuild b/sys-apps/devicekit-power/devicekit-power-012-r1.ebuild
deleted file mode 100644
index 55a113b9e4d9..000000000000
--- a/sys-apps/devicekit-power/devicekit-power-012-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-012-r1.ebuild,v 1.1 2009/11/16 21:57:32 eva Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 linux-info
-
-MY_PN="DeviceKit-power"
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/DeviceKit"
-SRC_URI="http://hal.freedesktop.org/releases/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-
-RDEPEND=">=dev-libs/glib-2.21.5
-	>=dev-libs/dbus-glib-0.76
-	>=sys-fs/udev-145[extras]
-	>=sys-auth/polkit-0.91
-	sys-apps/dbus
-	virtual/libusb:0
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	doc? (
-		>=dev-util/gtk-doc-1.3
-		app-text/docbook-xml-dtd:4.1.2 )
-	app-text/docbook-xsl-stylesheets
-"
-# docbook xsl is required for man pages
-# FIXME: needs dbus-dtd currently only available with dbus[doc]
-
-DOCS="AUTHORS HACKING NEWS"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-function check_battery() {
-	# check sysfs power interface, bug #263959
-	local CONFIG_CHECK="ACPI_SYSFS_POWER"
-	check_extra_config
-}
-
-pkg_setup() {
-	# Pedantic is currently broken
-	G2CONF="${G2CONF}
-		--localstatedir=/var
-		--disable-ansi
-		--disable-static
-		--enable-man-pages
-		$(use_enable debug verbose-mode)
-		$(use_enable test tests)
-	"
-
-	check_battery
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix crazy cflags
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
-		|| die "sed 1 failed"
-	# Drop this command line option, because only available since gcc 4.3,
-	# bug 289873.
-	sed 's:WARNINGFLAGS_C=\"$WARNINGFLAGS_C -Wtype-limits\"::g' -i configure.ac configure \
-		|| die "sed 2 failed"
-
-	# Fix detection of encrypted swap partition for hibernation, bug #292090
-	epatch "${FILESDIR}/${P}-hibernate-encrypted-swap.patch"
-}
diff --git a/sys-apps/devicekit-power/devicekit-power-012.ebuild b/sys-apps/devicekit-power/devicekit-power-012.ebuild
deleted file mode 100644
index f1765785abae..000000000000
--- a/sys-apps/devicekit-power/devicekit-power-012.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-012.ebuild,v 1.2 2009/11/16 21:57:32 eva Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 linux-info
-
-MY_PN="DeviceKit-power"
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/DeviceKit"
-SRC_URI="http://hal.freedesktop.org/releases/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-
-RDEPEND=">=dev-libs/glib-2.21.5
-	>=dev-libs/dbus-glib-0.76
-	>=sys-fs/udev-145[extras]
-	>=sys-auth/polkit-0.91
-	sys-apps/dbus
-	virtual/libusb:0
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	doc? (
-		>=dev-util/gtk-doc-1.3
-		app-text/docbook-xml-dtd:4.1.2 )
-	app-text/docbook-xsl-stylesheets
-"
-# docbook xsl is required for man pages
-# FIXME: needs dbus-dtd currently only available with dbus[doc]
-
-DOCS="AUTHORS HACKING NEWS"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-function check_battery() {
-	# check sysfs power interface, bug #263959
-	local CONFIG_CHECK="ACPI_SYSFS_POWER"
-	check_extra_config
-}
-
-pkg_setup() {
-	# Pedantic is currently broken
-	G2CONF="${G2CONF}
-		--localstatedir=/var
-		--disable-ansi
-		--disable-static
-		--enable-man-pages
-		$(use_enable debug verbose-mode)
-		$(use_enable test tests)
-	"
-
-	check_battery
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix crazy cflags
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
-		|| die "sed 1 failed"
-	# Drop this command line option, because only available since gcc 4.3,
-	# bug 289873.
-	sed 's:WARNINGFLAGS_C=\"$WARNINGFLAGS_C -Wtype-limits\"::g' -i configure.ac configure \
-		|| die "sed 2 failed"
-}
diff --git a/sys-apps/devicekit-power/devicekit-power-013.ebuild b/sys-apps/devicekit-power/devicekit-power-013.ebuild
deleted file mode 100644
index 51c51103fcd3..000000000000
--- a/sys-apps/devicekit-power/devicekit-power-013.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-013.ebuild,v 1.1 2009/12/11 19:12:05 nirbheek Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 linux-info
-
-MY_PN="DeviceKit-power"
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/DeviceKit"
-SRC_URI="http://hal.freedesktop.org/releases/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-
-RDEPEND=">=dev-libs/glib-2.21.5
-	>=dev-libs/dbus-glib-0.76
-	>=sys-fs/udev-145[extras]
-	>=sys-auth/polkit-0.91
-	sys-apps/dbus
-	virtual/libusb:0
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	doc? (
-		>=dev-util/gtk-doc-1.3
-		app-text/docbook-xml-dtd:4.1.2 )
-	app-text/docbook-xsl-stylesheets
-"
-# docbook xsl is required for man pages
-# FIXME: needs dbus-dtd currently only available with dbus[doc]
-
-DOCS="AUTHORS HACKING NEWS"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-function check_battery() {
-	# check sysfs power interface, bug #263959
-	local CONFIG_CHECK="ACPI_SYSFS_POWER"
-	check_extra_config
-}
-
-pkg_setup() {
-	# Pedantic is currently broken
-	G2CONF="${G2CONF}
-		--localstatedir=/var
-		--disable-ansi
-		--disable-static
-		--enable-man-pages
-		$(use_enable debug verbose-mode)
-		$(use_enable test tests)
-	"
-
-	check_battery
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix crazy cflags
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
-		|| die "sed 1 failed"
-	# Drop this command line option, because only available since gcc 4.3,
-	# bug 289873.
-	sed 's:WARNINGFLAGS_C=\"$WARNINGFLAGS_C -Wtype-limits\"::g' -i configure.ac configure \
-		|| die "sed 2 failed"
-}
diff --git a/sys-apps/devicekit-power/devicekit-power-014.ebuild b/sys-apps/devicekit-power/devicekit-power-014.ebuild
index 1834cdbc64e1..5dc57577d3d3 100644
--- a/sys-apps/devicekit-power/devicekit-power-014.ebuild
+++ b/sys-apps/devicekit-power/devicekit-power-014.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-014.ebuild,v 1.1 2010/02/23 19:31:23 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-014.ebuild,v 1.2 2010/03/11 13:33:51 nirbheek Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -59,7 +59,10 @@ pkg_setup() {
 		$(use_enable test tests)
 	"
 
-	check_battery
+	# ACPI is only availably on amd64/x86
+	if use amd64 || use x86; then
+		check_battery
+	fi
 }
 
 src_prepare() {
diff --git a/sys-apps/devicekit-power/files/devicekit-power-012-hibernate-encrypted-swap.patch b/sys-apps/devicekit-power/files/devicekit-power-012-hibernate-encrypted-swap.patch
deleted file mode 100644
index 18210ec72574..000000000000
--- a/sys-apps/devicekit-power/files/devicekit-power-012-hibernate-encrypted-swap.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 390c5b3aeb3d07ff6de3594fd08370e43b43c652 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Wed, 21 Oct 2009 09:26:48 +0100
-Subject: [PATCH] Fix a trivial copy-paste error that broke hibernate for a lot of people
-
----
- src/dkp-daemon.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/dkp-daemon.c b/src/dkp-daemon.c
-index 20e65f8..eb16a63 100644
---- a/src/dkp-daemon.c
-+++ b/src/dkp-daemon.c
-@@ -563,7 +563,7 @@ dkp_daemon_hibernate (DkpDaemon *daemon, DBusGMethodInvocation *context)
- 	}
- 
- 	/* encrypted swap? */
--	if (!daemon->priv->hibernate_has_encrypted_swap) {
-+	if (daemon->priv->hibernate_has_encrypted_swap) {
- 		error = g_error_new (DKP_DAEMON_ERROR,
- 				     DKP_DAEMON_ERROR_GENERAL,
- 				     "Swap space is encrypted");
--- 
-1.6.5
-