Removed old version, fixed depend in old version

Package-Manager: portage-2.1.2.7

5 files changed, 15 insertions, 125 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index e1d2cdd0f34e..013b8eb3de7a 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.50 2007/05/20 20:35:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.51 2007/05/26 21:38:27 welp Exp $
+
+  26 May 2007; Peter Weller <welp@gentoo.org> gajim-0.10.1.ebuild,
+  -gajim-0.11.0.7951.ebuild:
+  Removed old version, fixed depend in old version
 
   20 May 2007; Raúl Porcel <armin76@gentoo.org> gajim-0.11.1.ebuild:
   Add ~alpha wrt #158541
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index abe36c4cda4f..323cfa496d26 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -7,29 +7,24 @@ MD5 df0bdfb4e54c040e2b5e9e4c8c473517 files/gajim-10.1-Makefile.patch 475
 RMD160 7bad6b10f48a3bc8a5bcd53c7e96f444a7f9c941 files/gajim-10.1-Makefile.patch 475
 SHA256 df756da82d1bfa05f5df0658ff24e6f5401aeb302025b5f98c6f35f4392b4dc1 files/gajim-10.1-Makefile.patch 475
 DIST gajim-0.10.1.tar.bz2 2066396 RMD160 405b813db9b7e4aa4c690a77108948886c61fc62 SHA1 909f197594f1d9f0ca678bd6b0b8edbb45d357af SHA256 b167a3405d8a5e9a3913fe711562a9cb8bb8dbfc78240dbb5b3c9c51a1610174
-DIST gajim-0.11.0.7951.tar.gz 3611654 RMD160 254ac7f10611879973e1d2712bf6e4315abd2668 SHA1 bd8da935de3163dc9bae653c02e072ea82c7375c SHA256 e4d03412866e183c56aec9ca103e4de5a5cb655dbbd9722b7bd991ce41e24be7
 DIST gajim-0.11.1.tar.gz 3665819 RMD160 2491d39c1beec479a32b2efbf31b2a6dc1f96b6e SHA1 5a11a26725559e0d60a17bbaaa416ef5670c42b7 SHA256 41fead82d54f5d0d91eef161a6e0fcaa673aec3430c2d3c9f04ea91917d5c8f2
 DIST gajim-0.11.tar.bz2 2684957 RMD160 ff92f3914eb14596f725a47efa04acb402053723 SHA1 b4cea429f67d4cf241873cf7079827b160d25cb2 SHA256 1b660d2516b918fdba7533aab3dead8c222c98964ea459c5e4204c4949055422
-EBUILD gajim-0.10.1.ebuild 2218 RMD160 d99097890ae3638138c6d8ba415d7c37e7c89588 SHA1 5bff2a5d694fd28ac87840e189d6621c23932b2e SHA256 02fe05399ac8fb31d97db975953998c1708e1e0e04100e0bcc799cc9781594ed
-MD5 30beb2f98560422ae864764bbf2f9c24 gajim-0.10.1.ebuild 2218
-RMD160 d99097890ae3638138c6d8ba415d7c37e7c89588 gajim-0.10.1.ebuild 2218
-SHA256 02fe05399ac8fb31d97db975953998c1708e1e0e04100e0bcc799cc9781594ed gajim-0.10.1.ebuild 2218
+EBUILD gajim-0.10.1.ebuild 2208 RMD160 b4d586e30a69378ec158589af9799a16c22622d1 SHA1 ebb7d5e280deaebb8bc0f2aa64d3faf7f68fa609 SHA256 56287498e96ec09b585a309ae3f3a922f4977c74bad49322115efe992c4155ab
+MD5 3bbd050b5771a3c4b11202660e9e9c5b gajim-0.10.1.ebuild 2208
+RMD160 b4d586e30a69378ec158589af9799a16c22622d1 gajim-0.10.1.ebuild 2208
+SHA256 56287498e96ec09b585a309ae3f3a922f4977c74bad49322115efe992c4155ab gajim-0.10.1.ebuild 2208
 EBUILD gajim-0.11-r3.ebuild 2530 RMD160 f1c9c747874098c4af5334127e34fc97750102fd SHA1 e46b3fb00da902b0900e4ed7eb9da1bc8a4347be SHA256 d33c615eeb5a7a3071dd0e8e3ed9fc5edebeea2169669fb1e5ea6aa536ae743c
 MD5 9cf303eb9805ef2b4e105c7005d71aa8 gajim-0.11-r3.ebuild 2530
 RMD160 f1c9c747874098c4af5334127e34fc97750102fd gajim-0.11-r3.ebuild 2530
 SHA256 d33c615eeb5a7a3071dd0e8e3ed9fc5edebeea2169669fb1e5ea6aa536ae743c gajim-0.11-r3.ebuild 2530
