Fix crash with en_GB locale wrt #419973 by Ciprian Ciubotariu

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

4 files changed, 104 insertions, 9 deletions

diff --git a/xfce-extra/xfce4-power-manager/ChangeLog b/xfce-extra/xfce4-power-manager/ChangeLog
index f8c8ef24e84a..b11a92ead055 100644
--- a/xfce-extra/xfce4-power-manager/ChangeLog
+++ b/xfce-extra/xfce4-power-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-power-manager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.55 2012/09/05 10:50:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/ChangeLog,v 1.56 2012/09/25 15:25:33 ssuominen Exp $
+
+*xfce4-power-manager-1.2.0-r1 (25 Sep 2012)
+
+  25 Sep 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-power-manager-1.2.0-r1.ebuild,
+  +files/xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch:
+  Fix crash with en_GB locale wrt #419973 by Ciprian Ciubotariu
 
   05 Sep 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-power-manager-1.2.0.ebuild, metadata.xml:
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 401da15f043e..3ce4bff0c2a6 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch 553 SHA256 1a4d924761de1af93e5cd2946bfd8c9cd05e27d4501acec04e7c212bbd68e0ee SHA512 b3dbfde6356b08ad1362ca85be27ee8fbafc2ab46926ff04ed22d5e762c3a07586b5d46dc4a75725c7709c6da4a8aed90387b59c72de76a46e3dd029eed20b0b WHIRLPOOL 1f9ca80b9af41ddd028172b063b7164b38442fcba4fc593614ede2af653db871662750f1d4d0d27cf8c1a30577d41ce1a41b25c21573390d89ca46de9fc29499
 DIST xfce4-power-manager-1.2.0.tar.bz2 1034821 SHA256 d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9 SHA512 1ef800871510e7e2066f9d4637679917ca9d953eb4ef4775f781085103a433e4fb25ac389713aa8e478db5d27a81359be9049b63f5a110a9092246b07954f989 WHIRLPOOL e65a89dc2a5f7aafc48370043191e9c2abe6ac4e9a4654119194da9fcea0b6a0a9cc16c9beb576b5201e55d92b844741778d34ad6cc90feb4979cadaffd34005
+EBUILD xfce4-power-manager-1.2.0-r1.ebuild 1764 SHA256 e9376fa2b7eb8b4cefc7756b5ffc05b35362f16e470daa024e16777ad1935698 SHA512 9fbfac88959500ccef229eda1e35cae2a81ed7edfc30adf77bd79016dea16988718d3da6cb8efa790bdf3d742ea9f25bee5619df510f79ec9a32f59523d93ee5 WHIRLPOOL 02693286fab0ba49305ab297e90671e0b6705e1fe9e226b8c82a7c64306332374acb3457cf546f6e5b7aae823e9a5a4e7d527c3f66bc732c695e5e552c8bf058
 EBUILD xfce4-power-manager-1.2.0.ebuild 1685 SHA256 096a92e84d4c039960c213c46345125fcbc480f606faf0fd7f2fa6325072d4cb SHA512 a08306626ea5b68376390ce6e56b9dd99ec30faaf2c274b453fe1cbbb8a90105bface328bde5b99fcb92680da078d2cbfddde32695f4697aa9f2842499158eef WHIRLPOOL d42918a2a7f629eb10cd58262cad1cec270a4d09be97a9aa98905545e05de4d81188d80956cec33b66e6184062b44b08ebc1975e0076691921476b4b204e5e81
-MISC ChangeLog 8881 SHA256 add8d26f5c96d48a269438b39c3ec12f1836451b11416a224a77e35f611f6bde SHA512 ee1eed7bd769748f6ceaa9a1e09f1f39821c70c7aec4de17a48851dc96c8fa1f4845086e5afe43b72c23773548d7203842308ff8a911db71a2e6efa16d9bf919 WHIRLPOOL 65c63e1726ba396d2ba19c9a038de0449fc9815d5414e60bfb1919f1aba40eaefdf076e6a41b12d21fdb4c3c0d935fc24799862c7e4312fa6a91731d21de05fb
+MISC ChangeLog 9159 SHA256 82e52861db896233e0c2732229c4211444446ffd4be0910a21e17d3314bb9412 SHA512 706521ed364d21a09ccdbdab80fed07dda7eebd097f3eeff2cc997b05893b0c9b65b50c3e92abd000a0ebc18df1ffbdf17d848779b2399e227cc975292a96a04 WHIRLPOOL af456b2b426604023a2f2e40bcf7afd8ee4810880cbfe9cc5515d0ec086290b431153380926d366dc4970184b41674c1c90f0da9954a837369cc7e81e6891c1b
 MISC metadata.xml 261 SHA256 29b07a977816ace8a1fca4a9a2b5ef22ea916a33168a38eb3742a2d3ade8d1fd SHA512 5a25ecbeedb025295cfb507acd73eca8f6d1382b0a16edfef81c8e1b55e2a57bedcaf6aa1c22f20dbffd18d127ec04106b361c4408b7fac32d91e4455282e27f WHIRLPOOL 8124f081e1ec4fcc9c60af388ae8b9a08d1843c05f82ef6464af34fab24f99b07e031af3f881531190e35e716c40c89d8507883854bd081c931ea4d0291131bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQRy7MAAoJEEdUh39IaPFNz5AIAKRcZVIuK3Ro9ccWWxanTnLX
