New snapshot, bug 447852. Update HOMEPAGE. Specify LICENSE more precisely. Remove intermediate version.

(Portage version: 2.1.11.47/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)

4 files changed, 33 insertions, 25 deletions

diff --git a/app-emacs/wanderlust/ChangeLog b/app-emacs/wanderlust/ChangeLog
index cb1cf2fac3e5..00f8010a8c51 100644
--- a/app-emacs/wanderlust/ChangeLog
+++ b/app-emacs/wanderlust/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/wanderlust
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/ChangeLog,v 1.88 2010/12/26 12:37:26 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/ChangeLog,v 1.89 2013/01/21 23:02:01 ulm Exp $
+
+*wanderlust-2.15.9_pre20120923 (21 Jan 2013)
+
+  21 Jan 2013; Ulrich Müller <ulm@gentoo.org> wanderlust-2.14.0-r6.ebuild,
+  -wanderlust-2.15.9_pre20100125.ebuild, wanderlust-2.15.9_pre20101102.ebuild,
+  +wanderlust-2.15.9_pre20120923.ebuild:
+  New snapshot, bug 447852. Update HOMEPAGE. Specify LICENSE more precisely.
+  Remove intermediate version.
 
 *wanderlust-2.15.9_pre20101102 (26 Dec 2010)
 
diff --git a/app-emacs/wanderlust/wanderlust-2.14.0-r6.ebuild b/app-emacs/wanderlust/wanderlust-2.14.0-r6.ebuild
index 0c3d627309cc..3a1ec400d0a3 100644
--- a/app-emacs/wanderlust/wanderlust-2.14.0-r6.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.14.0-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 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-r6.ebuild,v 1.6 2010/06/07 10:46:01 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.14.0-r6.ebuild,v 1.7 2013/01/21 23:02:01 ulm Exp $
 
 EAPI=3
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.gohome.org/wl/stable/${MY_P}.tar.gz
 	ftp://ftp.gohome.org/wl/beta/${MY_P}.tar.gz
 	mirror://gentoo/${P}-20050405.patch.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bbdb ssl linguas_ja"
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_pre20101102.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_pre20101102.ebuild
index 5b541882fc62..65baf0f2f317 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_pre20101102.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_pre20101102.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.9_pre20101102.ebuild,v 1.1 2010/12/26 12:37:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.9_pre20101102.ebuild,v 1.2 2013/01/21 23:02:01 ulm Exp $
 
 EAPI=3
 
@@ -10,7 +10,7 @@ DESCRIPTION="Yet Another Message Interface on Emacsen"
 HOMEPAGE="http://www.gohome.org/wl/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bbdb ssl linguas_ja"
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_pre20100125.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_pre20120923.ebuild
index 14c5cc0e33fd..d8738152fa57 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_pre20100125.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_pre20120923.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.9_pre20100125.ebuild,v 1.2 2010/05/14 14:53:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.15.9_pre20120923.ebuild,v 1.1 2013/01/21 23:02:01 ulm Exp $
 
-EAPI=3
+EAPI=5
 
 inherit elisp
 
 DESCRIPTION="Yet Another Message Interface on Emacsen"
-HOMEPAGE="http://www.gohome.org/wl/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+HOMEPAGE="https://github.com/wanderlust/wanderlust
+	http://emacswiki.org/emacs/WanderLust"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bbdb ssl linguas_ja"
 
-DEPEND=">=app-emacs/apel-10.6
+RDEPEND=">=app-emacs/apel-10.6
 	virtual/emacs-flim
 	app-emacs/semi
 	bbdb? ( app-emacs/bbdb )"
-RDEPEND="!app-emacs/wanderlust-cvs
-	${DEPEND}"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
 
 S="${WORKDIR}/${PN}"
-ELISP_PATCHES="${PN}-2.14.0-texinfo-garbage.patch"
 SITEFILE="50${PN}-gentoo.el"
 
 src_configure() {
@@ -34,26 +34,26 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
-	emake info || die "emake info failed"
+	emake
+	emake info
 }
 
 src_install() {
 	emake \
 		LISPDIR="${ED}${SITELISP}" \
 		PIXMAPDIR="${ED}${SITEETC}/wl/icons" \
-		install || die "emake install failed"
+		install
 
 	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
+	doins samples/en/*
+	doinfo doc/wl*.info
+	dodoc BUGS ChangeLog INSTALL NEWS README.md
 
 	if use linguas_ja; then
 		insinto "${SITEETC}/wl/samples/ja"
-		doins samples/ja/* || die
+		doins samples/ja/*
 		dodoc BUGS.ja INSTALL.ja NEWS.ja README.ja
 	fi
 }