-EBUILD gajim-0.11.0.7951.ebuild 2529 RMD160 8773e422912aa8aee9e468cf0fe146598edb3030 SHA1 956b1784d6a14a81594d758b71c4512812f258cb SHA256 620b937d549673e5ca9a777037d1b673e0d0610a6da72a93f5ea6993c458ce0c
-MD5 539b69e4467c26f53d8bed0e972d83b7 gajim-0.11.0.7951.ebuild 2529
-RMD160 8773e422912aa8aee9e468cf0fe146598edb3030 gajim-0.11.0.7951.ebuild 2529
-SHA256 620b937d549673e5ca9a777037d1b673e0d0610a6da72a93f5ea6993c458ce0c gajim-0.11.0.7951.ebuild 2529
 EBUILD gajim-0.11.1.ebuild 2529 RMD160 0ce64dc6be3f9992b351a673a293002bff83ef99 SHA1 8e171691f0a7966121aa0b37a51332d66e1dfa77 SHA256 df7e717b4e623f08f961d53a8c53949d3b2beb0d6a617ddf12716898c028c7c7
 MD5 11dbdbabd7b0b4056a2886a465529131 gajim-0.11.1.ebuild 2529
 RMD160 0ce64dc6be3f9992b351a673a293002bff83ef99 gajim-0.11.1.ebuild 2529
 SHA256 df7e717b4e623f08f961d53a8c53949d3b2beb0d6a617ddf12716898c028c7c7 gajim-0.11.1.ebuild 2529
-MISC ChangeLog 7078 RMD160 4d44c0443802007833914dce908b4a2d589beb7e SHA1 3e16136681ce2160708f47d08fc606ce609f67fd SHA256 e99dca5cd22fb1b05e8b441c3f3f7fbf2658c31dc0d14d47f56bf48500ffc4b0
-MD5 530c0ebb96c945fcfe917c6eebcf09c9 ChangeLog 7078
-RMD160 4d44c0443802007833914dce908b4a2d589beb7e ChangeLog 7078
-SHA256 e99dca5cd22fb1b05e8b441c3f3f7fbf2658c31dc0d14d47f56bf48500ffc4b0 ChangeLog 7078
+MISC ChangeLog 7223 RMD160 5b65569de00fee6f7b3844b698736ea2f797c67f SHA1 76d3b83bb1ec3ac960282352f8753c823d28baaf SHA256 f58cc146304c8449e2fb147f696a8f8c4ce55bfc8112dc859d7213554b02140c
+MD5 1469efa3a7ef908e18fbeeffe5042db1 ChangeLog 7223
+RMD160 5b65569de00fee6f7b3844b698736ea2f797c67f ChangeLog 7223
+SHA256 f58cc146304c8449e2fb147f696a8f8c4ce55bfc8112dc859d7213554b02140c ChangeLog 7223
 MISC metadata.xml 369 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 SHA1 873a1e33738638929c94655538bf9d46d0df79f6 SHA256 7b181490899f19191e60d8b702571f6a642fbe355c37c25d8cd710bfe2f2fe0d
 MD5 bd9809fa23d644d4ee6cb9497f22654c metadata.xml 369
 RMD160 b5684f22a8b81f5213bda704ee8d123d1cd796f7 metadata.xml 369
@@ -40,9 +35,6 @@ SHA256 f5df4dd47d7a962883b93d37d76d95fd9db284e2afdbba2827f885384f4c572e files/di
 MD5 8a5ae0236ddcd37470fce69ab75b2100 files/digest-gajim-0.11-r3 238
 RMD160 9637e57fd1c0f5ec68f63efdfa9c27dbbce0e4eb files/digest-gajim-0.11-r3 238
 SHA256 08ee73df755d0e62da96b3f7f6b9b204cb8707780125190d0c616f2eec083ae9 files/digest-gajim-0.11-r3 238
-MD5 7a9504503d553aa0e21db0e81c43876f files/digest-gajim-0.11.0.7951 256
-RMD160 51368848c40159ca5d0398ede7dd9e6443a21240 files/digest-gajim-0.11.0.7951 256
-SHA256 72f5471c5d12f075ce42dd68a2c426ffe80491dff67ea48afa06fee738a0c2ec files/digest-gajim-0.11.0.7951 256
 MD5 64208cf83d348c9d6c5fad1915a20194 files/digest-gajim-0.11.1 241
 RMD160 4f130676a2905a81de73e6b9cdcaa8ccb28a903a files/digest-gajim-0.11.1 241
 SHA256 fdee7bb394a0fd1945a362eef968d7b742c3c6ab70598da2f6029c9e2be4adcf files/digest-gajim-0.11.1 241
