Version bump; should fix bug #179300. Removed old version.

Package-Manager: portage-2.1.3_rc4

6 files changed, 70 insertions, 60 deletions

diff --git a/net-mail/mairix/ChangeLog b/net-mail/mairix/ChangeLog
index 2a2604879f73..c28d773f1d51 100644
--- a/net-mail/mairix/ChangeLog
+++ b/net-mail/mairix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/mairix
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mairix/ChangeLog,v 1.25 2007/04/01 20:58:55 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mairix/ChangeLog,v 1.26 2007/06/26 05:31:49 tove Exp $
+
+*mairix-0.21 (26 Jun 2007)
+
+  26 Jun 2007; Torsten Veller <tove@gentoo.org> -mairix-0.17.1.ebuild,
+  +mairix-0.21.ebuild:
+  Version bump; should fix bug #179300. Removed old version.
 
 *mairix-0.20 (01 Apr 2007)
 
diff --git a/net-mail/mairix/Manifest b/net-mail/mairix/Manifest
index 7072edab52d8..953fc36f0029 100644
--- a/net-mail/mairix/Manifest
+++ b/net-mail/mairix/Manifest
@@ -1,13 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST mairix-0.17.1.tar.gz 129235 RMD160 f1a9fc5c93a4d9818d4b6c033f23b1b1edc9f264 SHA1 2468053d1f554acfe3e5e57341de021cef3860dc SHA256 5b7d5ccd5778bc1f7da6a870aefd91f07ab11b50d883eaee56a6e1f40ef52b5e
 DIST mairix-0.19.tar.gz 152430 RMD160 4713fc0e1d427ad2a450566530804742c96d71d1 SHA1 6fd7e92ff8701a30159a23c64cca1d96658a0944 SHA256 fc6f36c5c64e06a7d866a62abc79ddce2911d4909dbdf4ac735a795b74b36e2b
 DIST mairix-0.20.tar.gz 158336 RMD160 d5547f4b05da5e06df21293a032c2ec5ba5238ad SHA1 7e7b64d76a4804d9e4ab59157e55bf9ae892f25e SHA256 e692af17c0ebdc8d610721407c3eabc53d0ef1ffdaf32ce53d4e91d2f49d7d1d
-EBUILD mairix-0.17.1.ebuild 1012 RMD160 67e2a2d2c17e9fc062544246a8d3c9e82169f439 SHA1 12a144896cd9423f97ba6ab759e1fe46bed946a4 SHA256 2a97909e631c7f5dc7a71bea2e96c8a036c3f15af25ad8c8c4dc97eb2a0db6b0
-MD5 0b719c85cd348f3afd32ba7d0d03b416 mairix-0.17.1.ebuild 1012
-RMD160 67e2a2d2c17e9fc062544246a8d3c9e82169f439 mairix-0.17.1.ebuild 1012
-SHA256 2a97909e631c7f5dc7a71bea2e96c8a036c3f15af25ad8c8c4dc97eb2a0db6b0 mairix-0.17.1.ebuild 1012
+DIST mairix-0.21.tar.gz 159089 RMD160 68e9d0cf509c8524aa9e2f519b4385fd198f996a SHA1 a5f4767462d3f86950acaa0dafd132de0e0d0c43 SHA256 e1d28459531ce30ce8dd41215cb0e6351ea81767cf4bbf1e8dbd22618f4de1d7
 EBUILD mairix-0.19.ebuild 1158 RMD160 37bf132f3b3befce19a9fbe3111e95d0d27c0100 SHA1 9f61240b0df62e1b8d7c03d3fbe386a1a35eb1ef SHA256 e1753e005a84890fb7f350a6cb47746c44a7516a284e3b4003b1dae3092ac1db
 MD5 d89363d4e50a87e7122a4a51b7cb31c9 mairix-0.19.ebuild 1158
 RMD160 37bf132f3b3befce19a9fbe3111e95d0d27c0100 mairix-0.19.ebuild 1158
