Locale handling fixed, bug #197835

Package-Manager: portage-2.1.4.4

4 files changed, 132 insertions, 3 deletions

diff --git a/net-p2p/nicotine+/ChangeLog b/net-p2p/nicotine+/ChangeLog
index ba5e822ae324..1503ef55521d 100644
--- a/net-p2p/nicotine+/ChangeLog
+++ b/net-p2p/nicotine+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/nicotine+
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.27 2007/11/18 10:59:00 armin76 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.28 2008/03/31 14:24:54 coldwind Exp $
+
+*nicotine+-1.2.9-r1 (31 Mar 2008)
+
+  31 Mar 2008; Santiago M. Mola <coldwind@gentoo.org>
+  +files/nicotine+-1.2.9-locale-handling.patch, +nicotine+-1.2.9-r1.ebuild:
+  Locale handling fixed, bug #197835
 
   18 Nov 2007; Raúl Porcel <armin76@gentoo.org> nicotine+-1.2.9.ebuild:
   Revert to ~arch, has open bugs
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 305c9ee83f6a..d3c051f5bba7 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -1,6 +1,8 @@
+AUX nicotine+-1.2.9-locale-handling.patch 2730 RMD160 ca7839e20bcc990bf8756aa85b3b6b490b56d3c8 SHA1 4b5f6a5ae30aaea7562df012d30bff726a9b8a7e SHA256 41d4ee5a8d3e957687674805b97b9d32d3e7e093d2d916fdd5924011d27d7f23
 DIST nicotine+-1.2.8.tar.bz2 790874 RMD160 9be15d3a7304db82c5c302cffda39bdc9addb3e9 SHA1 fdf20cf43d0f183a2c2a5d7b4e9758d51814d694 SHA256 19ad0478a08c736f115506323f04e13a13f4845ac1d27fd216a1e1f2dce536e2
 DIST nicotine+-1.2.9.tar.bz2 1148442 RMD160 fe542c1559626f6ef8e4ff483ed00d9129ca5f73 SHA1 f4c67a0361e8ab08328d49e664b08aa6040a3dfd SHA256 59df380c0c6e310046e70095ca93f9202de005a2daed0b2613ed5820eb328606
 EBUILD nicotine+-1.2.8.ebuild 1204 RMD160 7559f9f4660fbff37c02857f18a454ced0a5788a SHA1 bace509654c0c56c2cccb462fd0b682ea173de5e SHA256 23f511839fab747f6f7966e1666fd7e80d9882fe56432f7519ef73f9529ec775
+EBUILD nicotine+-1.2.9-r1.ebuild 1348 RMD160 325d704f804c2bef1051ae3bff4b2e7c18973515 SHA1 052773ae6af2162e3f7dc1efbb02d0954345bdee SHA256 c41be467790fcf087666db62f9dad3bdf5dc794f9780658759fec6a48d514bae
 EBUILD nicotine+-1.2.9.ebuild 1253 RMD160 c638d7c309176c6c002f122402c7ec8cef587303 SHA1 c150002b51b04ff0d5a40cb66085b61ce621ce59 SHA256 d677c0f16eadae61a9b6a5ebcdfd1e61d796ee89ff65a02538f2decee97c8eb2
-MISC ChangeLog 3667 RMD160 db3c76b28bd44184b7a91e94cb37cdfc2dbceecf SHA1 ffd05003855922f6aec9cb706600f28ba674dc4d SHA256 99bee5d68252c848106f3e92892c3dbca06812fbfa6e9530c38af3139ec96009
+MISC ChangeLog 3871 RMD160 94db52fedef842f768c5fb89e2b4bffd7de82fc1 SHA1 a8a5e2dc4c250cf2c53fca661e9aacb0c2ff67d0 SHA256 5da3dd40136ac7e254feb024b240448497f51cd9e3a35db4f09753bb3ee1aeb6
 MISC metadata.xml 221 RMD160 f0771cc4f1f6f3c792d95e7a29f261f757042b58 SHA1 f419a40290febaecf91b849cada041c09d44249a SHA256 1bf5787e57f7fa447ffe8ea45f8be8f66a5878076e9b9e65c4f911bdaa136ea4
