Install pixmaps at proper paths, install fr translations when needed, let it work when python3 is main interpreter (bug #408149 by FSW). Remove old.

Package-Manager: portage-2.1.10.54/cvs/Linux x86_64

6 files changed, 98 insertions, 58 deletions

diff --git a/net-misc/nut-monitor/ChangeLog b/net-misc/nut-monitor/ChangeLog
index 4e7bf17c424d..892087b3b4ca 100644
--- a/net-misc/nut-monitor/ChangeLog
+++ b/net-misc/nut-monitor/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/nut-monitor
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nut-monitor/ChangeLog,v 1.3 2011/12/04 14:29:55 jlec Exp $
+# 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 $
+
+*nut-monitor-1.3-r1 (02 Apr 2012)
+
+  02 Apr 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/nut-monitor-1.3-paths.patch, +nut-monitor-1.3-r1.ebuild,
+  -files/nut-monitor-1.3-glade.patch, -nut-monitor-1.1.ebuild,
+  -nut-monitor-1.3.ebuild:
+  Install pixmaps at proper paths, install fr translations when needed, let it
+  work when python3 is main interpreter (bug #408149 by FSW). Remove old.
 
   04 Dec 2011; Justin Lecher <jlec@gentoo.org> nut-monitor-1.3.ebuild,
   +files/nut-monitor-1.3-glade.patch:
diff --git a/net-misc/nut-monitor/Manifest b/net-misc/nut-monitor/Manifest
index 18f1441b68d3..c6f7cd9a1ba7 100644
--- a/net-misc/nut-monitor/Manifest
+++ b/net-misc/nut-monitor/Manifest
@@ -1,7 +1,15 @@
-AUX nut-monitor-1.3-glade.patch 651 RMD160 ad2891bdb10146b504a80640300eca4fc6a64024 SHA1 ffe11f2562cc9f40824771daf923818d5bf5eebc SHA256 880ce0f61fb87719292d89cde0be9198d064e99b41ea502a7053eccb5307bed3
-DIST nut-monitor-1.1.tar.gz 9881 RMD160 d728772ba9f1341eebd1e7b18788bd1e4d7c9cfe SHA1 2d5e0ff1cd62e55ed3eae9f1f2be893cf9ce067d SHA256 bb8211428f04a13baeba2dd05dbff4b6dc2e895ec2d4b7315aad0e8bd14def04
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX nut-monitor-1.3-paths.patch 2889 RMD160 942c4f78f4bbc8f105b3ffba6756c217ebcf1185 SHA1 bdbc3b542f55ba4b0687922fd94ca56f13cd5159 SHA256 5b0461c07d2c868ab8adecc301bb38f67e40d03e9f3e7f154998b08158c2b25f
 DIST nut-monitor-1.3.tar.gz 31338 RMD160 9142fbf3ba04c28dd68243d4e7accd83bc1d6e13 SHA1 53fb0926fa54f16da0555113f4da88b13e7a988e SHA256 a2e23b0372d170a9a67d55227ed4a0a6a9ae1505ad23b2004782ed9964567502
-EBUILD nut-monitor-1.1.ebuild 775 RMD160 c0c9c51c7a823120d8430520507a0448201778f8 SHA1 2ae3a0df12de1b32557aa18b891494772083137e SHA256 e477f6dd88bbfc64626ccaea9cf7fd70ef591e5fdfe5ab3698163e3baed35b6b
-EBUILD nut-monitor-1.3.ebuild 840 RMD160 79a69486d753afbb5b9a39179607e9f6e3e5a318 SHA1 d7240d59f81c2510d78ddcd78a45aa8ac6f15ec5 SHA256 4569843084beed1579485be8f5c4a41a1cf332826eba42824b644f188f781504
-MISC ChangeLog 643 RMD160 f92d26150d9ae40cde3ef048ffeb4e7ef0e5205a SHA1 d50ad2b870dec5bbe9813730f3150df77f5bbb4c SHA256 f6f86c1ededa633ebe010053f43c8b47faced76ba1eca02ff179c95766d658fe
+EBUILD nut-monitor-1.3-r1.ebuild 1191 RMD160 3cba6dff5febedc4e6e1352582edffb650ba7a0d SHA1 6c15680685019b33f33432b21a9cd44e498c5305 SHA256 7d723bde74aa1467bbb89ecdc39c3fb10b762c50bfba029e2df8b967f2a392fc
+MISC ChangeLog 1035 RMD160 6727771ca3e5d5cc728a117f69f1c9d5168ac8cb SHA1 ae5b5c3f74b99479dc2faa54a2ef2542a888d6f7 SHA256 adfeedd253c0d2e40e811adbaaebc978b773fa4ab1f41be9725de85527d67af3
 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
+-----END PGP SIGNATURE-----
diff --git a/net-misc/nut-monitor/files/nut-monitor-1.3-glade.patch b/net-misc/nut-monitor/files/nut-monitor-1.3-glade.patch
deleted file mode 100644
index 2bcb8509b132..000000000000
--- a/net-misc/nut-monitor/files/nut-monitor-1.3-glade.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- NUT-Monitor |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/NUT-Monitor b/NUT-Monitor
-index 283c4aa..d99f4fd 100755
---- a/NUT-Monitor
-+++ b/NUT-Monitor
-@@ -70,7 +70,7 @@ class interface :
-         ( cmd_opts, args ) = opt_parser.parse_args()
- 
- 
--        self.__glade_file = os.path.join( os.path.dirname( sys.argv[0] ), "gui-1.3.glade" )
-+        self.__glade_file = "/usr/share/nut-monitor/gui-1.3.glade"
- 
-         self.__widgets["interface"]                   = gtk.glade.XML( self.__glade_file, "window1", APP )
-         self.__widgets["main_window"]                 = self.__widgets["interface"].get_widget("window1")
diff --git a/net-misc/nut-monitor/files/nut-monitor-1.3-paths.patch b/net-misc/nut-monitor/files/nut-monitor-1.3-paths.patch
new file mode 100644
index 000000000000..00fd0ded3d3f
--- /dev/null
+++ b/net-misc/nut-monitor/files/nut-monitor-1.3-paths.patch
@@ -0,0 +1,48 @@
+--- a/scripts/python/app/NUT-Monitor
++++ b/scripts/python/app/NUT-Monitor
+@@ -70,7 +70,7 @@
+         ( cmd_opts, args ) = opt_parser.parse_args()
+ 
+ 
+-        self.__glade_file = os.path.join( os.path.dirname( sys.argv[0] ), "gui-1.3.glade" )
++        self.__glade_file = '/usr/share/nut-monitor/gui-1.3.glade'
+ 
+         self.__widgets["interface"]                   = gtk.glade.XML( self.__glade_file, "window1", APP )
+         self.__widgets["main_window"]                 = self.__widgets["interface"].get_widget("window1")
+@@ -103,11 +103,11 @@
+ 
+         # Create the tray icon and connect it to the show/hide method...
+         self.__widgets["status_icon"] = gtk.StatusIcon()
+-        self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) )
++        self.__widgets["status_icon"].set_from_file( "/usr/share/nut-monitor/pixmaps/on_line.png" )
+         self.__widgets["status_icon"].set_visible( True )
+         self.__widgets["status_icon"].connect( "activate", self.tray_activated )
+ 
+-        self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) )
++        self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut-monitor/pixmaps/on_line.png" )
+ 
+         # Define interface callbacks actions
+         self.__callbacks = { "on_window1_destroy"              : self.quit,
+@@ -265,8 +265,8 @@
+     #-------------------------------------------------------------------
+     # Change the status icon and tray icon
+     def change_status_icon( self, icon="on_line", blink=False ) :
+-        self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) )
+-        self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) )
++        self.__widgets["status_icon"].set_from_file( "/usr/share/nut-monitor/pixmaps/%s.png" % icon )
++        self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut-monitor/pixmaps/%s.png" % icon )
+         self.__widgets["status_icon"].set_blinking( blink )
+ 
+     #-------------------------------------------------------------------
+@@ -719,9 +719,9 @@
+ 
+             for k,v in vars.iteritems() :
+                 if ( rwvars.has_key( k ) ) :
+-                    icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-rw.png" )
++                    icon_file = "/usr/share/nut-monitor/pixmaps/var-rw.png"
+                 else :
+-                    icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-ro.png" )
++                    icon_file = "/usr/share/nut-monitor/pixmaps/var-ro.png"
+ 
+                 icon = gtk.gdk.pixbuf_new_from_file( icon_file )
+                 self.__widgets["ups_vars_tree_store"].append( [ icon, k, v ] )
diff --git a/net-misc/nut-monitor/nut-monitor-1.1.ebuild b/net-misc/nut-monitor/nut-monitor-1.1.ebuild
deleted file mode 100644
index 9aee1f629e09..000000000000
--- a/net-misc/nut-monitor/nut-monitor-1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 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.1.ebuild,v 1.2 2009/11/13 20:29:55 ssuominen Exp $
-
-inherit eutils
-
-DESCRIPTION="A graphical application to monitor and manage UPSes connected to a NUT server"
-HOMEPAGE="http://www.lestat.st/informatique/projets/nut-monitor-en/"
-SRC_URI="http://www.lestat.st/_media/informatique/projets/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pygtk
-	dev-python/pynut"
-
-src_install() {
-	dobin NUT-Monitor || die
-	insinto /usr/share/nut-monitor
-	doins gui.glade || die
-	dosym NUT-Monitor /usr/bin/${PN}
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	dodoc README
-}
diff --git a/net-misc/nut-monitor/nut-monitor-1.3.ebuild b/net-misc/nut-monitor/nut-monitor-1.3-r1.ebuild
index 1facae43badb..374a7e56d94e 100644
--- a/net-misc/nut-monitor/nut-monitor-1.3.ebuild
+++ b/net-misc/nut-monitor/nut-monitor-1.3-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.ebuild,v 1.2 2011/12/04 14:29:55 jlec Exp $
+# $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 $
 
 EAPI=4
