Fix build of italian documentation, bug #341173. Make use of python eclass, bug #315313. Drop unused la files.

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

3 files changed, 44 insertions, 6 deletions

diff --git a/net-irc/xchat-gnome/ChangeLog b/net-irc/xchat-gnome/ChangeLog
index 5e4c5f933525..a111c999e1c5 100644
--- a/net-irc/xchat-gnome/ChangeLog
+++ b/net-irc/xchat-gnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat-gnome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.59 2010/10/13 11:45:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.60 2010/12/27 12:44:37 eva Exp $
+
+  27 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  xchat-gnome-0.26.1-r1.ebuild, +files/xchat-gnome-0.26.1-fix-it-help.patch:
+  Fix build of italian documentation, bug #341173. Make use of python eclass,
+  bug #315313. Drop unused la files.
 
   13 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
   xchat-gnome-0.26.1-r1.ebuild:
diff --git a/net-irc/xchat-gnome/files/xchat-gnome-0.26.1-fix-it-help.patch b/net-irc/xchat-gnome/files/xchat-gnome-0.26.1-fix-it-help.patch
new file mode 100644
index 000000000000..8a3e8700d0e0
--- /dev/null
+++ b/net-irc/xchat-gnome/files/xchat-gnome-0.26.1-fix-it-help.patch
@@ -0,0 +1,20 @@
+--- a/help/it/it.po	2010-12-27 12:27:16.000000000 +0100
++++ b/help/it/it.po	2010-12-27 12:27:35.000000000 +0100
+@@ -412,7 +412,7 @@
+ 
+ #: C/xchat-gnome.xml:522(para) 
+ msgid "Enter the <guilabel>Quit Message</guilabel> you wish to be shown to other users when you leave an Internet Relay Chat (IRC) network."
+-msgstr "Inserire un <guialabel>Messaggio di disconnessione</guilabel> da mostrare agli altri quando si esce dal server."
++msgstr "Inserire un <guilabel>Messaggio di disconnessione</guilabel> da mostrare agli altri quando si esce dal server."
+ 
+ #: C/xchat-gnome.xml:523(para) 
+ msgid "Enter the <guilabel>Part Message</guilabel> you wish to be shown to other users when you leave an Internet Relay Chat (IRC) channel but remain connected to that channel's network."
+@@ -488,7 +488,7 @@
+ 
+ #: C/xchat-gnome.xml:582(para) 
+ msgid "Click on the <guilabel>Foreground mark</guilabel> button to display the color selector dialog. Select the forground mark color for the <application>XChat-GNOME</application> discussion area."
+-msgstr "Fare clic su <guialbel>Primo piano</guilabel> per visualizzare la finestra di dialogo di selezione dei colori. Selezionare il colore di primo piano per l'area di discussione di <application>XChat-GNOME</application>."
++msgstr "Fare clic su <guilabel>Primo piano</guilabel> per visualizzare la finestra di dialogo di selezione dei colori. Selezionare il colore di primo piano per l'area di discussione di <application>XChat-GNOME</application>."
+ 
+ #: C/xchat-gnome.xml:585(para) 
+ msgid "Click on the <guilabel>Background mark</guilabel> button to display the color selector dialog. Select the background mark color for the <application>XChat-GNOME</application> discussion area."
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild
index 9062a4e3d38b..a6cdff5c3073 100644
--- a/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild
+++ b/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild,v 1.4 2010/10/13 11:45:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.26.1-r1.ebuild,v 1.5 2010/12/27 12:44:37 eva Exp $
 
 EAPI="2"
+GCONF_DEBUG="yes"
+PYTHON_DEPEND="python? 2"
 
-inherit gnome2 eutils toolchain-funcs
+inherit eutils gnome2 python toolchain-funcs
 
 DESCRIPTION="GNOME frontend for the popular X-Chat IRC client"
 HOMEPAGE="http://xchat-gnome.navi.cx/"
@@ -14,16 +16,15 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="dbus ipv6 libnotify mmx nls perl python sound spell ssl tcl"
 
-RDEPEND=">=dev-libs/glib-2.18.0
+RDEPEND=">=dev-libs/glib-2.18:2
 	>=gnome-base/libgnome-2.16.0
 	>=gnome-base/gconf-2.8.0
 	>=gnome-base/libgnomeui-2.16.0
 	>=gnome-base/libglade-2.3.2
-	>=x11-libs/gtk+-2.14.0
+	>=x11-libs/gtk+-2.14:2
 	spell? ( app-text/enchant )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( dev-lang/python )
 	tcl? ( dev-lang/tcl )
 	dbus? ( >=sys-apps/dbus-0.60 )
 	>=x11-libs/libsexy-0.1.11
@@ -64,6 +65,15 @@ pkg_setup() {
 		$(use_enable nls)
 		$(use_enable sound canberra)
 		$(use_enable libnotify notification)"
+
+	python_set_active_version 2
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix build with it documentation, bug #341173
+	epatch "${FILESDIR}/${PN}-0.26.1-fix-it-help.patch"
 }
 
 src_install() {
@@ -74,4 +84,7 @@ src_install() {
 	doins src/common/xchat-plugin.h || die "doins failed"
 
 	dodoc AUTHORS ChangeLog NEWS || die "dodoc failed"
+
+	# Not needed for plugins
+	find "${D}" -type f -name "*.la" -delete || die "la files removal failed"
 }