@@ -16,27 +12,31 @@ EBUILD mairix-0.20.ebuild 1148 RMD160 20e2e2740493db1096777d23e3a7d7a6a0e98bb3 S
 MD5 e8134ef0d476213b1a306fd35e195852 mairix-0.20.ebuild 1148
 RMD160 20e2e2740493db1096777d23e3a7d7a6a0e98bb3 mairix-0.20.ebuild 1148
 SHA256 cbb52c73211c413d239a76b99ab193a1af62f25be8c52ced84ca1478961d5749 mairix-0.20.ebuild 1148
-MISC ChangeLog 3032 RMD160 627b56836bfa1f0e5b1a635a1cea1177103cda36 SHA1 fa2b00e90565c4faf78e4e54268eb5ff27851bd0 SHA256 cc91198030c6c3ee96e0421892dcfcae9abc6bb00e89c80ce7598ebb0fe52b3b
-MD5 3c7c5bf0d0e047a22ede2e71da31a3dd ChangeLog 3032
-RMD160 627b56836bfa1f0e5b1a635a1cea1177103cda36 ChangeLog 3032
-SHA256 cc91198030c6c3ee96e0421892dcfcae9abc6bb00e89c80ce7598ebb0fe52b3b ChangeLog 3032
+EBUILD mairix-0.21.ebuild 1147 RMD160 7054a8b553378457ccf5479fe342bd1071ccfeb5 SHA1 3bf3c85aed5cc12345009926a44c5214697c54cb SHA256 9edc6b0e2dbb7efa395a9b3f341c4938ea2c4400d7c5a7ea67974babad334637
+MD5 2791166e00c55dc507276606acef4456 mairix-0.21.ebuild 1147
+RMD160 7054a8b553378457ccf5479fe342bd1071ccfeb5 mairix-0.21.ebuild 1147
+SHA256 9edc6b0e2dbb7efa395a9b3f341c4938ea2c4400d7c5a7ea67974babad334637 mairix-0.21.ebuild 1147
+MISC ChangeLog 3215 RMD160 33e2c6cae97d526afa0b80c45c70090afba57beb SHA1 7c3167ada32db4e1fd663b0265f31d2436125d68 SHA256 e87244dce4dd45caf901f9dd9fb131efea516e055ab0d14997f1e8b2ad031e48
+MD5 f69308b1f958ca1beaf9dd7434fddca7 ChangeLog 3215
+RMD160 33e2c6cae97d526afa0b80c45c70090afba57beb ChangeLog 3215
+SHA256 e87244dce4dd45caf901f9dd9fb131efea516e055ab0d14997f1e8b2ad031e48 ChangeLog 3215
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 b2389a606c11a4ee4c79c2767fdff411 files/digest-mairix-0.17.1 241
-RMD160 6a015539658147155db23dc1349cf5e95bc0b570 files/digest-mairix-0.17.1 241
-SHA256 93b13e390a9ebd3c86190568ee01cdb2c00922900a2781c656a94b6c96305e62 files/digest-mairix-0.17.1 241
 MD5 85d1ae39ef23b80c8bb5c3319f1b67b6 files/digest-mairix-0.19 235
 RMD160 75b76fdd3575b32a8896a691277c90055b470128 files/digest-mairix-0.19 235
 SHA256 df589d33bc579c15071e4893909ddcdaac8043bb789fbfdf1edd1ee477fe8ff4 files/digest-mairix-0.19 235
 MD5 8e831ef4d2e7e96bc0175704360ef924 files/digest-mairix-0.20 235
 RMD160 1c4f1593042c1d90106808390282bfc3ea370e5a files/digest-mairix-0.20 235
 SHA256 1b5e52c2c5fef2ce276ad66dc86a9570eb72f2d47cabc7c278981122f27507ec files/digest-mairix-0.20 235
