New snapshot from CVS. Remove old.

Package-Manager: portage-2.2_rc49/cvs/Linux i686

6 files changed, 70 insertions, 114 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/Manifest b/app-emacs/wanderlust/Manifest
index c2e4e940c167..24617872c0a6 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -2,22 +2,19 @@
 Hash: SHA1
 
 AUX 50wanderlust-gentoo.el 244 RMD160 dbe0e9107a509f130fc0fdd588798713756a4334 SHA1 a91585b2fcf2074d25ccedf49681d1a970eefcef SHA256 de1718862e2b99d1c6e65daac84834a933bbafd6f64cbed129df0528ac76f811
-AUX 70wl-gentoo.el 289 RMD160 aaf12aa3cdc18af8ac45f29c65799a67e87a7823 SHA1 ce8b0deb0942bb7be9b3fd7d1acc23fee2c977b6 SHA256 631ceb6a81697b6fe2acae67314fd302e38184bdfb60e630e58db9217e50a7fb
 AUX wanderlust-2.14.0-smtp-end-of-line.patch 628 RMD160 817c5e00f69e85eb6d804e6f8093a5a05293243d SHA1 1ab494222bfd7ecb0c22fddbc13e2dda18c94650 SHA256 7d6315b46f4be4e8cf8c851e4d567319e1f05dc2cfc12f166dd4aa987dc36e52
 AUX wanderlust-2.14.0-texinfo-garbage.patch 473 RMD160 c8a71c235ef28ebe7f5b870ee86a396f4999f564 SHA1 8f92e725c51a5c1380b68a10635b70299529a8bc SHA256 916565859afd2b7588ddeddf4897c33c35d1cb4a09700c5633626f127290e036
-DIST wanderlust-2.15.5_pre20070921.tar.bz2 837135 RMD160 8319f90a1e048d774ff37ea90b715b9d82c38aae SHA1 19cb35d8cad5db5bbcaee0cc044292734ce6a735 SHA256 cdab85b90fc4436c746297d13bd6cadc7a8f277b08129d2e81975e90039aef3b
-DIST wanderlust-2.15.5_pre20071215.tar.bz2 869234 RMD160 49390b600a92ef04257d362591d27c8b917b63c8 SHA1 03f5700c333b6fb88dfc0a18f7fa81ccbf13903f SHA256 566f9a0ee683ab719edbd1589fc97e0eaa9a472e4d2fa44dfec15e1094f742fe
+DIST wanderlust-2.15.7_pre20090820.tar.bz2 876832 RMD160 be7c429ca0f9e7372322e44ff5a50366736bacbc SHA1 6fc20e9b930cb518ac37f6f7ec233975df29582f SHA256 40daee3a2822b312482d7962e15c0d0a8439ec5bc255b1bbbc2161d0766104fb
 DIST wl-2.14.0-20050405.diff 16123 RMD160 d88173f176ee8608f81369b6d4ac219cffe960f1 SHA1 5267739fcad7693ce24cdeda3461e19704b8a4d9 SHA256 09b1f4365756fd990f7c2d47e506ab5fa3186a423101380b2d26b617af2a213d
 DIST wl-2.14.0.tar.gz 1101505 RMD160 1a5aa025fc05cbcf2a7d390b1804cc1b22f5df2b SHA1 75b93013444cb27ca540462afbaefdce0e157b3f SHA256 883b61e7e9560aff35efcf7d0d48b0ddd7cde598895ffd111ff214072253eb1f
 EBUILD wanderlust-2.14.0-r5.ebuild 1730 RMD160 39ef26c7d1002fce016e358a78191b94cf433734 SHA1 39cbe000c0d940fa3b167c3a976073c3144f0f34 SHA256 b7adfca47a18aae2686232aef14afec587c9307791d271a3039403a0979d02ae
-EBUILD wanderlust-2.15.5_pre20070921.ebuild 1199 RMD160 2714bd0a823a81c079a2771fd4b116a4f7c77d15 SHA1 8750f063eb4c92e5af8bb79d5b6eea2e1c81a9bf SHA256 78214a30899ca9c9e5dfef4a31d085ede9cea1deed1f13c3dcd1225b77782ff3
-EBUILD wanderlust-2.15.5_pre20071215.ebuild 1199 RMD160 858f5cea991ff1fa389322802e0c939b88292a6f SHA1 a64cfbf43364b742a62904dd1f7dc5107a2b0392 SHA256 a4817eda4a934443a454b021cd2d7b207883b2d8a416a996d4dc773292e34704
-MISC ChangeLog 14221 RMD160 5e122052ad70c319c44cb65eece2780db6ca2c06 SHA1 ec0a38e5b3a92bb904f367b5feb13f86e94bdf62 SHA256 bd81409fc72ac4460cc7782fb466ac0a05dd1ca4c57bc399c2d8991b73c60b33
+EBUILD wanderlust-2.15.7_pre20090820.ebuild 1465 RMD160 e9d27143fba0816c70614f5b0a0150dbf70d7675 SHA1 20b413949d8e14f57e25b93c5f4856744e5282f3 SHA256 9ea0e0c26a12ddf21b987055084d44cc6a16f2ba6a5bf717d2fa84724aa97198
+MISC ChangeLog 14498 RMD160 afbf6fe4d8ed9a11361a703467909cc2a510308b SHA1 3b200e192139c87898a6647e822e59add71d1552 SHA256 31e197e802773a8024389e02654bb87c12094973ab99deeb8444184e26abe91c
 MISC metadata.xml 266 RMD160 b7787ae5ebcbe57fb7b33da75bc77ae52c7aec16 SHA1 edaea015d5d4ace9ae690007b2a79d546d460915 SHA256 68c0b94c1833cd75c01e7d674be112b432874d7a2e4176481fab6b4db81b1426
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkq/wdUACgkQOeoy/oIi7uxkAQCfXL8+nvR8qwjw2qdGQe7G1kEm
-Yg0AoJbgL2sAdTCME0IYBOySQP3x5dEm
-=HgzD
+iEYEARECAAYFAkr+yYkACgkQOeoy/oIi7uy/iQCgyTZoP3o1UgUPFMf1LWmOuBoO
+f/MAoMGnlnjRB8FZKkbUm7dxKDj9Metl
+=ERmz
 -----END PGP SIGNATURE-----
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
+}