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

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x89DEB219565C32BC

4 files changed, 32 insertions, 58 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/Manifest b/net-mail/mu/Manifest
index 4607e26ae104..7e2ca2a4ec44 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -3,17 +3,16 @@ Hash: SHA256
 
 AUX 70mu-gentoo.el 76 SHA256 1d72e79ffa158aabc6cc59e5dbd1adcec6450cf69ee373e13b80e462f05abe64 SHA512 61cc2bf611a0d1f2aa53b4624c52e1aa9672a81b4b8d7386aad1bf70b0b0db6ee19e011acc5a1a28b220d99eb3683140a2ff02dc3e01ea68f512ee05ec7bc23e WHIRLPOOL 2b1da9bff42a58e201a56acbbe4ba956afe556f95ca828de81dcdab535ea36cfecd2fe8f30d1be7e08e709494bd4ef1287dd4018714f0d783feebf808513b731
 DIST mu-0.9.6.tar.gz 586898 SHA256 4e2ea30baef52ed0a1aea28256a6091a2a2dca62d1d4e26046545f33c42db516 SHA512 569ee5bad6fd73a48e64750630e14be874dc29cf482de016add794cdb180561ed71cc9c5b1d53e0ea3acafadd164c978b94a85cd5a9a960a8da6328ce676550c WHIRLPOOL 0fd230d9640c06270b80d06bb9ceb49539d4c24af6a073651cec4ed11bf22bd006672e28bac760aa0d156d13c6f64f72803b1e1ac23e4ed46f21a437511d4e3d
-DIST mu-0.9.7.tar.gz 641536 SHA256 e264906850ab37029011617647c379d97266ebc011b69824a59e4517d2b1de92
-DIST mu-0.9.8.5.tar.gz 1166123 SHA256 41ac0f905487c00e3872d190be7ebb8f6d113318e36a73e344a6f4c266ed79a1 SHA512 618971ccc5d4dd854fcb68f7e04dcb50b56b286d06c743baec90e5f2cbb68e0cdf4469fb16c7074fa07548be8c07829a2d3739e2eab1ef999e7c1f1872679ea0 WHIRLPOOL 128571a025131e252c862ff31ebc1a5348bf4dbeef649a0501a524a5e44ab099f6b261fed6e37d7890eb89b5c0f52a1ffb471b82a7ba8b41b96eb802db0987a1
+DIST mu-0.9.9.tar.gz 1185624 SHA256 83f8e2814ba1a89a3153ab3dcd21105cc62e1386c176c5312ccb6bae0af02013 SHA512 1dc8608a77381d6ad0f26e3729f17a0c5bc2a90cbefa217159c8dc432c2bb9f7d495d08053852bf10451a3b5ac40e325ad44cb7d9f032f8337cd094b121da143 WHIRLPOOL de9406c0995bfe6592cb411eeb03b6681f79e15df0633857beb502bf2825b7974c79039298f5cf682be9e45d6237b463a5dcd3b5930ebb99456cbf0b1497890a
+DIST mu4e-manual-0.9.9.pdf 379708 SHA256 75c76d736d0e3df39f654e3343cd6b5d861946bc7f570237dcd677ef79c39455 SHA512 fb8f8e94694969fc9d616177ddbb78d17b103446b2859806578255eaa954368973ef3a4fa6d8b410c8143f0b8e7ff51374f9bd3de6292fc2fd4c5cc3479b6979 WHIRLPOOL ab0ca516486bd6bab29776d665991a1c2a9120c191066b6e564b620228f81bab97b6137d1972a61c8bf5b60131755ffe6f005c99ec1d95a60ce97d4f02e2a8f2
 EBUILD mu-0.9.6.ebuild 1150 SHA256 8f5d2bf748568577a8dcbeeffa327e260c2220fda3f006a7fe4b5e1b6a4b9899 SHA512 0779b249eecd332b3fd2afd305e246359e646d5c21875d20ee643db70feffb16c246fbbffe0ae9a578b5658cd3c1186ad2a2a21646aec6c2af0a674367e10df6 WHIRLPOOL a518b3aa4456649f846266d915c27eb7439d4e0bc3a3a2ce3c7f864c260801c67853c9435c95710465eafa1d7b653f01e543751bbcac8e44e40205f60c993b2d
