Version Bump

Package-Manager: portage-2.2_rc74/cvs/Linux x86_64

4 files changed, 140 insertions, 2 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 6e70f2eff1ab..8b170a0de869 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.99 2010/08/07 17:25:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.100 2010/09/04 06:20:23 jlec Exp $
+
+*gajim-0.14 (04 Sep 2010)
+
+  04 Sep 2010; Justin Lecher <jlec@gentoo.org>
+  +files/0.14-python-version.patch, +gajim-0.14.ebuild:
+  Version Bump
 
   07 Aug 2010; Raúl Porcel <armin76@gentoo.org> gajim-0.13.3.ebuild,
   gajim-0.13.4.ebuild, gajim-0.13.4-r1.ebuild:
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 43a59a12b0a1..e55c44b4104c 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.13.4-python-version.patch 372 RMD160 19ca9bca4a00eac318f5641de4bf93d1b6c0978b SHA1 7e40dcc6e3bdc8bbbe87f84052d68108ab341ecd SHA256 81978f728540946ab58b936d01e2ac6160dcbdc387453722e062008a15b93e11
+AUX 0.14-python-version.patch 316 RMD160 0866674b1e3499e8f215f0b042e15f28a54e2676 SHA1 bc360f052a46f97d1c36ec485e692080ab7a7581 SHA256 b4aba8ebc6241442f9eb1c335ba22c2eb5a3b3a24533cb2f944f3f812e06b687
 AUX gajim-0.13-autotools-enable-site-packages_option.patch 3306 RMD160 9490bde83855a72a9ad92824a082657613a60c50 SHA1 49b6c710fdd0124617ef5f5745584c47eca0313e SHA256 61d761c2eb3934c0257624dd0fe791ece5f980a312cecc4ff54e6bb7515c37ea
 DIST gajim-0.13.3.tar.bz2 3931080 RMD160 c3352499ef8dd64ecb1382cb277c1201590345be SHA1 44006e13ae17dd52ef35c233706b6f4d7ad9cb89 SHA256 9ceee5212b274ed293ba6188559e33c995944a9e8e5d5cd9105eef6377d52bd4
 DIST gajim-0.13.4.tar.bz2 3973871 RMD160 0ce199a60fa3dcd8b10b0afae729ddd7b8ddcbce SHA1 87c37ea105543a437cf1d2bb93dd49a4f9be9343 SHA256 5ca12ba0309b681df74798128ab8b2c9160574646c00e61a3abeac98a56adee1
+DIST gajim-0.14.tar.bz2 4142326 RMD160 93c1fc53225a48216efdbdcd38a5b22a289f317c SHA1 d48fe8366c5083f7d01e0abd161bbbfb410e36ef SHA256 9f9471781f178421d05250adc42a2d2efdf4aa05eac2148dab50ec262b92e61b
 EBUILD gajim-0.13.3.ebuild 2311 RMD160 1bf58ffb76da0c4f553a1eb81a015f69164e011b SHA1 a3e3e166e50a039a82b6844c2b934eec873ef4c3 SHA256 f454753d3e12c55bd6a79194035f0c6ca02d36191fbc2c044b14e2730402518d
 EBUILD gajim-0.13.4-r1.ebuild 2605 RMD160 c115075802ae815127e24010ec11e04a21e67833 SHA1 f619932717680e8da3ff76e06c253b2be2809ae8 SHA256 8c4bcf42820274ca45894a30e6a1e5ab49babb210c80a665032a678d14804913
 EBUILD gajim-0.13.4.ebuild 2337 RMD160 8ec6f71031ab33bc494d82787681cb578376dfaf SHA1 c41938fb7b2a69c88eacf8bfc2f6417b364311b4 SHA256 af5d9714e0b28e4bcffd06bd23c126d4473510cf9d370a49bb4bde1b16c00edd