diff --git a/net-p2p/nicotine+/files/nicotine+-1.2.9-locale-handling.patch b/net-p2p/nicotine+/files/nicotine+-1.2.9-locale-handling.patch
new file mode 100644
index 000000000000..2777b1eec861
--- /dev/null
+++ b/net-p2p/nicotine+/files/nicotine+-1.2.9-locale-handling.patch
@@ -0,0 +1,70 @@
+diff -ur nicotine+-1.2.9.orig/pynicotine/gtkgui/frame.py nicotine+-1.2.9/pynicotine/gtkgui/frame.py
+--- nicotine+-1.2.9.orig/pynicotine/gtkgui/frame.py	2007-12-04 10:33:57.000000000 +0100
++++ nicotine+-1.2.9/pynicotine/gtkgui/frame.py	2007-12-04 10:40:31.000000000 +0100
+@@ -947,20 +947,8 @@
+ 		
+ 		for widget in self.BuddiesComboEntries:
+ 			gobject.idle_add(widget.Fill)
+-			
+-	def getTabPosition(self, string):
+-		if string == "top":
+-			position = gtk.POS_TOP
+-		elif string == "bottom":
+-			position = gtk.POS_BOTTOM
+-		elif string == "left":
+-			position = gtk.POS_LEFT
+-		elif string == "right":
+-			position = gtk.POS_RIGHT
+-		else:
+-			position = gtk.POS_TOP
+-		return position
+-		
++
++
+ 	def OnAutoAway(self):
+ 		if not self.away:
+ 			self.autoaway = True
+@@ -1675,7 +1663,20 @@
+ 				message = message.replace(word, filler * len(word))
+ 				
+ 		return message
+-			
++	
++	def getTabPosition(self, string):
++		if string in ("Top", "top", _("Top")):
++			position = gtk.POS_TOP
++		elif string in ("Bottom", "bottom", _("Bottom")):
++			position = gtk.POS_BOTTOM
++		elif string in ("Left", "left", _("Left")):
++			position = gtk.POS_LEFT
++		elif string in ("Right", "right", _("Right")):
++			position = gtk.POS_RIGHT
++		else:
++			position = gtk.POS_TOP
++		return position		
++
+ 	def SetTabPositions(self):
+ 		ui = self.np.config.sections["ui"]
+ 		self.ChatNotebook.set_tab_pos(self.getTabPosition(ui["tabrooms"]))
+diff -ur nicotine+-1.2.9.orig/pynicotine/gtkgui/settingswindow.py nicotine+-1.2.9/pynicotine/gtkgui/settingswindow.py
+--- nicotine+-1.2.9.orig/pynicotine/gtkgui/settingswindow.py	2007-12-04 10:33:57.000000000 +0100
++++ nicotine+-1.2.9/pynicotine/gtkgui/settingswindow.py	2007-12-04 10:37:06.000000000 +0100
+@@ -1206,12 +1206,12 @@
+ 	def GetSettings(self):
+ 		return {
+ 			"ui": {
+-				"tabmain": self.MainPosition.get_active_text().lower(),
+-				"tabrooms": self.ChatRoomsPosition.get_active_text().lower(),
+-				"tabprivate": self.PrivateChatPosition.get_active_text().lower(),
+-				"tabinfo": self.UserInfoPosition.get_active_text().lower(),
+-				"tabbrowse": self.UserBrowsePosition.get_active_text().lower(),
+-				"tabsearch": self.SearchPosition.get_active_text().lower(),
++				"tabmain": self.MainPosition.get_active_text(),
++				"tabrooms": self.ChatRoomsPosition.get_active_text(),
++				"tabprivate": self.PrivateChatPosition.get_active_text(),
++				"tabinfo": self.UserInfoPosition.get_active_text(),
++				"tabbrowse": self.UserBrowsePosition.get_active_text(),
++				"tabsearch": self.SearchPosition.get_active_text(),
+ 				"labelmain": self.MainAngleSpin.get_value_as_int(),
+ 				"labelrooms": self.ChatRoomsAngleSpin.get_value_as_int(),
+ 				"labelprivate": self.PrivateChatAngleSpin.get_value_as_int(),
diff --git a/net-p2p/nicotine+/nicotine+-1.2.9-r1.ebuild b/net-p2p/nicotine+/nicotine+-1.2.9-r1.ebuild
new file mode 100644
index 000000000000..4558c28356a0
--- /dev/null
+++ b/net-p2p/nicotine+/nicotine+-1.2.9-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.9-r1.ebuild,v 1.1 2008/03/31 14:24:54 coldwind Exp $
+
+inherit distutils eutils multilib toolchain-funcs
+
+DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
+HOMEPAGE="http://nicotine-plus.sourceforge.net"
+SRC_URI="mirror://sourceforge/nicotine-plus/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="geoip spell vorbis"
+
+RDEPEND="virtual/python
+	>=dev-python/pygtk-2
+	vorbis? ( >=dev-python/pyvorbis-1.4-r1
+			  >=dev-python/pyogg-1 )
+	geoip? ( >=dev-python/geoip-python-0.2.0
+			 >=dev-libs/geoip-1.2.1 )
+	spell? ( dev-python/sexy-python )
+	!net-p2p/nicotine"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-locale-handling.patch
+}
+
+src_compile() {
+	distutils_src_compile
+
+	cd "${S}"/trayicon/
+	sed -i -e "s:/lib/:/$(get_libdir)/:" \
+		Makefile.in || die "sed failed"
+	./autogen.py
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	distutils_python_version
+	distutils_src_install --install-lib \
+		/usr/$(get_libdir)/python${PYVER}/site-packages
+
+	cd "${S}"/trayicon/
+	emake DESTDIR="${D}" install || die "emake install failed"
+}