gajim 0.12 beta1 added

git-svn-id: http://piczu-overlay.googlecode.com/svn/trunk@29 0805d722-a2c2-11dd-9b86-41075523de00

4 files changed, 126 insertions, 30 deletions

diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index 140d536..c48ae05 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,2 +1,2 @@
-AUX sonata-zeroconf-support.patch 6674 RMD160 ce8ed49faab5bcf17dd7c33eb1d1d4fc6909347e SHA1 d860895ead2a781844f0ad30dfb33169c82b98d9 SHA256 d3bebdac381159876b225fe2c0b263eba0884644510aeb925b818cda8e8c1f1d
+AUX sonata-zeroconf-support.patch 6740 RMD160 02f31bdffcbf7ebec0d0038dd9032c48ee7e64f8 SHA1 bfeafb9c1cd427b37ac8909fde2f78f2feb2dbe1 SHA256 3ec9e3719897d7dd079f48e0ebe3ccdaa311ec2f0064937025fb4dddf3f99b6c
 EBUILD sonata-9999.ebuild 875 RMD160 4c560d7cbd6881c61dd3bb9011029a84337f9f5e SHA1 5ad17743b7f39370f03bc03ffaecf388e3e82df2 SHA256 6202243f9f23e925cd1ede1dee201cde6eaa7fc835e18afac4f3c51b4b345d3d
diff --git a/media-sound/sonata/files/sonata-zeroconf-support.patch b/media-sound/sonata/files/sonata-zeroconf-support.patch
index b5adc4b..ea9a467 100644
--- a/media-sound/sonata/files/sonata-zeroconf-support.patch
+++ b/media-sound/sonata/files/sonata-zeroconf-support.patch
@@ -1,9 +1,9 @@
---- sonata/main.py.orig	2008-11-22 01:40:44.000000000 +0100
-+++ sonata/main.py	2008-11-22 01:44:34.000000000 +0100
-@@ -88,6 +88,16 @@
+--- sonata/main.py.orig	2008-12-05 17:54:29.000000000 +0100
++++ sonata/main.py	2008-12-05 18:09:28.000000000 +0100
+@@ -84,6 +84,15 @@
+ 	HAVE_DBUS = True
  except:
  	HAVE_DBUS = False
- 
 +try:
 +    if HAVE_DBUS:
 +        import avahi
@@ -13,30 +13,20 @@
 +        raise ImportError
 +except:
 +    HAVE_AVAHI = False
-+
+ 
  if not skip_gui:
  	import warnings, gobject, urllib, urllib2, re, gc, locale, shutil
- 	import gtk, pango, threading, time, ui, img, tray
-@@ -626,6 +636,9 @@
+@@ -574,6 +583,9 @@
  			uiDescription = uiDescription + "<menuitem action=\"" + tab + "\"/>"
  		uiDescription = uiDescription + "</popup></ui>"
- 
+ 		
 +		# Avahi
 +		self.avahi_init()
-+
++		
  		# Try to connect to MPD:
  		self.mpd_connect(blocking=True)
  		if self.conn:
-@@ -635,7 +648,7 @@
- 			self.artwork.update_songinfo(self.songinfo)
- 		elif self.initial_run:
- 			show_prefs = True
--			
-+
- 		# Audioscrobbler
- 		self.scrobbler_import()
- 		self.scrobbler_init()
-@@ -1513,6 +1526,10 @@
+@@ -1286,6 +1298,10 @@
  				action_name = self.profile_menu_name(i)
  				actions.append((action_name, None, "[" + str(i+1) + "] " + self.profile_names[i].replace("_", "__"), None, None, i))
  			actions.append(('disconnect', None, _('Disconnect'), None, None, len(self.profile_names)))
@@ -47,7 +37,7 @@
  			active_radio = self.profile_num
  		if not self.conn:
  			active_radio = len(self.profile_names)
