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

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

5 files changed, 16 insertions, 102 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/Manifest b/net-im/gajim/Manifest
index ddc25aa5be58..4ae1f90d1fa4 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -6,18 +6,16 @@ AUX 0.14-python-version.patch 316 RMD160 0866674b1e3499e8f215f0b042e15f28a54e267
 AUX 0.14.1-link.patch 721 RMD160 e112f2413542b03ae28f1a192d46581304e5347c SHA1 a189e6e189ba790de2b33efbc8ff581941c7008c SHA256 384b015b6d94fb4f183692d031fa54a26ab4260c75a94510fb9a6b3159f50b73
 AUX 0.14.1-testing.patch 237 RMD160 a0fec65b49dc987d259a1b1df7f56ccac1813d19 SHA1 a95e49f7e0efcf207dd04da420749283630f7826 SHA256 128da6d0a8ae48132df78f9027dc5ef5d8167e561fe12b1d774c628a5fc33638
 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.14.1.tar.bz2 4144916 RMD160 859cbd4a9f190adfc6b84c23ef03e3c3cab09d8d SHA1 d2fdf32ded4a5fb3c7a277a765f84a5453931f34 SHA256 5c8a10e7b06f362844ff70c6f49bd92a170b9d6e4c24e878f604032e31254d3b
 DIST gajim-0.14.4.tar.bz2 4173732 RMD160 e9c6d14328ca1c13cb1152fde79dd3b5e5204e64 SHA1 0343af3c4bae39aa49e547b641caac197a887bb4 SHA256 24a1c6ac8d8e489f9ea377f1b68707d1b3f55ccdf55131c16cb8e6128ca3e941
-EBUILD gajim-0.13.3.ebuild 2298 RMD160 33f2cb5c642f04b2e310875f858bc1dda90307c3 SHA1 66c9b07274e3558394dbddd1dd9022d4319cd7a3 SHA256 e7a4f4ebf39d8eba97b80001896b3fef69027587636011e6e5fae937d59402f9
-EBUILD gajim-0.14.1-r2.ebuild 2517 RMD160 89aa6232eed0b263883486bbb7360935e5fa01b6 SHA1 0673b674efdfa59e28e4d67c16c6a6796dc7c9e0 SHA256 5fc8a8890d852bb94d7fbf723b4f378b285750d6b1be43f147e879165dabbbf6
+EBUILD gajim-0.14.1-r2.ebuild 2473 RMD160 85cbc6c1c9a8f112148663feeda58a667a3165a3 SHA1 3868a0c9237009a7dd5c05c0a1e2485ad882a885 SHA256 d482cf849b105ac3f8d069bc48e1be4ff2de815006c90c4596d56801f6b3bd31
 EBUILD gajim-0.14.4.ebuild 2477 RMD160 d45f9994859e30d90dafc9b73ad3df3004ebc512 SHA1 9c86467479d780203d677105c5e3e3ba29369b0d SHA256 3685553d56bf8ac1e36bf9ef7eee061877ae88a98db183c59fa3d75721c32a0e
-MISC ChangeLog 17152 RMD160 5a4b8eca274509fbbb3abdc5a15a077ffca41759 SHA1 5206c20726ffea2beafb9cf8fcbcb240e6e2e392 SHA256 430653418987d7badc5a94f33486b51da7ae4fa835bdd64397edc11d73524e3a
-MISC metadata.xml 632 RMD160 e4ba52065cf8b6ccd14ad4b3dc6d75a155e6a394 SHA1 bee69b6ef96de00805c12f210c4c1c3b4a453f86 SHA256 5d0fa40a6a35d69afb166151186df6dc8ac1e7a8ca257203e847ffb886bb8a2b
+MISC ChangeLog 17350 RMD160 01660a8111a0e731774d416776b2c1353ab3551c SHA1 85fe2d4bf77fc1d7969fd19db7c1ab4d6e71549e SHA256 edf0c0c5edc822ab1b2bef27f6bd0e3e6171117612bec0b71768327fcce2ca5d
+MISC metadata.xml 573 RMD160 dc721373fb3fd62f6880046dae4636883f227fcb SHA1 85cba4d5f576b219ece32f59461a57575309fe99 SHA256 cdbbf751d0c4736aceae69a53fddb805be8f9daa2fb5ef1929be06814d79de69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk5JVgEACgkQgAnW8HDreRaRbgCgmTNjoQVbYQNaSzXGsnys38wz
-9BsAoLvAvp3rFppdkIzKcIiN0WRL4LlA
-=P9mZ
+iEYEAREKAAYFAk5c+AsACgkQgAnW8HDreRYgdgCgvPrQLYpCMf2VOeHF4pOdaMmH
+i74AoLFwarwDbuGIVy0zcNPxPbn3OEzB
+=rSG6
 -----END PGP SIGNATURE-----
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>