Change autoload for jabber-connect to fix void variable errors. Remove old.

Package-Manager: portage-2.1.4

5 files changed, 19 insertions, 69 deletions

diff --git a/app-emacs/emacs-jabber/ChangeLog b/app-emacs/emacs-jabber/ChangeLog
index 42b7ce5cb888..38b9338bc624 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.15 2007/10/15 22:04:37 opfer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/ChangeLog,v 1.16 2008/01/23 10:58:41 ulm Exp $
+
+  23 Jan 2008; Ulrich Mueller <ulm@gentoo.org>
+  files/70emacs-jabber-gentoo.el, -emacs-jabber-0.7-r1.ebuild:
+  Change autoload for jabber-connect to fix void variable errors. Remove old.
 
   15 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
   emacs-jabber-0.7.1.ebuild:
diff --git a/app-emacs/emacs-jabber/Manifest b/app-emacs/emacs-jabber/Manifest
index dcb2f7164c61..60b817d449a0 100644
--- a/app-emacs/emacs-jabber/Manifest
+++ b/app-emacs/emacs-jabber/Manifest
@@ -1,38 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 70emacs-jabber-gentoo.el 254 RMD160 618efc79a430df8544e6d511c98f84dc5fcec71b SHA1 119be986c0591bcbb1879aaa4ef752d394d3837e SHA256 a3e52d7fb64ea2d657a6a08c3ba2146b73cdac6a49f357866058ba16bf505dca
-MD5 06b02c20f5c806848c40df102b9df5ce files/70emacs-jabber-gentoo.el 254
-RMD160 618efc79a430df8544e6d511c98f84dc5fcec71b files/70emacs-jabber-gentoo.el 254
-SHA256 a3e52d7fb64ea2d657a6a08c3ba2146b73cdac6a49f357866058ba16bf505dca files/70emacs-jabber-gentoo.el 254
+AUX 70emacs-jabber-gentoo.el 249 RMD160 099c3e0b5887226cf2765cfac9cc913596b1bf4a SHA1 8436f691767e422b9b1b58bf679e7bbeeac26fce SHA256 3e0067852f1c57fb3a26cc424bb924384e91076776e0b6606c32f7714ba610ae
+MD5 c58492478a36710771c0f12acfed4115 files/70emacs-jabber-gentoo.el 249
+RMD160 099c3e0b5887226cf2765cfac9cc913596b1bf4a files/70emacs-jabber-gentoo.el 249
+SHA256 3e0067852f1c57fb3a26cc424bb924384e91076776e0b6606c32f7714ba610ae files/70emacs-jabber-gentoo.el 249
 DIST emacs-jabber-0.7.1.tar.gz 205903 RMD160 b94a6ab7581080846e0871f53e448c63277dab25 SHA1 0cf4524135678a8a504f06c2e5219a9359bdb370 SHA256 e0f4595efc0a3fa03f6eb3222d868a6c65affbbeffce554030454d1aba7e6295
-DIST emacs-jabber-0.7.tar.gz 107598 RMD160 834ded191130ec7023abfd66e8d73788d12dc484 SHA1 1b496820ad357ff45070cf4cebc7e61f8f8155f6 SHA256 ab1052173cdba5b483c7433a22e9ff2b1c2588e7238b01678f9529e9a1f313cb
-EBUILD emacs-jabber-0.7-r1.ebuild 1147 RMD160 fc4374ba5c96929c772e726d9153feb56f30991f SHA1 95f663964bbdb08f4cda37443bfc302e5b6fd8f4 SHA256 8cd4626188c8877f3e5797e299c10787d7199757b9f4aa491fe34d8cfeb3f0a0
-MD5 90affc6a295463cbfcb379679af1dbc2 emacs-jabber-0.7-r1.ebuild 1147
-RMD160 fc4374ba5c96929c772e726d9153feb56f30991f emacs-jabber-0.7-r1.ebuild 1147
-SHA256 8cd4626188c8877f3e5797e299c10787d7199757b9f4aa491fe34d8cfeb3f0a0 emacs-jabber-0.7-r1.ebuild 1147
 EBUILD emacs-jabber-0.7.1.ebuild 1115 RMD160 a588eeb3433aeabad20ea454fec80d44cc4267d9 SHA1 25848805f86a840ed924e2d042b51ee1b471951e SHA256 1c9193d37fc7ab5f3f9d59dad41495507658f9ca1450e3b36a97851cf0167761
 MD5 d92276dbdb4c4c0e41d462fa3764058b emacs-jabber-0.7.1.ebuild 1115
 RMD160 a588eeb3433aeabad20ea454fec80d44cc4267d9 emacs-jabber-0.7.1.ebuild 1115
 SHA256 1c9193d37fc7ab5f3f9d59dad41495507658f9ca1450e3b36a97851cf0167761 emacs-jabber-0.7.1.ebuild 1115
