Added backport patches from wl-2_10. Removed old CVS snapshot.

6 files changed, 42 insertions, 18 deletions

diff --git a/app-emacs/lyskom-elisp-client/Manifest b/app-emacs/lyskom-elisp-client/Manifest
index 96da7c363cb5..44d44a17e06d 100644
--- a/app-emacs/lyskom-elisp-client/Manifest
+++ b/app-emacs/lyskom-elisp-client/Manifest
@@ -1,5 +1,5 @@
-MD5 9ec1fffb00b95ec19a8c03f9b47fe89c lyskom-elisp-client-0.47.1.ebuild 1084
+MD5 0f4714c8e6450bc0925383b2dc73b321 lyskom-elisp-client-0.47.1.ebuild 1075
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 5e5ecb9b4a1b1b0e2d3c1b9c43077638 ChangeLog 531
+MD5 d0ed65518b6163f689da374c22fb774b ChangeLog 634
 MD5 68506112aa782d22a6f1ba8751f5362c files/50lyskom-elisp-client-gentoo.el 120
 MD5 5b221d7303b611cdbc2796f5eab81800 files/digest-lyskom-elisp-client-0.47.1 82
diff --git a/app-emacs/wanderlust/ChangeLog b/app-emacs/wanderlust/ChangeLog
index 6b55994d5428..b041e8785904 100644
--- a/app-emacs/wanderlust/ChangeLog
+++ b/app-emacs/wanderlust/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/wanderlust
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/ChangeLog,v 1.17 2004/06/02 13:37:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/ChangeLog,v 1.18 2004/06/02 17:02:46 usata Exp $
+
+*wanderlust-2.10.1-r2 (03 Jun 2004)
+
+  03 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> wanderlust-2.10.1-r2.ebuild,
+  wanderlust-2.11.28_pre20040516.ebuild:
+  Added backport patches from wl-2_10. Removed old CVS snapshot.
 
   02 Jun 2004; Aron Griffis <agriffis@gentoo.org> wanderlust-2.10.1-r1.ebuild:
   Fix use invocation
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index d400d5a15cb1..990381b47190 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -1,11 +1,11 @@
-MD5 6c2f5faa55092d22920cd475d86a2200 wanderlust-2.10.1-r1.ebuild 1408
-MD5 7e7dca8a7f955a499a3f6b9eb078469f wanderlust-2.11.28_pre20040516.ebuild 1203
-MD5 0ad98c2bf7088df25abce47c6c6684fe wanderlust-2.8.1.ebuild 1266
-MD5 2d4d079d5651afa06dd360820aa28ed9 wanderlust-2.11.29_pre20040522.ebuild 1203
-MD5 eac13ae46089f036f1500bfceee0c901 ChangeLog 4977
+MD5 257d23aa5b3c94fee60087e52d464187 wanderlust-2.10.1-r1.ebuild 1409
+MD5 d3988e115c922a314ab4c4a513297c31 wanderlust-2.8.1.ebuild 1267
+MD5 0d7cef426baef31645b51e089fcabc9c ChangeLog 5197
 MD5 42cbdeef12abd31687396ae303321803 metadata.xml 271
+MD5 6550e25561af37389e8deee02605c288 wanderlust-2.11.29_pre20040522.ebuild 1204
+MD5 9154f98c44a05a2d44bf1b2a8204bb50 wanderlust-2.10.1-r2.ebuild 1500
 MD5 44642f0fb41a990b0451d247cfb33033 files/digest-wanderlust-2.8.1 61
 MD5 c633c96cff2fe04a6aec8ba3a96440d7 files/70wl-gentoo.el 298
-MD5 a1bfc4b7eef1308abd5c2506274255fe files/digest-wanderlust-2.11.28_pre20040516 72
 MD5 2cc71c29a99b30471c7dbecae5f49382 files/digest-wanderlust-2.10.1-r1 61
 MD5 b02cc0bdb428035c808c9894dc26fac7 files/digest-wanderlust-2.11.29_pre20040522 72
+MD5 a8f86382da45e4a1136e478ad781477e files/digest-wanderlust-2.10.1-r2 131
diff --git a/app-emacs/wanderlust/files/digest-wanderlust-2.10.1-r2 b/app-emacs/wanderlust/files/digest-wanderlust-2.10.1-r2
new file mode 100644
index 000000000000..072fdfd56599
--- /dev/null
+++ b/app-emacs/wanderlust/files/digest-wanderlust-2.10.1-r2
@@ -0,0 +1,2 @@
+MD5 80cb1a4e3c76025284bf7eaa23faf1d6 wl-2.10.1.tar.gz 967205
+MD5 4e7772205adc1d395b20be39cae00b91 wl-2.10.1-20040602.diff.gz 14744
diff --git a/app-emacs/wanderlust/files/digest-wanderlust-2.11.28_pre20040516 b/app-emacs/wanderlust/files/digest-wanderlust-2.11.28_pre20040516
deleted file mode 100644
index 056c4d7984a7..000000000000
--- a/app-emacs/wanderlust/files/digest-wanderlust-2.11.28_pre20040516
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fe377cf077e029abe34d325ea45406e5 wl-2.11.28-20040516.tar.gz 1051750
diff --git a/app-emacs/wanderlust/wanderlust-2.11.28_pre20040516.ebuild b/app-emacs/wanderlust/wanderlust-2.10.1-r2.ebuild
index d70fac249d63..5aaa90ddfdb2 100644
--- a/app-emacs/wanderlust/wanderlust-2.11.28_pre20040516.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.10.1-r2.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.11.28_pre20040516.ebuild,v 1.1 2004/05/17 17:20:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.10.1-r2.ebuild,v 1.1 2004/06/02 17:02:46 usata Exp $
 
-inherit elisp
+inherit elisp eutils
 
-MY_P="wl-${PV/_pre/-}"
+MY_P="${P/wanderlust/wl}"
 
 IUSE="ssl"
 
-DESCRIPTION="Wanderlust -- Yet Another Message Interface on Emacsen"
+DESCRIPTION="Wanderlust is a mail/news reader supporting IMAP4rev1 for emacsen"
 HOMEPAGE="http://www.gohome.org/wl/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.gohome.org/wl/stable/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}-20040602.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-# Please do not mark it stable since this is merely a CVS snapshot
 KEYWORDS="~x86 ~alpha ~sparc ~ppc"
 
 DEPEND="virtual/emacs
@@ -23,10 +23,17 @@ DEPEND="virtual/emacs
 	virtual/semi
 	!app-emacs/wanderlust-cvs"
 
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd ${S}
+	epatch ${DISTDIR}/${MY_P}-20040602.diff.gz
 
-src_compile() {
 	use ssl && echo "(setq wl-install-utils t)" >> WL-CFG
+}
+
+src_compile() {
 	make || die
 	make info || die
 }
@@ -49,3 +56,13 @@ src_install() {
 	doinfo doc/wl-ja.info doc/wl.info
 	dodoc BUGS* ChangeLog INSTALL* README*
 }
+
+pkg_postinst() {
+	elisp-site-regen
+	einfo "Please see /usr/share/doc/${P}/INSTALL.gz."
+	einfo "And Sample configuration files exist on /usr/share/wl/samples."
+}
+
+pkg_postrm() {
+	elisp-site-regen
+}