+MD5 19af0d3845f909edb6d2af7b28609f79 files/digest-mairix-0.21 235
+RMD160 b1d53cdea471eeb6de2cb5d054f51e7a72d546ff files/digest-mairix-0.21 235
+SHA256 fcbec4041f2b5c1400f5ca3baad9a9bac09e3f71938a62dc35ecbc7afc69a19e files/digest-mairix-0.21 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD4DBQFGfuuQp/wUKkr7RBoRAoG9AJ9AtcntMdXDBQxGS+XqhL40sY/E0ACXTgAd
-wHnUI7KyM0Qgeqq6eTYw0w==
-=lG9F
+iD8DBQFGgKTmV3J2n04EauwRAgElAJ4+hTae9VWyVKaFEVDvR0Axmek80ACdFoYG
+4xLuSVYhuhbTYAMJPao4I4o=
+=TueX
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mairix/files/digest-mairix-0.17.1 b/net-mail/mairix/files/digest-mairix-0.17.1
deleted file mode 100644
index 0ccde23bf9fd..000000000000
--- a/net-mail/mairix/files/digest-mairix-0.17.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5ff48b3cc82daf1dcace3f9f79c8e852 mairix-0.17.1.tar.gz 129235
-RMD160 f1a9fc5c93a4d9818d4b6c033f23b1b1edc9f264 mairix-0.17.1.tar.gz 129235
-SHA256 5b7d5ccd5778bc1f7da6a870aefd91f07ab11b50d883eaee56a6e1f40ef52b5e mairix-0.17.1.tar.gz 129235
diff --git a/net-mail/mairix/files/digest-mairix-0.21 b/net-mail/mairix/files/digest-mairix-0.21
new file mode 100644
index 000000000000..88b854e32af6
--- /dev/null
+++ b/net-mail/mairix/files/digest-mairix-0.21
@@ -0,0 +1,3 @@
+MD5 821619895931711c370f51f3442a0ded mairix-0.21.tar.gz 159089
+RMD160 68e9d0cf509c8524aa9e2f519b4385fd198f996a mairix-0.21.tar.gz 159089
+SHA256 e1d28459531ce30ce8dd41215cb0e6351ea81767cf4bbf1e8dbd22618f4de1d7 mairix-0.21.tar.gz 159089
diff --git a/net-mail/mairix/mairix-0.17.1.ebuild b/net-mail/mairix/mairix-0.17.1.ebuild
deleted file mode 100644
index 594e129c4ee4..000000000000
--- a/net-mail/mairix/mairix-0.17.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mairix/mairix-0.17.1.ebuild,v 1.3 2006/02/12 11:55:29 vapier Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Indexes and searches Maildir/MH folders"
-HOMEPAGE="http://www.rpcurnow.force9.co.uk/mairix/"
-SRC_URI="http://www.rpcurnow.force9.co.uk/mairix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 arm ~ppc s390 sh ~sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	>=sys-apps/texinfo-4.2"
-
-src_unpack() {
-	unpack ${A}
-
-	# econf would fail with unknown options.
-	# Now it only prints "Unrecognized option".
-	sed -i -e "/^[[:space:]]*bad_options=yes/d" "${S}"/configure || die "sed failed."
-}
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	econf || die "configure failed."
-
-	emake all mairix.info || die "make failed."
-}
-
-src_install() {
-	dobin mairix || die "dobin failed"
-	doinfo mairix.info
-	dodoc NEWS README mairix.txt
-}
diff --git a/net-mail/mairix/mairix-0.21.ebuild b/net-mail/mairix/mairix-0.21.ebuild
new file mode 100644
index 000000000000..cd7163b77dd1
--- /dev/null
+++ b/net-mail/mairix/mairix-0.21.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mairix/mairix-0.21.ebuild,v 1.1 2007/06/26 05:31:49 tove Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="Indexes and searches Maildir/MH folders"
+HOMEPAGE="http://www.rpcurnow.force9.co.uk/mairix/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sh ~sparc ~x86"
+
+IUSE="zlib bzip2"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+	bzip2? ( app-arch/bzip2 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+src_unpack() {
+	unpack ${A}
+
+	# econf would fail with unknown options.
+	# Now it only prints "Unrecognized option".
+	sed -i -e "/^[[:space:]]*bad_options=yes/d" "${S}"/configure || die "sed failed"
+}
+
+src_compile() {
+	export CC="$(tc-getCC)"
+	econf \
+		$(use_enable zlib gzip-mbox) \
+		$(use_enable bzip2 bzip-mbox) || die "configure failed."
+
+	emake  all || die "make failed."
+}
+
+src_install() {
+	dobin mairix || die "dobin failed"
+	doman mairix.1 mairixrc.5 || die "doman failed"
+	dodoc NEWS README dotmairixrc.eg || die "dodoc failed"
+}