Partly undo change of 20 Jun 2007 to fix build with USE=-sasl, bug #187520.

Package-Manager: portage-2.1.3.6

3 files changed, 24 insertions, 15 deletions

diff --git a/app-emacs/emacs-jabber/ChangeLog b/app-emacs/emacs-jabber/ChangeLog
index 352467cc6c3b..0b8594e8c6ac 100644
--- a/app-emacs/emacs-jabber/ChangeLog
+++ b/app-emacs/emacs-jabber/ChangeLog
@@ -1,6 +1,9 @@
 # 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.12 2007/08/02 18:18:10 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/ChangeLog,v 1.13 2007/08/22 22:13:52 ulm Exp $
+
+  22 Aug 2007; Ulrich Mueller <ulm@gentoo.org> emacs-jabber-0.7.1.ebuild:
+  Partly undo change of 20 Jun 2007 to fix build with USE=-sasl, bug #187520.
 
   02 Aug 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 20dbe787fa67..a6e8ae4d7f3f 100644
--- a/app-emacs/emacs-jabber/Manifest
+++ b/app-emacs/emacs-jabber/Manifest
@@ -11,14 +11,14 @@ EBUILD emacs-jabber-0.7-r1.ebuild 1147 RMD160 82c20c72368764d360df4efec3e34eb493
 MD5 6747c7fa1b4dcf214af0ec0ec2e4548a emacs-jabber-0.7-r1.ebuild 1147
 RMD160 82c20c72368764d360df4efec3e34eb4934843d6 emacs-jabber-0.7-r1.ebuild 1147
 SHA256 a3c1978a7a02ab4c33b21f44e9786f0f7e079b86012a6d3e2600c11d0b5f96b5 emacs-jabber-0.7-r1.ebuild 1147
-EBUILD emacs-jabber-0.7.1.ebuild 1019 RMD160 b60a87bb76b1ad628ea0acbbfa7bfcc1b41c33b0 SHA1 c49a438615c28a1b7f710438e46c475887f1b15d SHA256 d8cee862257ef02c996c81a8dd66d17c3f2497a266135e7286fac321731d4ee9
-MD5 ab13ee6dcc900c3baf6f26413083d2d9 emacs-jabber-0.7.1.ebuild 1019
-RMD160 b60a87bb76b1ad628ea0acbbfa7bfcc1b41c33b0 emacs-jabber-0.7.1.ebuild 1019
-SHA256 d8cee862257ef02c996c81a8dd66d17c3f2497a266135e7286fac321731d4ee9 emacs-jabber-0.7.1.ebuild 1019
-MISC ChangeLog 2038 RMD160 0307d6d515e31e25598106db6c5ec6c8a1685ff4 SHA1 947572f7dfde8e52a986a2a2477f3d1dea4f2f56 SHA256 6384a6ca4c03faeb6bee39d2b47586a6dd6ff8d6c390f5a8701209a2550b23f0
-MD5 4b289f3eb7d47ce9975a84470bcb6d34 ChangeLog 2038
-RMD160 0307d6d515e31e25598106db6c5ec6c8a1685ff4 ChangeLog 2038
-SHA256 6384a6ca4c03faeb6bee39d2b47586a6dd6ff8d6c390f5a8701209a2550b23f0 ChangeLog 2038
+EBUILD emacs-jabber-0.7.1.ebuild 1116 RMD160 bb10c77d60bee060cc0db7daf0e509b660f651ce SHA1 49d3e291e2e26cd9db0abe5f81c4919ad6977b7c SHA256 99724f2df7d520dd1e503e164beb726f6edc976b89aeb3431ec5742170378815
+MD5 6c769619e8d4a80537609986f87c1285 emacs-jabber-0.7.1.ebuild 1116
+RMD160 bb10c77d60bee060cc0db7daf0e509b660f651ce emacs-jabber-0.7.1.ebuild 1116
+SHA256 99724f2df7d520dd1e503e164beb726f6edc976b89aeb3431ec5742170378815 emacs-jabber-0.7.1.ebuild 1116
+MISC ChangeLog 2189 RMD160 e6fb2315dcc1f741b59666bd29826704c1ce5a91 SHA1 5f7a5dc3dc14889c90fc040969aa0c0bdb24fe92 SHA256 5affb93a1769e6de5b2f9574ef34421c6ec6a8201121cbd0084a7c4c38781252
+MD5 03b2d11a6f350fc78b1f093576536700 ChangeLog 2189
+RMD160 e6fb2315dcc1f741b59666bd29826704c1ce5a91 ChangeLog 2189
+SHA256 5affb93a1769e6de5b2f9574ef34421c6ec6a8201121cbd0084a7c4c38781252 ChangeLog 2189
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -32,7 +32,7 @@ SHA256 43bdc00da0a152c941cdd517d5992b606c9fd741a946e1f5aa397616738f9438 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGsh/rNQqtfCuFneMRAqUQAJ9QKu9DAteb496xXuunn7k/zuF2vQCcDe+G
-yZOpWICMCiO0FIB5hwHFRM4=
-=DalA
+iD8DBQFGzLUqOeoy/oIi7uwRAi4EAKC2H4IbjF3UydKGHXIgmr2SGihOKACggeSh
+QlolA4Mm5JAbztorwuy164s=
+=yWSN
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-jabber/emacs-jabber-0.7.1.ebuild b/app-emacs/emacs-jabber/emacs-jabber-0.7.1.ebuild
index 712894dd789f..a1023e7be82b 100644
--- a/app-emacs/emacs-jabber/emacs-jabber-0.7.1.ebuild
+++ b/app-emacs/emacs-jabber/emacs-jabber-0.7.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/app-emacs/emacs-jabber/emacs-jabber-0.7.1.ebuild,v 1.5 2007/08/02 18:18:10 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-jabber/emacs-jabber-0.7.1.ebuild,v 1.6 2007/08/22 22:13:52 ulm Exp $
 
 inherit elisp
 
@@ -12,17 +12,23 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE=""
+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"
+DEPEND=">=virtual/gnus-5.10
+	sasl? ( app-emacs/flim )"
 RDEPEND="${DEPEND}"
 
 SITEFILE=70${PN}-gentoo.el
 
+src_unpack() {
+	unpack ${A}
+	use sasl || rm "${S}/jabber-sasl.el"
+}
+
 src_compile() {
 	elisp-comp *.el || die "elisp-comp failed"
 	makeinfo jabber.texi || die "makeinfo failed"