diff --git a/net-im/gajim/files/digest-gajim-0.11.0.7951 b/net-im/gajim/files/digest-gajim-0.11.0.7951
deleted file mode 100644
index ebc22ab363ac..000000000000
--- a/net-im/gajim/files/digest-gajim-0.11.0.7951
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 26675bcd59b834860f3722d337f2e7f7 gajim-0.11.0.7951.tar.gz 3611654
-RMD160 254ac7f10611879973e1d2712bf6e4315abd2668 gajim-0.11.0.7951.tar.gz 3611654
-SHA256 e4d03412866e183c56aec9ca103e4de5a5cb655dbbd9722b7bd991ce41e24be7 gajim-0.11.0.7951.tar.gz 3611654
diff --git a/net-im/gajim/gajim-0.10.1.ebuild b/net-im/gajim/gajim-0.10.1.ebuild
index 43cf83bae17a..7d9f78f016d3 100644
--- a/net-im/gajim/gajim-0.10.1.ebuild
+++ b/net-im/gajim/gajim-0.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.10.1.ebuild,v 1.14 2007/01/20 10:22:17 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.10.1.ebuild,v 1.15 2007/05/26 21:38:27 welp Exp $
 
 inherit virtualx multilib eutils
 
@@ -26,7 +26,7 @@ RDEPEND="!<=dev-python/gnome-python-2
 		)
 	)
 	gnome? ( >=dev-python/gnome-python-extras-2.10 )
-	libnotify? ( x11-misc/notification-daemon )
+	libnotify? ( x11-libs/libnotify )
 	srv? ( net-dns/bind-tools )"
 
 DEPEND="dev-util/intltool
diff --git a/net-im/gajim/gajim-0.11.0.7951.ebuild b/net-im/gajim/gajim-0.11.0.7951.ebuild
deleted file mode 100644
index 84205274a724..000000000000
--- a/net-im/gajim/gajim-0.11.0.7951.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.11.0.7951.ebuild,v 1.1 2007/02/07 21:48:25 welp Exp $
-
-inherit multilib python eutils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="http://www.gajim.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi dbus gnome idle libnotify nls spell srv trayicon X xhtml"
-
-DEPEND="|| (
-		( <dev-lang/python-2.5 dev-python/pysqlite )
-		>=dev-lang/python-2.5
-	)
-	dev-python/pygtk
-	sys-devel/gettext
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-RDEPEND="gnome? ( dev-python/gnome-python-extras
-		dev-python/gnome-python-desktop
-	)
-	dbus? (
-		|| (
-			( >=sys-apps/dbus-0.90
-				dev-python/dbus-python
-				dev-libs/dbus-glib
-			)
-			( <sys-apps/dbus-0.90 )
-		)
-	)
-	libnotify? ( x11-libs/libnotify )
-	xhtml? ( dev-python/docutils )
-	srv? ( net-dns/bind-tools )
-	idle? ( x11-libs/libXScrnSaver )
-	spell? ( app-text/gtkspell )
-	avahi? ( net-dns/avahi )"
-
-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
-	else
-		if has_version "<sys-apps/dbus-0.90" && ! built_with_use sys-apps/dbus python; then
-				eerror "Please rebuild dbus with USE=\"python\""
-				die "USE=\"python\" needed for dbus"
-		fi
-	fi
-
-	if use avahi; then
-		if ! built_with_use net-dns/avahi dbus gtk python; then
-			eerror "The following USE flags are required for correct avahi"
-			eerror "support: dbus gtk python"
-			die "Please rebuild avahi with these use flags enabled."
-		fi
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	if ! use gnome; then
-		myconf="${myconf} $(use_enable trayicon)"
-		myconf="${myconf} $(use_enable idle)"
-	fi
-
-	econf $(use_enable nls) \
-		$(use_enable spell gtkspell) \
-		$(use_enable dbus remote) \
-		$(use_with X x) \
-		--docdir="/usr/share/doc/${PF}" \
-		--prefix="/usr" \
-		--libdir="/usr/$(get_libdir)" \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${D}/usr/share/doc/${PF}/README.html"
-	dohtml README.html
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/gajim/
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/gajim/
-}