net-im/gajim : Deprecation Warning about python_mod_cleanup() # 381171; cleaned old

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

4 files changed, 10 insertions, 94 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 028a0bea7023..0a571892096c 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.120 2011/08/15 17:23:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.121 2011/08/30 14:47:33 jlec Exp $
+
+  30 Aug 2011; Justin Lecher <jlec@gentoo.org> -gajim-0.13.3.ebuild,
+  gajim-0.14.1-r2.ebuild, metadata.xml:
+  net-im/gajim : Deprecation Warning about python_mod_cleanup() # 381171;
+  cleaned old
 
   15 Aug 2011; Justin Lecher <jlec@gentoo.org> -gajim-0.14.1-r3.ebuild,
   -gajim-0.14.3.ebuild, gajim-0.14.4.ebuild:
diff --git a/net-im/gajim/gajim-0.13.3.ebuild b/net-im/gajim/gajim-0.13.3.ebuild
deleted file mode 100644
index 759baee446af..000000000000
--- a/net-im/gajim/gajim-0.13.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.13.3.ebuild,v 1.13 2011/03/07 13:04:28 jlec Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2:2.5"
-inherit python eutils autotools 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="dev-python/pygtk:2"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.17-r1
-	>=dev-util/intltool-0.40.1
-	dev-util/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-lang/python-2.5[sqlite,xml]
-	dev-python/pyopenssl
-	dev-python/sexy-python
-	gnome? (
-		dev-python/libgnome-python
-		dev-python/gnome-keyring-python
-		trayicon? ( dev-python/egg-python ) )
-	dbus? (
-		dev-python/dbus-python
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python )
-		avahi? ( net-dns/avahi[dbus,gtk,python] ) )
-	xhtml? ( dev-python/docutils )
-	srv? ( || (
-			dev-python/libasyncns-python
-			net-dns/bind-tools ) )
-	idle? ( x11-libs/libXScrnSaver )
-	spell? ( app-text/gtkspell )
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto )"
-
-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
-}
-
-src_prepare() {
-	# install pyfiles in /usr/lib/python2.x/site-packages/gajim
-	# upstream: http://trac.gajim.org/ticket/5460
-	epatch "${FILESDIR}/${PN}-0.13-autotools-enable-site-packages_option.patch"
-	eautoreconf
-}
-
-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}
-	dohtml README.html
-}
diff --git a/net-im/gajim/gajim-0.14.1-r2.ebuild b/net-im/gajim/gajim-0.14.1-r2.ebuild
index ce914fe485b2..80fc67fc4423 100644
--- a/net-im/gajim/gajim-0.14.1-r2.ebuild
+++ b/net-im/gajim/gajim-0.14.1-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.1-r2.ebuild,v 1.11 2011/06/20 12:19:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.1-r2.ebuild,v 1.12 2011/08/30 14:47:33 jlec Exp $
 
-EAPI=2
+EAPI=3
 
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="sqlite xml"
@@ -96,9 +96,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/${PN}
+	python_mod_optimize ${PN}
 }
 
 pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/${PN}
+	python_mod_cleanup ${PN}
 }
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index 1ad01b863a1f..b7146ef735e6 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="gmail">Depend on net-dns/bind-tools to get gmail chats working</flag>
 		<flag name="idle">Enable idle module</flag>
 		<flag name="srv">SRV capabilities</flag>
-		<flag name="trayicon">Enable support for trayicon</flag>
 		<flag name="xhtml">Enable XHTML support</flag>
 	</use>
 </pkgmetadata>