+PYTHON_DEPEND="2"
 
-inherit eutils
+inherit eutils python
 
 DESCRIPTION="A graphical application to monitor and manage UPSes connected to a NUT server"
 HOMEPAGE="http://www.lestat.st/informatique/projets/nut-monitor-en/"
@@ -13,23 +14,40 @@ SRC_URI="http://www.lestat.st/_media/informatique/projets/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="linguas_fr"
 
-RDEPEND="
-	dev-python/pygtk
+RDEPEND="dev-python/pygtk
 	dev-python/pynut"
 DEPEND=""
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-glade.patch
+	epatch "${FILESDIR}"/${P}-paths.patch
+	python_convert_shebangs -r 2 .
 }
 
 src_install() {
 	dobin NUT-Monitor
+	dosym NUT-Monitor /usr/bin/${PN}
+
 	insinto /usr/share/nut-monitor
 	doins gui-${PV}.glade
-	dosym NUT-Monitor /usr/bin/${PN}
+
+	dodir /usr/share/nut-monitor/pixmaps
+	insinto /usr/share/nut-monitor/pixmaps
+	doins pixmaps/*
+
 	doicon ${PN}.png
 	domenu ${PN}.desktop
+
 	dodoc README
+
+	if use linguas_fr; then
+		insinto /usr/share/locale/fr/LC_MESSAGES/
+		doins locale/fr/LC_MESSAGES/NUT-Monitor.mo
+	fi
 }