Bump to 0.9.9, install pdf manual, fix gmime dep (439842), remove old

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0x89DEB219565C32BC)

3 files changed, 25 insertions, 50 deletions

diff --git a/net-mail/mu/ChangeLog b/net-mail/mu/ChangeLog
index 78400c43b8c3..7d28aef91380 100644
--- a/net-mail/mu/ChangeLog
+++ b/net-mail/mu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/mu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mu/ChangeLog,v 1.10 2012/07/29 13:41:09 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mu/ChangeLog,v 1.11 2012/11/02 22:06:36 tomka Exp $
+
+*mu-0.9.9 (02 Nov 2012)
+
+  02 Nov 2012; Thomas Kahle <tomka@gentoo.org> +mu-0.9.9.ebuild,
+  -mu-0.9.7.ebuild, -mu-0.9.8.5.ebuild:
+  Bump to 0.9.9, install pdf manual, fix gmime dep (439842), remove old
 
   29 Jul 2012; Thomas Kahle <tomka@gentoo.org> metadata.xml:
   metadata updated
diff --git a/net-mail/mu/mu-0.9.7.ebuild b/net-mail/mu/mu-0.9.7.ebuild
deleted file mode 100644
index 19c2ee1bdd6f..000000000000
--- a/net-mail/mu/mu-0.9.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mu/mu-0.9.7.ebuild,v 1.1 2011/11/21 12:18:55 eras Exp $
-
-EAPI=3
-
-inherit base
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
-SRC_URI="http://mu0.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gui"
-
-DEPEND=">=dev-libs/gmime-2.4:2.4
-	dev-libs/xapian
-	>=dev-libs/glib-2.22:2
-	gui? ( x11-libs/gtk+:2
-		net-libs/webkit-gtk:2 ) "
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local guiconf
-	if use gui; then
-		guiconf="--with-gui=gtk2"
-	else
-		guiconf="--with-gui=none"
-	fi
-
-	econf "${guiconf}"
-}
-
-src_install () {
-	base_src_install
-	# Installing the guis is not supported by upstream
-	if use gui; then
-		dobin toys/mug/mug || die
-		dobin toys/mug2/mug2 || die
-	fi
-	dodoc AUTHORS HACKING NEWS TODO README ChangeLog INSTALL
-}
diff --git a/net-mail/mu/mu-0.9.8.5.ebuild b/net-mail/mu/mu-0.9.9.ebuild
index 2f1f6bc1d545..2f070c325812 100644
--- a/net-mail/mu/mu-0.9.8.5.ebuild
+++ b/net-mail/mu/mu-0.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mu/mu-0.9.8.5.ebuild,v 1.1 2012/07/29 13:39:25 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mu/mu-0.9.9.ebuild,v 1.1 2012/11/02 22:06:36 tomka Exp $
 
 EAPI=4
 
@@ -8,17 +8,18 @@ inherit base elisp-common
 
 DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
 HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
-SRC_URI="http://mu0.googlecode.com/files/${P}.tar.gz"
+SRC_URI="http://mu0.googlecode.com/files/${P}.tar.gz
+		doc? ( http://mu0.googlecode.com/files/mu4e-manual-${PV}.pdf )"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="emacs gui"
+IUSE="doc emacs gui"
 
 # Without webkit-gtk there is no pdf-preview functionality, everthing
 # else works as of 0.9.8.5
 DEPEND="
-	>=dev-libs/gmime-2.4:2.4
+	dev-libs/gmime
 	dev-libs/xapian
 	dev-libs/glib:2
 	gui? (
@@ -29,6 +30,11 @@ RDEPEND="${DEPEND}"
 
 SITEFILE="70mu-gentoo.el"
 
+src_unpack() {
+	unpack ${P}.tar.gz
+	use doc && cp "${DISTDIR}"/mu4e-manual-${PV}.pdf "${S}" || die
+}
+
 src_configure() {
 	local guiconf
 	if use gui; then
@@ -40,6 +46,7 @@ src_configure() {
 	# Make a guile USE-flag as soon as >=guile-2 is avaiable
 	econf --disable-guile \
 		$(use_enable gui webkit) \
+		$(use_enable emacs mu4e) \
 		${guiconf}
 }
 
@@ -50,11 +57,17 @@ src_install () {
 		dobin toys/mug/mug || die
 	fi
 	dodoc AUTHORS HACKING NEWS TODO README ChangeLog INSTALL
+	if use doc; then
+		dodoc mu4e-manual-${PV}.pdf
+	fi
 	if use emacs; then
-		elisp-install ${PN} emacs/*.el emacs/*.elc
+		elisp-install ${PN} mu4e/*.el mu4e/*.elc
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
+}
 
+src_test () {
+	emake check
 }
 
 pkg_postinst() {