Depend on virtual/gnus.

Package-Manager: portage-2.1.2.7

5 files changed, 24 insertions, 71 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/Manifest b/app-emacs/emacs-jabber/Manifest
index 0959f2ba12f6..e90c16bfcd22 100644
--- a/app-emacs/emacs-jabber/Manifest
+++ b/app-emacs/emacs-jabber/Manifest
@@ -6,32 +6,25 @@ MD5 98c463c9a7e3a9a4aed6d263734fb00a files/70emacs-jabber-gentoo.el 98
 RMD160 ccd48f0ca1daa6ad83cb31b756d715e324b4128e files/70emacs-jabber-gentoo.el 98
 SHA256 8e42dc7245eb721092bc85a4938874dbbc51858964bcfa8221caecb4c7a0c7d2 files/70emacs-jabber-gentoo.el 98
 DIST emacs-jabber-0.7.tar.gz 107598 RMD160 834ded191130ec7023abfd66e8d73788d12dc484 SHA1 1b496820ad357ff45070cf4cebc7e61f8f8155f6 SHA256 ab1052173cdba5b483c7433a22e9ff2b1c2588e7238b01678f9529e9a1f313cb
-EBUILD emacs-jabber-0.7-r1.ebuild 1151 RMD160 20132bd8dc44915da8a5712e19e8a4ce5070a14b SHA1 ec745dee2f47340cad4084be698d4b29c37a36d0 SHA256 b8ae5bdbbd96156c6b0242946fe072f5dc9022a0fe561769e6e5ae78beb7892c
-MD5 ef996b650b0a3b8d6fb5f702ab3c76b7 emacs-jabber-0.7-r1.ebuild 1151
-RMD160 20132bd8dc44915da8a5712e19e8a4ce5070a14b emacs-jabber-0.7-r1.ebuild 1151
-SHA256 b8ae5bdbbd96156c6b0242946fe072f5dc9022a0fe561769e6e5ae78beb7892c emacs-jabber-0.7-r1.ebuild 1151
-EBUILD emacs-jabber-0.7.ebuild 1089 RMD160 c228c58b962b8b1bb277d5f49c4defa1db458646 SHA1 8edeb945e3e1c981d882d20e13c208410ccfd06c SHA256 57f7212089b3c2fd43ef0b533a22d3f6d54031a9a9d4fb5e95aba6745e2cd2db
-MD5 81e505d0646ce0cfaaf576ea85d484f4 emacs-jabber-0.7.ebuild 1089
-RMD160 c228c58b962b8b1bb277d5f49c4defa1db458646 emacs-jabber-0.7.ebuild 1089
-SHA256 57f7212089b3c2fd43ef0b533a22d3f6d54031a9a9d4fb5e95aba6745e2cd2db emacs-jabber-0.7.ebuild 1089
-MISC ChangeLog 1007 RMD160 b9a92a1540e5277c9e1031c3ccbbe77555d7686e SHA1 2a80ec6715be03b10f64fffe0f31c88a05c164ac SHA256 5c078b828e59e41415b829910656ceb492fec38ca6032a16223a916ac857c060
-MD5 a5641e01c5615d775a9de4eabe64fef5 ChangeLog 1007
-RMD160 b9a92a1540e5277c9e1031c3ccbbe77555d7686e ChangeLog 1007
-SHA256 5c078b828e59e41415b829910656ceb492fec38ca6032a16223a916ac857c060 ChangeLog 1007
+EBUILD emacs-jabber-0.7-r1.ebuild 1128 RMD160 f434e407c63772e21aa4cd08ac49cd498f13748b SHA1 bf88954f4c7895f22a0481cb90a1226796b79b75 SHA256 b50c19dc637d17fa304082539059907178973391ba90250087545cee17784e03
+MD5 d37230024ff8571d1629484d7d7d4f08 emacs-jabber-0.7-r1.ebuild 1128
+RMD160 f434e407c63772e21aa4cd08ac49cd498f13748b emacs-jabber-0.7-r1.ebuild 1128
+SHA256 b50c19dc637d17fa304082539059907178973391ba90250087545cee17784e03 emacs-jabber-0.7-r1.ebuild 1128
+MISC ChangeLog 1147 RMD160 f13f7676b67c614de919ec9e3e2e4ec99e3334b5 SHA1 038da635bb15505e474acd015a2e6c162a426af1 SHA256 181c285cd63a7893a1795ffc77488bce4db99b4d4b079f84f033c23e7b20e56b
+MD5 0e49689d185718fdff163c323da4cbab ChangeLog 1147
+RMD160 f13f7676b67c614de919ec9e3e2e4ec99e3334b5 ChangeLog 1147
+SHA256 181c285cd63a7893a1795ffc77488bce4db99b4d4b079f84f033c23e7b20e56b ChangeLog 1147
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
-MD5 f282ac76733671e637d67964371cb2d1 files/digest-emacs-jabber-0.7 250
-RMD160 3c7c9e0c29d008f3d9bf076980a011cc31a7b946 files/digest-emacs-jabber-0.7 250
-SHA256 0706241726576016f5fd40e804bb64497e8a31babadef0e4904e94de3a82f7ff files/digest-emacs-jabber-0.7 250
 MD5 f282ac76733671e637d67964371cb2d1 files/digest-emacs-jabber-0.7-r1 250
 RMD160 3c7c9e0c29d008f3d9bf076980a011cc31a7b946 files/digest-emacs-jabber-0.7-r1 250
 SHA256 0706241726576016f5fd40e804bb64497e8a31babadef0e4904e94de3a82f7ff files/digest-emacs-jabber-0.7-r1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFF9oPQNQqtfCuFneMRAvY6AJ9EFz/a2RbbFw6zCpX8E4dvRMP9YACaA0CR
-DUFXZwIcHFfGodbiHLUKjLc=
-=7Ssx
+iD8DBQFGVGAfOeoy/oIi7uwRAnhGAKCMUQgwbYDARiixiWKvXN7lEk/RoQCgltjh
+Oyqro07G6YTf3ZQEqikjupA=
+=LpAp
 -----END PGP SIGNATURE-----
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