-j+fvCh9/2xk55H69+yBDTWgPhUCh4dBspjB842AwWev86KfHL+UZREIFwNrrnVsN
-+uZZgc6Wzrwz5e0FKO23mPSc6nJnTu3BamtVZ9G2yVYDoGnD2nnbf6v4utfxv9rl
-60DqBs4zKit0u2kbHiUO0CBLRSCkbPjbN7xDjXVznYqEM9lhiPsbmu0jNMI7v4tX
-lqYx7PwZbOmMIlB6xR4KXQEafmv+TY4cZ25w8CnSQd4Tirn/GC8h7yJbvm9W5o9X
-mV6hXBrelFf2gEBZ3rIAWHrSTbvR80zDjH7dI4723qkdcMqXb5LgV33EhL0+jW4=
-=qUis
+iQEcBAEBCAAGBQJQYcxRAAoJEEdUh39IaPFNkCQIAIK4NQ85NuXlqNdkpPjR3cZV
+dpw3mZ11rsdQhGSTNzGXsQCt1kdofDT02XNo0xzVjY2X2Sag6mZI/Yb9RcNtrvyf
+2XvjOAfbVoTHbbtTXbcILN/DDCjYSXIlP/+S+XD2uqD8DJ/ttnmvNyV1m5qghARh
+GwGqEvIgJK3AF+EYeJhkllB1opqU+wyP94586tk4cmzzbjGV8/gGjuxrGEHgl/9P
+HAjv2+ckRQbxNZH1a6PBw5I22EBzJL9Px2OCM6/Dn6ZveochHr/p6iWFqFRbl0S0
+PfBwQ6Ewp7DO/suenYlzdf8XiTfm5LJJTulvB+dE4WL1h0Bi0+HdxpesA7GTQg0=
+=iFpD
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch
new file mode 100644
index 000000000000..f43fe9d91c0c
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/files/xfce4-power-manager-1.2.0-prevent_crash_with_locale-en_GB.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/419973
+http://bugzilla.xfce.org/show_bug.cgi?id=8992
+
+--- po/en_GB.po
++++ po/en_GB.po
+@@ -549,7 +549,6 @@ msgid ""
+ "%s until is fully charged."
+ msgstr ""
+-"%s\n"
+-"Your %s is charging (%i%%)\n"
++"%s (%i%%)\n"
+ "%s until is fully charged."
+ 
+ #: ../src/xfpm-battery.c:232 ../src/xfpm-battery.c:268
+@@ -568,8 +567,7 @@ msgid ""
+ "%s (%i%%)\n"
+ "Estimated time left is %s."
+ msgstr ""
+-"%s\n"
+-"Your %s is discharging (%i%%)\n"
++"%s (%i%%)\n"
+ "Estimated time left is %s."
+ 
+ #: ../src/xfpm-battery.c:250 ../src/xfpm-battery.c:271
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..c89a1e4dce89
--- /dev/null
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.2.0-r1.ebuild,v 1.1 2012/09/25 15:25:33 ssuominen Exp $
+
+EAPI=4
+inherit flag-o-matic linux-info xfconf
+
+DESCRIPTION="Power manager for the Xfce desktop environment"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-power-manager"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug kernel_linux networkmanager policykit +udisks +xfce_plugins_brightness"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.24
+	>=sys-power/upower-0.9.16
+	>=x11-libs/gtk+-2.20:2
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libXext
+	>=xfce-base/xfconf-4.10
+	>=xfce-base/libxfce4ui-4.10
+	>=xfce-base/libxfce4util-4.10
+	policykit? ( >=sys-auth/polkit-0.104-r1 )
+	xfce_plugins_brightness? ( >=xfce-base/xfce4-panel-4.10 )"
+RDEPEND="${COMMON_DEPEND}
+	networkmanager? ( net-misc/networkmanager )
+	udisks? ( sys-fs/udisks:0 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-prevent_crash_with_locale-en_GB.patch )
+
+	if use kernel_linux; then
+		CONFIG_CHECK="~TIMER_STATS"
+		linux-info_pkg_setup
+	fi
+
+	XFCONF=(
+		$(use_enable policykit polkit)
+		--enable-dpms
+		$(use_enable networkmanager network-manager)
+		$(use_enable xfce_plugins_brightness panel-plugins)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+
+src_install() {
+	xfconf_src_install \
+		docdir=/usr/share/doc/${PF}/html \
+		imagesdir=/usr/share/doc/${PF}/html/images
+}