Correct Slots for gtk 3 introduction to tree

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

7 files changed, 25 insertions, 321 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/Manifest b/net-im/gajim/Manifest
index fa5949bf34fc..4513426436ea 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,15 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.13.4-python-version.patch 372 RMD160 19ca9bca4a00eac318f5641de4bf93d1b6c0978b SHA1 7e40dcc6e3bdc8bbbe87f84052d68108ab341ecd SHA256 81978f728540946ab58b936d01e2ac6160dcbdc387453722e062008a15b93e11
 AUX 0.14-python-version.patch 316 RMD160 0866674b1e3499e8f215f0b042e15f28a54e2676 SHA1 bc360f052a46f97d1c36ec485e692080ab7a7581 SHA256 b4aba8ebc6241442f9eb1c335ba22c2eb5a3b3a24533cb2f944f3f812e06b687
 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.13.4.tar.bz2 3973871 RMD160 0ce199a60fa3dcd8b10b0afae729ddd7b8ddcbce SHA1 87c37ea105543a437cf1d2bb93dd49a4f9be9343 SHA256 5ca12ba0309b681df74798128ab8b2c9160574646c00e61a3abeac98a56adee1
 DIST gajim-0.14.1.tar.bz2 4144916 RMD160 859cbd4a9f190adfc6b84c23ef03e3c3cab09d8d SHA1 d2fdf32ded4a5fb3c7a277a765f84a5453931f34 SHA256 5c8a10e7b06f362844ff70c6f49bd92a170b9d6e4c24e878f604032e31254d3b
-DIST gajim-0.14.tar.bz2 4142326 RMD160 93c1fc53225a48216efdbdcd38a5b22a289f317c SHA1 d48fe8366c5083f7d01e0abd161bbbfb410e36ef SHA256 9f9471781f178421d05250adc42a2d2efdf4aa05eac2148dab50ec262b92e61b
-EBUILD gajim-0.13.3.ebuild 2310 RMD160 4a442f5012871657f1893bb3f39a4d6f6e477f13 SHA1 644e8b0f527e76f72470eac6a2c23b77fdc5d185 SHA256 0870a98fc2d217994ce3e9be53bdd03596d99e39cf058ed6dbc8b11a0b5e0bdf
-EBUILD gajim-0.13.4-r1.ebuild 2605 RMD160 c115075802ae815127e24010ec11e04a21e67833 SHA1 f619932717680e8da3ff76e06c253b2be2809ae8 SHA256 8c4bcf42820274ca45894a30e6a1e5ab49babb210c80a665032a678d14804913
-EBUILD gajim-0.13.4.ebuild 2337 RMD160 8ec6f71031ab33bc494d82787681cb578376dfaf SHA1 c41938fb7b2a69c88eacf8bfc2f6417b364311b4 SHA256 af5d9714e0b28e4bcffd06bd23c126d4473510cf9d370a49bb4bde1b16c00edd
-EBUILD gajim-0.14.1-r2.ebuild 2559 RMD160 1244dc0436e38008b06cebdf6c0e88e8bcfd60b4 SHA1 8c6196833accaada01641077507c7413d6530355 SHA256 0aab9865ce7a318f81b14da407f29b351ca508e10271462e4789a3cdb3d819df
-EBUILD gajim-0.14.ebuild 2494 RMD160 abff7cc5c5babdbf272342a46449f00f6cec86c5 SHA1 b9519a496e9b4005ea9035ac7708dec43e2e599c SHA256 24e4df8672d0f3be77892ff51fa01ac88ab24e2665f32b7cca8b877903d03543
-MISC ChangeLog 15563 RMD160 44140cbff411392d31a31f79c2849cbbd29af3e2 SHA1 ad3051fa298232b8472cbeacc187a9f810626667 SHA256 9e1e2807d490da9dea9fd498c597b0a444888b1e10a51e2d786f37292174dbc9
+EBUILD gajim-0.13.3.ebuild 2298 RMD160 33f2cb5c642f04b2e310875f858bc1dda90307c3 SHA1 66c9b07274e3558394dbddd1dd9022d4319cd7a3 SHA256 e7a4f4ebf39d8eba97b80001896b3fef69027587636011e6e5fae937d59402f9
+EBUILD gajim-0.14.1-r2.ebuild 2550 RMD160 37b9d91159a9cefb29eb6cc8e2f310380d5d5f71 SHA1 eff2cb35ae837d2dbd84e6c706804350bf9fea57 SHA256 3801d206f7da18812777917f26ac62478b864d5a3331126e2b1c83eead1714fb
+MISC ChangeLog 15774 RMD160 a8f55b9cb31399f00ae52f4741214796d8ae697d SHA1 e12836ab79713160bd29b4b4d0b3fcfb8f30b553 SHA256 ac4eee010e15fa912cf8608a77f317a6fb3825250b8804fc8fb6310b59bd3ae7
 MISC metadata.xml 638 RMD160 e702d54896a9cbb004fedfcbb4afbc6ba1646c00 SHA1 8ad24c67658406655c8266c1f43a480dba93c3f9 SHA256 79c988c6cf1232f0e008fbb7e0ca13fdef0a51b28475006ceb967ac5460b7108
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk101+QACgkQgAnW8HDreRZ9WQCfeliX2sa2/Cn7qCQkTcJ9MAiN
+uhIAnR1pseF5bcWzC9aXx504wt17xILI
+=FN/b
+-----END PGP SIGNATURE-----
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}
-}