New snapshot from CVS. Remove old.

(Portage version: 2.2_rc49/cvs/Linux i686)

5 files changed, 64 insertions, 105 deletions

diff --git a/app-emacs/wanderlust/ChangeLog b/app-emacs/wanderlust/ChangeLog
index 4b35243c1c67..677bc858e081 100644
--- a/app-emacs/wanderlust/ChangeLog
+++ b/app-emacs/wanderlust/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/wanderlust
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/ChangeLog,v 1.79 2009/09/27 19:47:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/ChangeLog,v 1.80 2009/11/14 15:12:51 ulm Exp $
+
+*wanderlust-2.15.7_pre20090820 (14 Nov 2009)
+
+  14 Nov 2009; Ulrich Mueller <ulm@gentoo.org> -files/70wl-gentoo.el,
+  -wanderlust-2.15.5_pre20070921.ebuild,
+  -wanderlust-2.15.5_pre20071215.ebuild,
+  +wanderlust-2.15.7_pre20090820.ebuild:
+  New snapshot from CVS. Remove old.
 
   27 Sep 2009; Ulrich Mueller <ulm@gentoo.org> -wanderlust-2.14.0-r3.ebuild:
   Remove old.
diff --git a/app-emacs/wanderlust/files/70wl-gentoo.el b/app-emacs/wanderlust/files/70wl-gentoo.el
deleted file mode 100644
index 4b7aca4c7da3..000000000000
--- a/app-emacs/wanderlust/files/70wl-gentoo.el
+++ /dev/null
@@ -1,10 +0,0 @@
-
-;;; wanderlust site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'wl "wl" "Wanderlust" t)
-(autoload 'wl-other-frame "wl" "Wanderlust on new frame." t)
-(autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
-
-(setq wl-icon-directory "/usr/share/wl/icons")
diff --git a/app-emacs/wanderlust/wanderlust-2.15.5_pre20070921.ebuild b/app-emacs/wanderlust/wanderlust-2.15.5_pre20070921.ebuild
deleted file mode 100644
index a954ea655d6d..000000000000
--- a/app-emacs/wanderlust/wanderlust-2.15.5_pre20070921.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.5_pre20070921.ebuild,v 1.3 2009/05/05 17:21:00 ulm Exp $
-
-inherit elisp
-
-DESCRIPTION="Yet Another Message Interface on Emacsen"
-HOMEPAGE="http://www.gohome.org/wl/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="bbdb ssl"
-
-DEPEND=">=app-emacs/apel-10.6
-	virtual/flim
-	app-emacs/semi
-	bbdb? ( app-emacs/bbdb )"
-RDEPEND="!app-emacs/wanderlust-cvs
-	${DEPEND}"
-
-SITEFILE="70wl-gentoo.el"
-
-src_compile() {
-	use ssl && echo "(setq wl-install-utils t)" >> WL-CFG
-	emake || die "emake failed"
-	emake info || die "emake info failed"
-}
-
-src_install() {
-	emake \
-		LISPDIR="${D}${SITELISP}" \
-		PIXMAPDIR="${D}/usr/share/wl/icons" \
-		install || die "emake install failed"
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" wl \
-		|| die "elisp-site-file-install failed"
-
-	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* NEWS* README*
-}
diff --git a/app-emacs/wanderlust/wanderlust-2.15.5_pre20071215.ebuild b/app-emacs/wanderlust/wanderlust-2.15.5_pre20071215.ebuild
deleted file mode 100644
index 14a81feacd93..000000000000
--- a/app-emacs/wanderlust/wanderlust-2.15.5_pre20071215.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.5_pre20071215.ebuild,v 1.3 2009/05/05 17:21:00 ulm Exp $
-
-inherit elisp
-
-DESCRIPTION="Yet Another Message Interface on Emacsen"
-HOMEPAGE="http://www.gohome.org/wl/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="bbdb ssl"
-
-DEPEND=">=app-emacs/apel-10.6
-	virtual/flim
-	app-emacs/semi
-	bbdb? ( app-emacs/bbdb )"
-RDEPEND="!app-emacs/wanderlust-cvs
-	${DEPEND}"
-
-SITEFILE="70wl-gentoo.el"
-
-src_compile() {
-	use ssl && echo "(setq wl-install-utils t)" >> WL-CFG
-	emake || die "emake failed"
-	emake info || die "emake info failed"
-}
-
-src_install() {
-	emake \
-		LISPDIR="${D}${SITELISP}" \
-		PIXMAPDIR="${D}/usr/share/wl/icons" \
-		install || die "emake install failed"
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" wl \
-		|| die "elisp-site-file-install failed"
-
-	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* NEWS* README*
-}
diff --git a/app-emacs/wanderlust/wanderlust-2.15.7_pre20090820.ebuild b/app-emacs/wanderlust/wanderlust-2.15.7_pre20090820.ebuild
new file mode 100644
index 000000000000..a0711bbd94d6
--- /dev/null
+++ b/app-emacs/wanderlust/wanderlust-2.15.7_pre20090820.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.7_pre20090820.ebuild,v 1.1 2009/11/14 15:12:51 ulm Exp $
+
+inherit elisp
+
+DESCRIPTION="Yet Another Message Interface on Emacsen"
+HOMEPAGE="http://www.gohome.org/wl/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="bbdb ssl linguas_ja"
+
+DEPEND=">=app-emacs/apel-10.6
+	virtual/flim
+	app-emacs/semi
+	bbdb? ( app-emacs/bbdb )"
+RDEPEND="!app-emacs/wanderlust-cvs
+	${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+ELISP_PATCHES="${PN}-2.14.0-texinfo-garbage.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	local lang="\"en\""
+	use linguas_ja && lang="${lang} \"ja\""
+	echo "(setq wl-info-lang '(${lang}) wl-news-lang '(${lang}))" >>WL-CFG
+	use ssl && echo "(setq wl-install-utils t)" >>WL-CFG
+
+	emake || die "emake failed"
+	emake info || die "emake info failed"
+}
+
+src_install() {
+	emake \
+		LISPDIR="${D}${SITELISP}" \
+		PIXMAPDIR="${D}${SITEETC}/wl/icons" \
+		install || die "emake install failed"
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" wl || die
+
+	insinto "${SITEETC}/wl/samples/en"
+	doins samples/en/* || die
+	doinfo doc/wl*.info || die
+	dodoc BUGS ChangeLog INSTALL NEWS README
+
+	if use linguas_ja; then
+		insinto "${SITEETC}/wl/samples/ja"
+		doins samples/ja/* || die
+		dodoc BUGS.ja INSTALL.ja NEWS.ja README.ja
+	fi
+}