Stable on x86. Fixed incorrect load-path in 70wl-gentoo.el; bug #106559.

(Portage version: 2.0.52-r1)

5 files changed, 8 insertions, 55 deletions

diff --git a/app-emacs/wanderlust/ChangeLog b/app-emacs/wanderlust/ChangeLog
index 6c8efec3492a..e671ef69b770 100644
--- a/app-emacs/wanderlust/ChangeLog
+++ b/app-emacs/wanderlust/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/wanderlust
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/ChangeLog,v 1.41 2005/08/28 02:19:46 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/ChangeLog,v 1.42 2005/09/29 08:08:30 usata Exp $
+
+  29 Sep 2005; Mamoru KOMACHI <usata@gentoo.org> files/70wl-gentoo.el,
+  -wanderlust-2.14.0.ebuild, wanderlust-2.14.0-r1.ebuild:
+  Stable on x86. Fixed incorrect load-path in 70wl-gentoo.el; bug #106559.
 
   28 Aug 2005; Olivier Crête <tester@gentoo.org>
   wanderlust-2.14.0-r1.ebuild:
diff --git a/app-emacs/wanderlust/files/70wl-gentoo.el b/app-emacs/wanderlust/files/70wl-gentoo.el
index 8aa46ec18901..84a81673a501 100644
--- a/app-emacs/wanderlust/files/70wl-gentoo.el
+++ b/app-emacs/wanderlust/files/70wl-gentoo.el
@@ -1,7 +1,7 @@
 
 ;;; Wanderlust site-lisp configuration
 
-(setq load-path (cons "@SITELISP@" load-path))
+(setq load-path (cons "/usr/share/emacs/site-lisp/wl" load-path))
 
 (autoload 'wl "wl" "Wanderlust" t)
 (autoload 'wl-other-frame "wl" "Wanderlust on new frame." t)
diff --git a/app-emacs/wanderlust/files/digest-wanderlust-2.14.0 b/app-emacs/wanderlust/files/digest-wanderlust-2.14.0
deleted file mode 100644
index fe804ec5bbbd..000000000000
--- a/app-emacs/wanderlust/files/digest-wanderlust-2.14.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 60b94c9796ee40b6585ef19a509c90df wl-2.14.0.tar.gz 1101505
diff --git a/app-emacs/wanderlust/wanderlust-2.14.0-r1.ebuild b/app-emacs/wanderlust/wanderlust-2.14.0-r1.ebuild
index 0ebf6b9dce94..75f69cd5b49f 100644
--- a/app-emacs/wanderlust/wanderlust-2.14.0-r1.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.14.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.14.0-r1.ebuild,v 1.2 2005/08/28 02:19:46 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.14.0-r1.ebuild,v 1.3 2005/09/29 08:08:30 usata Exp $
 
 inherit elisp eutils
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.gohome.org/wl/stable/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~sparc x86"
 
 DEPEND=">=app-emacs/apel-10.6
 	virtual/flim
diff --git a/app-emacs/wanderlust/wanderlust-2.14.0.ebuild b/app-emacs/wanderlust/wanderlust-2.14.0.ebuild
deleted file mode 100644
index 057bfa2cfc7c..000000000000
--- a/app-emacs/wanderlust/wanderlust-2.14.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.14.0.ebuild,v 1.1 2005/03/27 05:31:56 usata Exp $
-
-inherit elisp
-
-MY_P="wl-${PV/_/}"
-
-IUSE="ssl"
-
-DESCRIPTION="Wanderlust -- Yet Another Message Interface on Emacsen"
-HOMEPAGE="http://www.gohome.org/wl/"
-SRC_URI="ftp://ftp.gohome.org/wl/stable/${MY_P}.tar.gz
-	ftp://ftp.gohome.org/wl/beta/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~sparc ~ppc ~ppc-macos"
-
-DEPEND=">=app-emacs/apel-10.6
-	virtual/flim
-	virtual/semi
-	!app-emacs/wanderlust-cvs"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	use ssl && echo "(setq wl-install-utils t)" >> WL-CFG
-	make || die
-	make info || die
-}
-
-src_install() {
-	make \
-		LISPDIR=${D}/usr/share/emacs/site-lisp \
-		PIXMAPDIR=${D}/usr/share/wl/icons \
-		install || die
-
-	elisp-site-file-install ${FILESDIR}/70wl-gentoo.el || die
-
-	dodir /usr/share/wl/samples
-
-	insinto /usr/share/wl/samples/ja
-	doins samples/ja/*
-	insinto /usr/share/wl/samples/en
-	doins samples/en/*
-
-	doinfo doc/wl-ja.info doc/wl.info
-	dodoc BUGS* ChangeLog INSTALL* README*
-}