Correct Slots for gtk 3 introduction to tree

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

6 files changed, 12 insertions, 313 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 3bfb2bbdced5..1cfdf024995e 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.109 2011/01/21 08:59:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.110 2011/03/07 13:04:28 jlec Exp $
+
+  07 Mar 2011; Justin Lecher <jlec@gentoo.org> gajim-0.13.3.ebuild,
+  -gajim-0.13.4.ebuild, -gajim-0.13.4-r1.ebuild, -gajim-0.14.ebuild,
+  gajim-0.14.1-r2.ebuild:
+  Correct Slots for gtk 3 introduction to tree
 
   21 Jan 2011; Justin Lecher <jlec@gentoo.org> gajim-0.14.ebuild, metadata.xml:
   Added Dep on net-dns/bind-tools for gmail support, #352103
diff --git a/net-im/gajim/gajim-0.13.3.ebuild b/net-im/gajim/gajim-0.13.3.ebuild
index d79a3bc96687..759baee446af 100644
--- a/net-im/gajim/gajim-0.13.3.ebuild
+++ b/net-im/gajim/gajim-0.13.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.12 2010/10/18 13:51:40 armin76 Exp $
+# $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"
 
@@ -16,13 +16,11 @@ 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.12.0"
-
+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
diff --git a/net-im/gajim/gajim-0.13.4-r1.ebuild b/net-im/gajim/gajim-0.13.4-r1.ebuild
deleted file mode 100644
index 92c829f4e06d..000000000000
--- a/net-im/gajim/gajim-0.13.4-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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.13.4-r1.ebuild,v 1.3 2010/08/07 17:25:57 armin76 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=">=dev-python/pygtk-2.12.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}
-}
diff --git a/net-im/gajim/gajim-0.13.4.ebuild b/net-im/gajim/gajim-0.13.4.ebuild
deleted file mode 100644
index 4aa23ce914eb..000000000000
--- a/net-im/gajim/gajim-0.13.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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.13.4.ebuild,v 1.5 2010/08/07 17:25:57 armin76 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.12.0"
-
-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
-	# Should be in 0.14
-	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 a1f2cee173fb..c26f7ce371c5 100644
--- a/net-im/gajim/gajim-0.14.1-r2.ebuild
+++ b/net-im/gajim/gajim-0.14.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.2 2011/01/24 10:36:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.1-r2.ebuild,v 1.3 2011/03/07 13:04:28 jlec Exp $
 
 EAPI="2"
 
@@ -20,13 +20,11 @@ IUSE="avahi crypt dbus gmail gnome idle jingle libnotify networkmanager nls spel
 
 COMMON_DEPEND="
 	x11-libs/gtk+:2
-	>=dev-python/pygtk-2.16.0"
-
+	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-python/pyopenssl
 	dev-python/sexy-python
diff --git a/net-im/gajim/gajim-0.14.ebuild b/net-im/gajim/gajim-0.14.ebuild
deleted file mode 100644
index 374322e5d129..000000000000
--- a/net-im/gajim/gajim-0.14.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.ebuild,v 1.5 2011/01/21 08:59: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 gnome gmail idle jingle libnotify networkmanager nls spell srv 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] )
-		)
-	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_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-python-version.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}
-}