-MISC ChangeLog 14354 RMD160 acbf307567ff434d176f74e672ceeea348abef00 SHA1 aff8e046931609b926cfbabb76576d38be2478c9 SHA256 4c5619124741523d832f1ac6ec1ebc632228d84ba42356166b80b604fe30ba9d
+EBUILD gajim-0.14.ebuild 2617 RMD160 9454b39183d6b6af554f88c6601ded11a19eb6e5 SHA1 d3299a9415ad80ca0b715b3b1a31fa22518d699b SHA256 18383e0ef2899e576d556fa1bbec65c752481c16e544d3570e22582af7637f1b
+MISC ChangeLog 14498 RMD160 6b39fb17dab6eb74942ba759a8239ccc01578762 SHA1 08874df79970f48cca2f562c3d96e3d2de45a211 SHA256 f5b5009c7bcb313a6a4ea0130716a6b2739fbe092daac4a519947af41a106ef8
 MISC metadata.xml 553 RMD160 b4780201449d6f310007285b642aaccb6c350d50 SHA1 f9751ca146c518a6f31f1c4f802044e9e3c08013 SHA256 1353489c91efdd5bb461c63152d259504c3aedcb2a3cd69847994c9b17314d9f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkyB5U0ACgkQgAnW8HDreRa1oACfTqdyEyhV0ii/nA3tCC3pu/pi
+UfMAoII9WYJUt3P5DjvHKfOVSThGhx9+
+=BXnk
+-----END PGP SIGNATURE-----
diff --git a/net-im/gajim/files/0.14-python-version.patch b/net-im/gajim/files/0.14-python-version.patch
new file mode 100644
index 000000000000..30ee445d405c
--- /dev/null
+++ b/net-im/gajim/files/0.14-python-version.patch
@@ -0,0 +1,10 @@
+diff --git a/scripts/gajim.in b/scripts/gajim.in
+index e163a9b..73dc9e0 100644
+--- a/scripts/gajim.in
++++ b/scripts/gajim.in
+@@ -30,4 +30,4 @@ fi
+ [ "$APP" = "gajim-history-manager" ] && APP="history_manager"
+ 
+ cd "@GAJIM_SRCDIR@"
+-exec "@PYTHON@" -OO $APP.py "$@"
++exec "@PYTHON@@PYTHON_VERSION@" -OO $APP.py "$@"
diff --git a/net-im/gajim/gajim-0.14.ebuild b/net-im/gajim/gajim-0.14.ebuild
new file mode 100644
index 000000000000..474133f6d346
--- /dev/null
+++ b/net-im/gajim/gajim-0.14.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.ebuild,v 1.1 2010/09/04 06:20:23 jlec Exp $
+
+EAPI="2"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite xml"
+inherit autotools eutils python versionator
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="http://www.gajim.org/"
+SRC_URI="http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi crypt dbus gnome idle libnotify nls spell srv trayicon X xhtml"
+
+COMMON_DEPEND="
+	x11-libs/gtk+:2
+	>=dev-python/pygtk-2.16.0"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.17-r1
+	>=dev-util/intltool-0.40.1
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pyopenssl
+	dev-python/sexy-python
+	crypt? (
+		app-crypt/gnupg
+		dev-python/pycrypto
+		)
+	dbus? (
+		dev-python/dbus-python
+		dev-libs/dbus-glib
+		libnotify? ( dev-python/notify-python )
+		avahi? ( net-dns/avahi[dbus,gtk,python] )
+		)
+	gnome? (
+		dev-python/libgnome-python
+		dev-python/gnome-keyring-python
+		trayicon? ( dev-python/egg-python )
+		)
+	idle? ( x11-libs/libXScrnSaver )
+	srv? (
+		|| (
+			dev-python/libasyncns-python
+			net-dns/bind-tools )
+		)
+	spell? ( app-text/gtkspell )
+	xhtml? ( dev-python/docutils )"
+
+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
+	fi
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# install pyfiles in /usr/lib/python2.x/site-packages/gajim
+	# upstream: http://trac.gajim.org/ticket/5460
+	# Should be in 0.14
+#	epatch "${FILESDIR}/${PN}-0.13-autotools-enable-site-packages_option.patch"
+	epatch "${FILESDIR}"/${PV}-python-version.patch
+	eautoreconf
+	echo '#!/bin/sh' > config/py-compile
+}
+
+src_configure() {
+	local myconf
+
+	if ! use gnome; then
+		myconf+=" $(use_enable trayicon)"
+	fi
+
+	econf \
+		$(use_enable nls) \
+		$(use_with X x) \
+		--docdir="/usr/share/doc/${PF}" \
+		--libdir="$(python_get_sitedir)" \
+		--enable-site-packages \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	rm "${D}/usr/share/doc/${PF}/"{README.html,COPYING} || die
+	dohtml README.html || die
+}
+
+pkg_postinst() {
+	python_mod_optimize $(python_get_sitedir)/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup $(python_get_sitedir)/${PN}
+}