-EBUILD mu-0.9.7.ebuild 995 SHA256 582005ce01e6fcc90704ed8adc9cc6cc92f6a6367efe2fe5f974f382e8902edd SHA512 693212efd0caaa877b7116ac712f851bc30fab6bfe600c77aa7ac23d0cbd48ba033cc91f51940757de82600499ce5a5326ec0d92907287371ab9c629b9da5b89 WHIRLPOOL d30fe0032fd845ff1dd465ff7d058862098cf75f5ff3d53eb90fc17bc52898ca97e1c8f4ff924923243767c608f97fa107af74313b035ceea6ca1e9135c4c3e4
-EBUILD mu-0.9.8.5.ebuild 1780 SHA256 e985e5df47ebab0c151f715d75ab4aa8600091ffa4ac9be51e0438298847fa1e SHA512 9e3e83a46ecafa94a8b24dc8a80e30628c66bec5577f0b8bee7c8a4bf342d1bfc546edb55fbc7478ab71d8f7a1f3c9c698c8736d5669e57fe6f4efde3377634e WHIRLPOOL 25a3f56966537e3190c9a3ba9dc95738848a898baa7265a12b382a52a0b64d95d7c9ac4ad8f7c09725f216e4dd693aadd7b970c6428dfd04c5ceab24c06e3ca7
-MISC ChangeLog 1945 SHA256 2d01e2e568bc6dbad47656477bd9728c825670b3f6f4e2611ea0763feed171ba SHA512 5a911ba0be8765e8574cadcb2d43d365b007f94afd6a1ef75f8c135ebf126f80f65802623f531ee027b993b805022a1d06212525ff370f6d02530a78a8336389 WHIRLPOOL a499b06b967169a9ceb9995400974d8f110ce67cf0798cb9a2d3e6638ca5222c3993948b53c31b07e5bbb0bffcff556d0c536be026de6dd4a380cf87aa8eadec
+EBUILD mu-0.9.9.ebuild 2047 SHA256 cca68981e46832da8a351afbdec927380b303844255303a1185dfc3ea8bf0b69 SHA512 1efb8bad544758e95fc47bb8d1559b7946c20fa0cda51951036086452931e74450cb7d9e2c7b744e92b489cc1727f385c9114e093e5bb4141f65138134e5f210 WHIRLPOOL 090ec28a53af859772c95f4fa9b8ca1bd6b7f1384cb9f36094b171f9375e18c24305b1bb3a1baa62a684d3d14a9b5cd058cb2aeca09201c0dd8e7db0c400bfd9
+MISC ChangeLog 2148 SHA256 1e9c500646386b594c0c8384b934a26740702ea31d35e30789cac6acb05de5f6 SHA512 1a68873acad1bdf73f40efeb7f6413e9f930d1cbe37c182d10a667d75926287a57ba2acf10abeb6f4283c34363f1f94b8698b38f19978720ef9b35a7cdd4dc80 WHIRLPOOL c7630f6ca30ff075a3641f1fd01a5dc46ac229d3bf5c7c99cdfdebb6fe31f05d8edb15f588973795399288c5cd4d339ae9cc8dc80075a51426b6353abf5da523
 MISC metadata.xml 734 SHA256 a710c82c7c577ad8e2f4001d5ff531267463fbcb0760524854bbf995e16858ed SHA512 8bf5ffd8d73af0d75814abe435daa68543d878fe4ace96d4812e24ea5c9d0ddbde2e6d49732d279df9536dcd9cbd3c0f138b3d9b35096ca9ef49701fb5741f62 WHIRLPOOL de5e93135676bf8ffa07a10e9da2977bc8e5294f3c128eea9b289cc4d341ac66a8365910c38f958b22d7c63acc6504fd4e830d5b153187a851aea945d100f463
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAVPXsACgkQid6yGVZcMrxkKAD9GEkbbFezizs2u9sBEmxmwW8B
-rHJ+xckntyOyDyPEKdQBALjxUw8GBujcu5gB3mQdj56K3hZg1EayMGRHt5ZwSkPy
-=MhPN
+iF4EAREIAAYFAlCUQ+4ACgkQid6yGVZcMrzz2QEA1uCWef234q6uELengzvGfWa0
+29XxczO0yntJDAys1CEBALtkjpYtWZOBcwjTI6puBGJ6CKi3WAFEcYbvVmTr9GRZ
+=4JfN
 -----END PGP SIGNATURE-----
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() {