Depend on virtual/gnus.

(Portage version: 2.1.2.7)

4 files changed, 12 insertions, 52 deletions

diff --git a/app-emacs/emacs-jabber/ChangeLog b/app-emacs/emacs-jabber/ChangeLog
index c40ba50edd31..8137eee88c2c 100644
--- a/app-emacs/emacs-jabber/ChangeLog
+++ b/app-emacs/emacs-jabber/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/emacs-jabber
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/ChangeLog,v 1.5 2007/03/13 10:59:25 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/ChangeLog,v 1.6 2007/05/23 15:37:00 ulm Exp $
+
+  23 May 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-jabber-0.7.ebuild,
+  emacs-jabber-0.7-r1.ebuild:
+  Depend on virtual/gnus. Remove old.
 
 *emacs-jabber-0.7-r1 (13 Mar 2007)
 
diff --git a/app-emacs/emacs-jabber/emacs-jabber-0.7-r1.ebuild b/app-emacs/emacs-jabber/emacs-jabber-0.7-r1.ebuild
index d901c16bf7e4..1ffd3aa14d4a 100644
--- a/app-emacs/emacs-jabber/emacs-jabber-0.7-r1.ebuild
+++ b/app-emacs/emacs-jabber/emacs-jabber-0.7-r1.ebuild
@@ -1,27 +1,28 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/emacs-jabber-0.7-r1.ebuild,v 1.1 2007/03/13 10:59:25 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/emacs-jabber-0.7-r1.ebuild,v 1.2 2007/05/23 15:37:00 ulm Exp $
 
 inherit distutils elisp
 
-IUSE="sasl"
-
-DESCRIPTION="A Jabber client for Emacs."
+DESCRIPTION="A Jabber client for Emacs"
 HOMEPAGE="http://emacs-jabber.sourceforge.net/
 	http://emacswiki.org/cgi-bin/wiki/JabberEl"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+IUSE="sasl"
 
 # emacs-jabber depends on >= gnus-5.10 which is available in
 # app-emacs/gnus or bundled with app-editors/emacs-cvs.	 emacs 21.4a
 # includes gnus-5.9
 
-DEPEND="|| ( app-emacs/gnus app-editors/emacs-cvs )
+DEPEND="virtual/gnus
 	sasl? ( app-emacs/flim )"
+RDEPEND="${DEPEND}"
 
-SITEFILE="70emacs-jabber-gentoo.el"
+SITEFILE=70${PN}-gentoo.el
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-emacs/emacs-jabber/emacs-jabber-0.7.ebuild b/app-emacs/emacs-jabber/emacs-jabber-0.7.ebuild
deleted file mode 100644
index da5ac636f211..000000000000
--- a/app-emacs/emacs-jabber/emacs-jabber-0.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/emacs-jabber-0.7.ebuild,v 1.1 2006/04/26 16:06:41 mkennedy Exp $
-
-inherit distutils elisp
-
-IUSE="sasl"
-
-DESCRIPTION="A Jabber client for Emacs."
-HOMEPAGE="http://emacs-jabber.sourceforge.net/
-	http://emacswiki.org/cgi-bin/wiki/JabberEl"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-
-# emacs-jabber depends on >= gnus-5.10 which is available in
-# app-emacs/gnus or bundled with app-editors/emacs-cvs.	 emacs 21.4a
-# includes gnus-5.9
-
-DEPEND="sys-apps/texinfo
-	|| ( app-emacs/gnus app-editors/emacs-cvs )
-	sasl? ( app-emacs/flim )"
-
-SITEFILE="70emacs-jabber-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	rm ${S}/{sha1,hex-util}.el
-}
-src_compile() {
-	elisp-comp *.el || die
-	makeinfo jabber.texi || die
-}
-
-src_install() {
-	elisp-install ${PN} *.{el,elc}
-	elisp-site-file-install ${FILESDIR}/${SITEFILE}
-	doinfo jabber.info
-	dohtml html/*
-	dodoc AUTHORS NEWS README
-}
diff --git a/app-emacs/emacs-jabber/files/digest-emacs-jabber-0.7 b/app-emacs/emacs-jabber/files/digest-emacs-jabber-0.7
deleted file mode 100644
index aae4d986bfb9..000000000000
--- a/app-emacs/emacs-jabber/files/digest-emacs-jabber-0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 60c38494c82c3082e902034abf0b5336 emacs-jabber-0.7.tar.gz 107598
-RMD160 834ded191130ec7023abfd66e8d73788d12dc484 emacs-jabber-0.7.tar.gz 107598
-SHA256 ab1052173cdba5b483c7433a22e9ff2b1c2588e7238b01678f9529e9a1f313cb emacs-jabber-0.7.tar.gz 107598