-MISC ChangeLog 2440 RMD160 9de9a4c359bfadc2a52020885aa208f31ef0b230 SHA1 c49e8baecea244afc8a3aae183edf8266a9ddb40 SHA256 39491eedb8507ae6cf5ace4bb570c9dc3f74f70019c20de82ebed75202c8734b
-MD5 fd4d98ccd1fdb1d5aae9cb57f2d01fc1 ChangeLog 2440
-RMD160 9de9a4c359bfadc2a52020885aa208f31ef0b230 ChangeLog 2440
-SHA256 39491eedb8507ae6cf5ace4bb570c9dc3f74f70019c20de82ebed75202c8734b ChangeLog 2440
+MISC ChangeLog 2627 RMD160 48030c103490c5573805d26a23471df7bdb7394a SHA1 0dcbe8f673a53dce46d17121b0ddf6f3a9e7272b SHA256 d6a8a6cc74ae6a6a70f8b3db1520ae863cc4d1e147edcab15eccc9ba977dd608
+MD5 b284d280c1a7b4e45a88b18728f39447 ChangeLog 2627
+RMD160 48030c103490c5573805d26a23471df7bdb7394a ChangeLog 2627
+SHA256 d6a8a6cc74ae6a6a70f8b3db1520ae863cc4d1e147edcab15eccc9ba977dd608 ChangeLog 2627
 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-r1 250
-RMD160 3c7c9e0c29d008f3d9bf076980a011cc31a7b946 files/digest-emacs-jabber-0.7-r1 250
-SHA256 0706241726576016f5fd40e804bb64497e8a31babadef0e4904e94de3a82f7ff files/digest-emacs-jabber-0.7-r1 250
 MD5 d4cea205e982799b74a9bac74ec53e6c files/digest-emacs-jabber-0.7.1 256
 RMD160 ceb26fd1c411b5922604a347e1c2bd0e2fe45679 files/digest-emacs-jabber-0.7.1 256
 SHA256 43bdc00da0a152c941cdd517d5992b606c9fd741a946e1f5aa397616738f9438 files/digest-emacs-jabber-0.7.1 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v1.4.8 (GNU/Linux)
 
-iD8DBQFHE+P6NQqtfCuFneMRAmZlAJkB8owKcjIcW2V3ywgR2qrLTj1bdwCaApqc
-URHq1CSB3ZLG2iQREs/rNI8=
-=zctC
+iEYEARECAAYFAkeXHgIACgkQOeoy/oIi7uxjqQCgvmlMkFujOY4sNF1Lp/6dMLtM
+cMMAn10Xi/VXzRAAq7cQk31AIulYCLNM
+=QUix
 -----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
deleted file mode 100644
index 6c759812a60e..000000000000
--- a/app-emacs/emacs-jabber/emacs-jabber-0.7-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.5 2007/10/08 15:07:05 opfer Exp $
-
-inherit elisp
-
-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=">=virtual/gnus-5.10
-	sasl? ( virtual/flim )"
-RDEPEND="${DEPEND}"
-
-SITEFILE=70${PN}-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	rm "${S}"/{sha1,hex-util}.el
-	use sasl || rm "${S}/jabber-sasl.el"
-}
-src_compile() {
-	elisp-comp *.el || die "elisp-comp failed"
-	makeinfo jabber.texi || die "makeinfo failed"
-}
-
-src_install() {
-	elisp-install ${PN} *.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	doinfo jabber.info
-	dohtml html/*
-	dodoc AUTHORS NEWS README || die "dodoc failed"
-}
diff --git a/app-emacs/emacs-jabber/files/70emacs-jabber-gentoo.el b/app-emacs/emacs-jabber/files/70emacs-jabber-gentoo.el
index 20a836a6752c..6039a13c8a70 100644
--- a/app-emacs/emacs-jabber/files/70emacs-jabber-gentoo.el
+++ b/app-emacs/emacs-jabber/files/70emacs-jabber-gentoo.el
@@ -3,5 +3,5 @@
 
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'jabber-customize "jabber" "customize jabber options" t)
-(autoload 'jabber-connect "jabber-core"
+(autoload 'jabber-connect "jabber"
   "connect to the jabber server and start a jabber xml stream" t)
diff --git a/app-emacs/emacs-jabber/files/digest-emacs-jabber-0.7-r1 b/app-emacs/emacs-jabber/files/digest-emacs-jabber-0.7-r1
deleted file mode 100644
index aae4d986bfb9..000000000000
--- a/app-emacs/emacs-jabber/files/digest-emacs-jabber-0.7-r1
+++ /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