net-im/gajim: Version Bump and dropeed USE gajim in favour of srv, #434600

(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)

3 files changed, 109 insertions, 3 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 2405e94c5a66..5ba399b5175e 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.144 2012/06/19 12:20:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.145 2012/09/11 18:22:26 jlec Exp $
+
+*gajim-0.15.1 (11 Sep 2012)
+
+  11 Sep 2012; Justin Lecher <jlec@gentoo.org> gajim-0.15-r2.ebuild,
+  +gajim-0.15.1.ebuild:
+  Version Bump and dropeed USE gajim in favour of srv, #434600
 
   19 Jun 2012; Agostino Sarubbo <ago@gentoo.org> -gajim-0.14.1-r2.ebuild,
   -gajim-0.14.4-r1.ebuild, -gajim-0.14.4-r2.ebuild:
diff --git a/net-im/gajim/gajim-0.15-r2.ebuild b/net-im/gajim/gajim-0.15-r2.ebuild
index c76a4284b1b4..2a7546eae814 100644
--- a/net-im/gajim/gajim-0.15-r2.ebuild
+++ b/net-im/gajim/gajim-0.15-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15-r2.ebuild,v 1.1 2012/05/14 10:54:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15-r2.ebuild,v 1.2 2012/09/11 18:22:26 jlec Exp $
 
 EAPI=4
 
@@ -55,12 +55,12 @@ RDEPEND="${COMMON_DEPEND}
 			dev-python/dbus-python
 			net-misc/networkmanager
 		)
+	spell? ( app-text/gtkspell:2 )
 	srv? (
 		|| (
 			dev-python/libasyncns-python
 			net-dns/bind-tools )
 		)
-	spell? ( app-text/gtkspell:2 )
 	xhtml? ( dev-python/docutils )"
 
 pkg_setup() {
diff --git a/net-im/gajim/gajim-0.15.1.ebuild b/net-im/gajim/gajim-0.15.1.ebuild
new file mode 100644
index 000000000000..884d43aff1af
--- /dev/null
+++ b/net-im/gajim/gajim-0.15.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.1.ebuild,v 1.1 2012/09/11 18:22:26 jlec Exp $
+
+EAPI=4
+
+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 kde idle jingle libnotify networkmanager nls spell +srv X xhtml"
+
+REQUIRED_USE="
+	libnotify? ( dbus )
+	avahi? ( dbus )"
+
+COMMON_DEPEND="
+	dev-python/pygtk:2
+	x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/pyasn1
+	dev-python/pyopenssl
+	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
+		dev-python/egg-python
+		)
+	idle? ( x11-libs/libXScrnSaver )
+	jingle? ( net-libs/farsight2[python] )
+	kde? ( kde-base/kwallet )
+	networkmanager? (
+			dev-python/dbus-python
+			net-misc/networkmanager
+		)
+	spell? ( app-text/gtkspell:2 )
+	srv? (
+		|| (
+			dev-python/libasyncns-python
+			net-dns/bind-tools )
+		)
+	xhtml? ( dev-python/docutils )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/0.14-python-version.patch \
+		"${FILESDIR}"/0.14.1-testing.patch
+	echo '#!/bin/sh' > config/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with X x) \
+		--docdir="/usr/share/doc/${PF}" \
+		--libdir="$(python_get_sitedir)" \
+		--enable-site-packages
+}
+
+src_install() {
+	default
+
+	rm "${D}/usr/share/doc/${PF}/README.html" || die
+	dohtml README.html
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}