Corrected usage of python mod compilation and removed old

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

5 files changed, 15 insertions, 223 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 6ff887074d7f..028a0bea7023 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,10 @@
 # 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.119 2011/08/14 16:56:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.120 2011/08/15 17:23:08 jlec Exp $
+
+  15 Aug 2011; Justin Lecher <jlec@gentoo.org> -gajim-0.14.1-r3.ebuild,
+  -gajim-0.14.3.ebuild, gajim-0.14.4.ebuild:
+  Corrected usage of python mod compilation and removed old
 
 *gajim-0.14.4 (14 Aug 2011)
 
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 075589daee9f..ddc25aa5be58 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -8,19 +8,16 @@ AUX 0.14.1-testing.patch 237 RMD160 a0fec65b49dc987d259a1b1df7f56ccac1813d19 SHA
 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.3.tar.bz2 4173090 RMD160 70fafb898a871a1030b8b4b1bc3a0ce45164cf37 SHA1 d3e5a16fdaf4eb907a102df3376a68b237a53bf2 SHA256 64d1450cd173c6d2c2b2c454964d799b91f9a4718a472f35d1dab76f0dd1e96c
 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-r3.ebuild 2560 RMD160 51e07f5e1a759d30470211498e69d92b0c7999db SHA1 dfa8a6bafd7ca48c57db19e7ffc9fd835442a5ad SHA256 b034ba472c67777d0257d3173264d6fdf836c99f64588be3c69026b73d05be54
-EBUILD gajim-0.14.3.ebuild 2521 RMD160 c753a36431bf4f604d34ad361cfc41025ba8aa8d SHA1 f117d61caf7c88b6367dd65a00cbd95426a3f92b SHA256 7e7719e531552b5dd48695aba355b841033adec3ee4a159e7fc9a15b2ad88611
-EBUILD gajim-0.14.4.ebuild 2521 RMD160 c7b82f8353cbad5667876e103b288c42a08b2eea SHA1 a249f40cccab1d7c54d4e5198b258e9f2e00d0f8 SHA256 4fe3e6c1ebe2c2580161759be23a0b1b6b328d31a1f67c18fcd84326c0036776
-MISC ChangeLog 16974 RMD160 f5a7ef13ecc88821ef5aa12a1b17480e7152d0d0 SHA1 43145a7f6b6a16acb393fdf137246d72a1af760e SHA256 b3e821ca1b630e7b33398a0c51e8c73a1c6d8e4e61f93705bca9e7db45866889
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk5H/lgACgkQgAnW8HDreRZohgCeIHB9NTxPucleycrB2QDgQlHo
-hLQAoK2mrGUBJjOSktCU7v4leYjON9eN
-=fd0Y
+iEYEAREKAAYFAk5JVgEACgkQgAnW8HDreRaRbgCgmTNjoQVbYQNaSzXGsnys38wz
+9BsAoLvAvp3rFppdkIzKcIiN0WRL4LlA
+=P9mZ
 -----END PGP SIGNATURE-----
diff --git a/net-im/gajim/gajim-0.14.1-r3.ebuild b/net-im/gajim/gajim-0.14.1-r3.ebuild
deleted file mode 100644
index 6fab7c142bb4..000000000000
--- a/net-im/gajim/gajim-0.14.1-r3.ebuild
+++ /dev/null
@@ -1,105 +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.14.1-r3.ebuild,v 1.2 2011/06/20 12:19:50 jlec Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite xml"
-
-inherit 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 gmail gnome idle jingle libnotify networkmanager nls spell srv X xhtml"
-
-COMMON_DEPEND="
-	dev-python/pygtk:2
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	dev-util/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	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] )
-		)
-	gmail? ( net-dns/bind-tools )
-	gnome? (
-		dev-python/libgnome-python
-		dev-python/gnome-keyring-python
-		dev-python/egg-python
-		)
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farsight2[python] )
-	networkmanager? (
-			dev-python/dbus-python
-			|| ( >=net-misc/networkmanager-0.7.1 net-misc/networkmanager[gnome] )
-		)
-	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_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/0.14-python-version.patch \
-		"${FILESDIR}"/0.14.1-testing.patch \
-		"${FILESDIR}"/0.14.1-link.patch
-	echo '#!/bin/sh' > config/py-compile
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with X x) \
-		--docdir="/usr/share/doc/${PF}" \
-		--libdir="$(python_get_sitedir)" \
-		--enable-site-packages
-}
-
-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}
-}
diff --git a/net-im/gajim/gajim-0.14.3.ebuild b/net-im/gajim/gajim-0.14.3.ebuild
deleted file mode 100644
index 49e8947618cb..000000000000
--- a/net-im/gajim/gajim-0.14.3.ebuild
+++ /dev/null
@@ -1,104 +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.14.3.ebuild,v 1.1 2011/06/20 12:19:50 jlec Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite xml"
-
-inherit 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 gmail gnome idle jingle libnotify networkmanager nls spell srv X xhtml"
-
-COMMON_DEPEND="
-	dev-python/pygtk:2
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	dev-util/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	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] )
-		)
-	gmail? ( net-dns/bind-tools )
-	gnome? (
-		dev-python/libgnome-python
-		dev-python/gnome-keyring-python
-		dev-python/egg-python
-		)
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farsight2[python] )
-	networkmanager? (
-			dev-python/dbus-python
-			|| ( >=net-misc/networkmanager-0.7.1 net-misc/networkmanager[gnome] )
-		)
-	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_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/0.14-python-version.patch \
-		"${FILESDIR}"/0.14.1-testing.patch
-	echo '#!/bin/sh' > config/py-compile
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with X x) \
-		--docdir="/usr/share/doc/${PF}" \
-		--libdir="$(python_get_sitedir)" \
-		--enable-site-packages
-}
-
-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}
-}
diff --git a/net-im/gajim/gajim-0.14.4.ebuild b/net-im/gajim/gajim-0.14.4.ebuild
index e4eabee49d1d..b7e542a1d5e6 100644
--- a/net-im/gajim/gajim-0.14.4.ebuild
+++ b/net-im/gajim/gajim-0.14.4.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.4.ebuild,v 1.1 2011/08/14 16:56:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.4.ebuild,v 1.2 2011/08/15 17:23:08 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}
 }