diff options
author | Ulrich Müller <ulm@gentoo.org> | 2007-08-22 22:13:52 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2007-08-22 22:13:52 +0000 |
commit | f881d4d8200c60889fbf21730a15740f36c13f2c (patch) | |
tree | b90c236f7caeea91b896197f3453f1797667de10 /app-emacs/emacs-jabber | |
parent | Stable on amd64 wrt security bug #189132 (diff) | |
download | gentoo-2-f881d4d8200c60889fbf21730a15740f36c13f2c.tar.gz gentoo-2-f881d4d8200c60889fbf21730a15740f36c13f2c.tar.bz2 gentoo-2-f881d4d8200c60889fbf21730a15740f36c13f2c.zip |
Partly undo change of 20 Jun 2007 to fix build with USE=-sasl, bug #187520.
(Portage version: 2.1.3.6)
Diffstat (limited to 'app-emacs/emacs-jabber')
-rw-r--r-- | app-emacs/emacs-jabber/ChangeLog | 5 | ||||
-rw-r--r-- | app-emacs/emacs-jabber/emacs-jabber-0.7.1.ebuild | 12 |
2 files changed, 13 insertions, 4 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/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" |