Version bump for bug #326573. Enhance Gnus functionality, thanks to Beetle B. (bug #274578). Remove old version.

(Portage version: 2.2_rc71/cvs/Linux x86_64)

4 files changed, 66 insertions, 16 deletions

diff --git a/net-mail/mairix/ChangeLog b/net-mail/mairix/ChangeLog
index 0f276680bb10..2b0f8154422a 100644
--- a/net-mail/mairix/ChangeLog
+++ b/net-mail/mairix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/mairix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mairix/ChangeLog,v 1.27 2010/01/22 20:54:53 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mairix/ChangeLog,v 1.28 2010/08/30 07:34:06 radhermit Exp $
+
+*mairix-0.22 (30 Aug 2010)
+
+  30 Aug 2010; Tim Harder <radhermit@gentoo.org> -mairix-0.20.ebuild,
+  +mairix-0.22.ebuild, +files/mairix-0.22-parallel-make.patch, metadata.xml:
+  Version bump for bug #326573. Enhance Gnus functionality, thanks to Beetle
+  B. (bug #274578). Remove old version.
 
   22 Jan 2010; Jeremy Olexa <darkside@gentoo.org> mairix-0.21.ebuild:
   Add ~x86-macos, as tested in bug 301532
diff --git a/net-mail/mairix/files/mairix-0.22-parallel-make.patch b/net-mail/mairix/files/mairix-0.22-parallel-make.patch
new file mode 100644
index 000000000000..a77064318f3d
--- /dev/null
+++ b/net-mail/mairix/files/mairix-0.22-parallel-make.patch
@@ -0,0 +1,34 @@
+diff -ur mairix-0.22.orig/dfasyn/Makefile mairix-0.22/dfasyn/Makefile
+--- mairix-0.22.orig/dfasyn/Makefile	2010-06-05 14:41:10.000000000 -0700
++++ mairix-0.22/dfasyn/Makefile	2010-08-30 00:07:13.538849849 -0700
+@@ -46,9 +46,7 @@
+ 	$(CC) $(CFLAGS) -o dfasyn $(OBJ)
+ 
+ parse.c parse.h : parse.y
+-	bison -v -d parse.y
+-	mv parse.tab.c parse.c
+-	mv parse.tab.h parse.h
++	bison -v -d -o parse.c parse.y
+ 
+ parse.o : parse.c dfasyn.h
+ 
+diff -ur mairix-0.22.orig/Makefile.in mairix-0.22/Makefile.in
+--- mairix-0.22.orig/Makefile.in	2010-06-05 14:41:10.000000000 -0700
++++ mairix-0.22/Makefile.in	2010-08-30 00:06:52.276674632 -0700
+@@ -77,14 +77,14 @@
+ 	./mkversion
+ 
+ ./dfasyn/dfasyn:
+-	if [ -d dfasyn ]; then cd dfasyn ; make CC="$(CC)" CFLAGS="$(CFLAGS)" ; else echo "No dfasyn subdirectory?" ; exit 1 ; fi
++	if [ -d dfasyn ]; then cd dfasyn ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" ; else echo "No dfasyn subdirectory?" ; exit 1 ; fi
+ 
+ clean:
+ 	-rm -f *~ *.o mairix *.s core
+ 	-rm -f mairix.cp mairix.fn mairix.aux mairix.log mairix.ky mairix.pg mairix.toc mairix.tp mairix.vr
+ 	-rm -f fromcheck.[ch] datescan.[ch]
+ 	-rm -f nvpscan.[ch]
+-	if [ -d dfasyn ]; then cd dfasyn ; make clean ; fi
++	if [ -d dfasyn ]; then cd dfasyn ; $(MAKE) clean ; fi
+ 
+ distclean: clean
+ 	-rm -f Makefile config.log
diff --git a/net-mail/mairix/mairix-0.20.ebuild b/net-mail/mairix/mairix-0.22.ebuild
index 3e2d523731ec..32bbbebd544b 100644
--- a/net-mail/mairix/mairix-0.20.ebuild
+++ b/net-mail/mairix/mairix-0.22.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mairix/mairix-0.20.ebuild,v 1.1 2007/04/01 20:58:55 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mairix/mairix-0.22.ebuild,v 1.1 2010/08/30 07:34:06 radhermit Exp $
 
-inherit toolchain-funcs
+EAPI=3
+
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Indexes and searches Maildir/MH folders"
 HOMEPAGE="http://www.rpcurnow.force9.co.uk/mairix/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	gnus? ( mirror://gentoo/${P}-gnus-marks-propagation.patch.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sh ~sparc ~x86 ~x86-macos"
 
-IUSE="zlib bzip2"
+IUSE="zlib bzip2 gnus"
 
 RDEPEND="zlib? ( sys-libs/zlib )
 	bzip2? ( app-arch/bzip2 )"
@@ -21,21 +24,23 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	sys-devel/bison"
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	# 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"
+
+	# Fix parallel make
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+
+	# Add support for gnus marks propagation (bug #274578)
+	use gnus && epatch "${WORKDIR}"/${P}-gnus-marks-propagation.patch
 }
 
-src_compile() {
-	export CC="$(tc-getCC)"
+src_configure() {
+	tc-export CC
 	econf \
 		$(use_enable zlib gzip-mbox) \
-		$(use_enable bzip2 bzip-mbox) || die "configure failed."
-
-	emake  all || die "make failed."
+		$(use_enable bzip2 bzip-mbox)
 }
 
 src_install() {
diff --git a/net-mail/mairix/metadata.xml b/net-mail/mairix/metadata.xml
index 51f94e3fbe0e..43b45e6bdc7c 100644
--- a/net-mail/mairix/metadata.xml
+++ b/net-mail/mairix/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+	<herd>net-mail</herd>
+	<use>
+		<flag name="gnus">Add support for the marks propagation feature in
+			<pkg>app-emacs/gnus</pkg></flag>
+	</use>
 </pkgmetadata>