-@@ -1531,6 +1548,10 @@
+@@ -1304,6 +1320,10 @@
  			for i in range(len(self.profile_names)):
  				action_name = self.profile_menu_name(len(self.profile_names)-i-1)
  				uiDescription = uiDescription + """<menuitem action=\"""" + action_name + """\" position="top"/>"""
@@ -58,7 +48,7 @@
  		uiDescription = uiDescription + """</menu></popup></ui>"""
  		self.merge_id = self.UIManager.add_ui_from_string(uiDescription)
  		self.UIManager.insert_action_group(self.actionGroupProfiles, 0)
-@@ -1542,7 +1563,12 @@
+@@ -1315,7 +1335,12 @@
  		if current.get_name() == 'disconnect':
  			self.on_disconnectkey_pressed(None)
  		else:
@@ -72,7 +62,7 @@
  			self.on_connectkey_pressed(None)
  
  	def mpd_connect(self, blocking=False, force=False):
-@@ -1560,9 +1586,14 @@
+@@ -1333,9 +1358,14 @@
  		if self.user_connect or force:
  			mpdh.call(self.client, 'disconnect')
  			host, port, password = misc.mpd_env_vars()
@@ -90,7 +80,7 @@
  			mpdh.call(self.client, 'connect', host, port)
  			if len(password) > 0:
  				mpdh.call(self.client, 'password', password)
-@@ -1594,8 +1625,14 @@
+@@ -1368,8 +1398,14 @@
  		if host or port:
  			self.actionGroupProfiles.list_actions()[0].activate()
  		else:
@@ -106,10 +96,10 @@
  					gtkAction.activate()
  					break
  		self.skip_on_profiles_click = False
-@@ -5350,6 +5387,44 @@
+@@ -3940,6 +3976,44 @@
  				   or (HAVE_EGG and self.trayicon.get_property('visible')))
- 		self.preferences.on_prefs_real(self.window, self.popuptimes, audioscrobbler is not None, self.scrobbler_import, self.scrobbler_init, self.scrobbler_auth_changed, trayicon_available, trayicon_in_use, self.on_connectkey_pressed, self.on_currsong_notify, self.update_infofile, self.prefs_notif_toggled, self.prefs_stylized_toggled, self.prefs_art_toggled, self.prefs_playback_toggled, self.prefs_progress_toggled, self.prefs_statusbar_toggled, self.prefs_lyrics_toggled, self.prefs_trayicon_toggled, self.prefs_window_response)
- 	
+ 		self.preferences.on_prefs_real(self.window, self.popuptimes, self.scrobbler.imported(), self.scrobbler.import_module, self.scrobbler.init, self.scrobbler.auth_changed, trayicon_available, trayicon_in_use, self.on_connectkey_pressed, self.on_currsong_notify, self.update_infofile, self.prefs_notif_toggled, self.prefs_stylized_toggled, self.prefs_art_toggled, self.prefs_playback_toggled, self.prefs_progress_toggled, self.prefs_statusbar_toggled, self.prefs_lyrics_toggled, self.prefs_trayicon_toggled, self.prefs_window_response)
+ 
 +	def avahi_init(self):
 +		self.avahi_names = []
 +		self.avahi_host = []
@@ -148,6 +138,6 @@
 +			self.avahi_port.pop(index)
 +			self.populate_profiles_for_menu()
 +
