summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-04-03 10:09:32 +0000
committerPacho Ramos <pacho@gentoo.org>2012-04-03 10:09:32 +0000
commit5fc38ceba118db71cc711f11d8014ce57727ccf3 (patch)
treeadfc285ee0e3408b6757c2d10c839723f8ae964a /net-misc
parentAdding support for lease file, fixing bug 410415 (diff)
downloadhistorical-5fc38ceba118db71cc711f11d8014ce57727ccf3.tar.gz
historical-5fc38ceba118db71cc711f11d8014ce57727ccf3.tar.bz2
historical-5fc38ceba118db71cc711f11d8014ce57727ccf3.zip
Fix locales, thanks a lot to FSW in bug #408149 for his investigation.
Package-Manager: portage-2.1.10.54/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/nut-monitor/ChangeLog9
-rw-r--r--net-misc/nut-monitor/Manifest11
-rw-r--r--net-misc/nut-monitor/files/nut-monitor-1.3-paths2.patch11
-rw-r--r--net-misc/nut-monitor/nut-monitor-1.3-r2.ebuild (renamed from net-misc/nut-monitor/nut-monitor-1.3-r1.ebuild)3
4 files changed, 27 insertions, 7 deletions
diff --git a/net-misc/nut-monitor/ChangeLog b/net-misc/nut-monitor/ChangeLog
index 892087b3b4ca..84717f88a041 100644
--- a/net-misc/nut-monitor/ChangeLog
+++ b/net-misc/nut-monitor/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-misc/nut-monitor
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut-monitor/ChangeLog,v 1.4 2012/04/02 19:42:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut-monitor/ChangeLog,v 1.5 2012/04/03 10:09:32 pacho Exp $
+
+*nut-monitor-1.3-r2 (03 Apr 2012)
+
+ 03 Apr 2012; Pacho Ramos <pacho@gentoo.org>
+ +files/nut-monitor-1.3-paths2.patch, +nut-monitor-1.3-r2.ebuild,
+ -nut-monitor-1.3-r1.ebuild:
+ Fix locales, thanks a lot to FSW in bug #408149 for his investigation.
*nut-monitor-1.3-r1 (02 Apr 2012)
diff --git a/net-misc/nut-monitor/Manifest b/net-misc/nut-monitor/Manifest
index c6f7cd9a1ba7..d4373b691b7f 100644
--- a/net-misc/nut-monitor/Manifest
+++ b/net-misc/nut-monitor/Manifest
@@ -2,14 +2,15 @@
Hash: SHA1
AUX nut-monitor-1.3-paths.patch 2889 RMD160 942c4f78f4bbc8f105b3ffba6756c217ebcf1185 SHA1 bdbc3b542f55ba4b0687922fd94ca56f13cd5159 SHA256 5b0461c07d2c868ab8adecc301bb38f67e40d03e9f3e7f154998b08158c2b25f
+AUX nut-monitor-1.3-paths2.patch 305 RMD160 7d99a27f1106fdbe0cda7bf29dfb20de42065559 SHA1 71dbe166769e2161c1c00a97f2fe0ad9ecacf6d4 SHA256 ed89bb0aec0c474f82cdb5973cac08102ddf77362a7f700c38ba97220e81fb34
DIST nut-monitor-1.3.tar.gz 31338 RMD160 9142fbf3ba04c28dd68243d4e7accd83bc1d6e13 SHA1 53fb0926fa54f16da0555113f4da88b13e7a988e SHA256 a2e23b0372d170a9a67d55227ed4a0a6a9ae1505ad23b2004782ed9964567502
-EBUILD nut-monitor-1.3-r1.ebuild 1191 RMD160 3cba6dff5febedc4e6e1352582edffb650ba7a0d SHA1 6c15680685019b33f33432b21a9cd44e498c5305 SHA256 7d723bde74aa1467bbb89ecdc39c3fb10b762c50bfba029e2df8b967f2a392fc
-MISC ChangeLog 1035 RMD160 6727771ca3e5d5cc728a117f69f1c9d5168ac8cb SHA1 ae5b5c3f74b99479dc2faa54a2ef2542a888d6f7 SHA256 adfeedd253c0d2e40e811adbaaebc978b773fa4ab1f41be9725de85527d67af3
+EBUILD nut-monitor-1.3-r2.ebuild 1231 RMD160 615c8649d8d115c1d2173815e9e2065e2183e2f6 SHA1 c541c716c3230d5cbefee07e3adf7406b68dcc2e SHA256 5084e2a4c6ecf778a58213e46bd662c0ed8bd923987ad8e71e7fcd575364963c
+MISC ChangeLog 1287 RMD160 2b8367891d6440250a6f22507c20a837a5c90971 SHA1 c67b0b230e05a7a1403f28dfbdd12841d00f45e8 SHA256 4bfa211daebcc5b258a646a7738abec46a74519da28ff6db11d9b639e6a4ad77
MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk96ARgACgkQCaWpQKGI+9Q7awCdF2i86KQdf6VM1egKrp2CdbV+
-LOkAnjvchMdS1t/3RAIBqIWIOAy07aEq
-=k5zK
+iEYEARECAAYFAk96zGEACgkQCaWpQKGI+9RuEwCeKFIdYbimCnFAXnZlXbVN52Bk
+cAsAn3obyHewOpmKboYgNqbVnUYp8zrV
+=hVUt
-----END PGP SIGNATURE-----
diff --git a/net-misc/nut-monitor/files/nut-monitor-1.3-paths2.patch b/net-misc/nut-monitor/files/nut-monitor-1.3-paths2.patch
new file mode 100644
index 000000000000..92d6833ee1ff
--- /dev/null
+++ b/net-misc/nut-monitor/files/nut-monitor-1.3-paths2.patch
@@ -0,0 +1,11 @@
+--- NUT-Monitor~ 2012-04-03 12:04:09.000000000 +0200
++++ NUT-Monitor 2012-04-03 12:05:32.949730947 +0200
+@@ -888,7 +888,7 @@
+
+ # Init the localisation
+ APP = "NUT-Monitor"
+- DIR = "locale"
++ DIR = "/usr/share/locale"
+
+ gettext.bindtextdomain( APP, DIR )
+ gettext.textdomain( APP )
diff --git a/net-misc/nut-monitor/nut-monitor-1.3-r1.ebuild b/net-misc/nut-monitor/nut-monitor-1.3-r2.ebuild
index 374a7e56d94e..787cc05f0f6b 100644
--- a/net-misc/nut-monitor/nut-monitor-1.3-r1.ebuild
+++ b/net-misc/nut-monitor/nut-monitor-1.3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut-monitor/nut-monitor-1.3-r1.ebuild,v 1.1 2012/04/02 19:42:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nut-monitor/nut-monitor-1.3-r2.ebuild,v 1.1 2012/04/03 10:09:32 pacho Exp $
EAPI=4
PYTHON_DEPEND="2"
@@ -27,6 +27,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${P}-paths.patch
+ epatch "${FILESDIR}"/${P}-paths2.patch
python_convert_shebangs -r 2 .
}