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

(Portage version: 2.1.3_rc4)

5 files changed, 55 insertions, 45 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/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"
+}