- 	def scrobbler_init(self):
- 		if audioscrobbler is not None and self.as_enabled and len(self.as_username) > 0 and len(self.as_password_md5) > 0:
- 			thread = threading.Thread(target=self.scrobbler_init_thread)
+ 	# XXX move the prefs handling parts of prefs_* to preferences.py
+ 	def prefs_window_response(self, window, response, prefsnotebook, exit_stop, win_ontop, display_art_combo, win_sticky, direntry, minimize, update_start, autoconnect, currentoptions, libraryoptions, titleoptions, currsongoptions1, currsongoptions2, crossfadecheck, crossfadespin, infopath_options, hostentry, portentry, passwordentry, using_mpd_env_vars, prev_host, prev_port, prev_password):
+ 		if response == gtk.RESPONSE_CLOSE:
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
new file mode 100644
index 0000000..54551ab
--- /dev/null
+++ b/net-im/gajim/Manifest
@@ -0,0 +1,2 @@
+DIST gajim-0.12-beta1.tar.gz 4850530 RMD160 de838a3ae4b8ae737e3bd8eb2e2ed91d47c5bca6 SHA1 682c0cb089b32256eb4764a2fe8f958b9967875d SHA256 54d65c32e6b33b5f7ed679cd617a42644738599f8cc05ffefdf6517250e18c83
+EBUILD gajim-0.12_beta1.ebuild 2618 RMD160 fed26080fa864ccd0ed70643883d53f912fded57 SHA1 d0f114d8c1b961db457bd7f2272d075dcee12a9e SHA256 d37fdfaecef8c0807d8532649a5fd4407eb9a9419d460cb53978cf7e60468144
diff --git a/net-im/gajim/gajim-0.12_beta1.ebuild b/net-im/gajim/gajim-0.12_beta1.ebuild
new file mode 100644
index 0000000..b25e890
--- /dev/null
+++ b/net-im/gajim/gajim-0.12_beta1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: Exp $
+
+inherit multilib python eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI="http://www.gajim.org/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="avahi dbus gnome idle libnotify nls spell srv trayicon X xhtml"
+
+DEPEND="|| (
+		( <dev-lang/python-2.5 dev-python/pysqlite )
+		>=dev-lang/python-2.5
+	)
+	dev-python/pygtk
+	sys-devel/gettext
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+RDEPEND="gnome? ( dev-python/gnome-python-extras
+		dev-python/gnome-python-desktop
+	)
+	dbus? ( dev-python/dbus-python dev-libs/dbus-glib )
+	libnotify? ( x11-libs/libnotify )
+	xhtml? ( dev-python/docutils )
+	srv? ( net-dns/bind-tools )
+	idle? ( x11-libs/libXScrnSaver )
+	spell? ( app-text/gtkspell )
+	avahi? ( net-dns/avahi )
+	dev-python/pyopenssl"
+
+pkg_setup() {
+	if ! use dbus; then
+		if use libnotify; then
+			eerror "The dbus USE flag is required for libnotify support"
+			die "USE=\"dbus\" needed for libnotify support"
+		fi
+		if use avahi; then
+			eerror "The dbus USE flag is required for avahi support"
+			die "USE=\"dbus\" needed for avahi support"
+		fi
+	else
+		if has_version "<sys-apps/dbus-0.90" && ! built_with_use sys-apps/dbus python; then
+				eerror "Please rebuild dbus with USE=\"python\""
+				die "USE=\"python\" needed for dbus"
+		fi
+	fi
+
+	if use avahi; then
+		if ! built_with_use net-dns/avahi dbus gtk python; then
+			eerror "The following USE flags are required for correct avahi"
+			eerror "support: dbus gtk python"
+			die "Please rebuild avahi with these use flags enabled."
+		fi
+	fi
+
+	if has_version ">=dev-lang/python-2.5" && ! built_with_use dev-lang/python sqlite; then
+		eerror "Please rebuild python with USE=\"sqlite\""
+		die "USE=\"sqlite\" needed for python"
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	if ! use gnome; then
+		myconf="${myconf} $(use_enable trayicon)"
+		myconf="${myconf} $(use_enable idle)"
+	fi
+
+	econf $(use_enable nls) \
+		$(use_enable spell gtkspell) \
+		$(use_enable dbus remote) \
+		$(use_with X x) \
+		--docdir="/usr/share/doc/${PF}" \
+		--prefix="/usr" \
+		--libdir="/usr/$(get_libdir)" \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	rm "${D}/usr/share/doc/${PF}/README.html"
+	dohtml README.html
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/gajim/
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/gajim/
+}