Version bump; closes bug 75073.

5 files changed, 124 insertions, 6 deletions

diff --git a/app-editors/mp/ChangeLog b/app-editors/mp/ChangeLog
index 156c872f6343..be9817ee325d 100644
--- a/app-editors/mp/ChangeLog
+++ b/app-editors/mp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/mp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.24 2004/10/05 12:19:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.25 2004/12/21 17:16:41 ka0ttic Exp $
+
+*mp-3.3.9 (21 Dec 2004)
+
+  21 Dec 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/mp-3.3.9-fix-builtin-regex-warnings.diff, +mp-3.3.9.ebuild:
+  Version bump; closes bug 75073.
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> mp-3.2.10.ebuild,
   mp-3.2.11.ebuild, mp-3.3.1.ebuild:
diff --git a/app-editors/mp/Manifest b/app-editors/mp/Manifest
index cdf9c3eaea4d..86a2b93fbfe5 100644
--- a/app-editors/mp/Manifest
+++ b/app-editors/mp/Manifest
@@ -1,11 +1,24 @@
-MD5 97f5fa955ccfe9efa8961b5ca4d4bb4d ChangeLog 2897
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 166ede21d137a702e20f482c011b4a0e mp-3.1.9.ebuild 671
-MD5 d7d23d50ff8117b4da08fed3ea50a52a mp-3.2.10.ebuild 951
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 0812ef52bbb3b2af398826fff4ab669f mp-3.2.11.ebuild 1041
+MD5 3030530d70eb5989122882d4e240241b mp-3.3.9.ebuild 1443
 MD5 e11af8e8acb9b2208aa8e025350ab87d mp-3.3.1.ebuild 1157
+MD5 d7d23d50ff8117b4da08fed3ea50a52a mp-3.2.10.ebuild 951
+MD5 166ede21d137a702e20f482c011b4a0e mp-3.1.9.ebuild 671
+MD5 051a6ce3d0a5e80ac314e1d5037a9eb4 ChangeLog 3074
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 135880e17116622cd1cfff6f0b370a29 files/digest-mp-3.1.9 59
+MD5 7835cbf7dd8763f5ab1be1769263021d files/digest-mp-3.3.1 60
+MD5 116c709ba4054cdd8a781698f8276d82 files/digest-mp-3.3.9 60
 MD5 ef0f5c3d7fae6d678f94005df3d90866 files/digest-mp-3.2.10 61
 MD5 7c0b9a8a327bbfc4db185cdefaa14767 files/digest-mp-3.2.11 61
-MD5 7835cbf7dd8763f5ab1be1769263021d files/digest-mp-3.3.1 60
+MD5 f58c1b9239be39f8724f3a172f67c465 files/mp-3.3.9-fix-builtin-regex-warnings.diff 1353
 MD5 82dd8f227fdd5b56584b2adf5242a53b files/gentoo-synh-mp.patch-3.2.11 2027
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFByFqHEZCkKN40op4RAqNHAKCcBEvZfEKut1i7bFv+pQP2S2OMFgCggGFB
+yiPPHwuBv3AdgIfEbUOGIcA=
+=t+Zb
+-----END PGP SIGNATURE-----
diff --git a/app-editors/mp/files/digest-mp-3.3.9 b/app-editors/mp/files/digest-mp-3.3.9
new file mode 100644
index 000000000000..ee8b75634a7a
--- /dev/null
+++ b/app-editors/mp/files/digest-mp-3.3.9
@@ -0,0 +1 @@
+MD5 91677a24c606ac319ebc46d070890437 mp-3.3.9.tar.gz 406565
diff --git a/app-editors/mp/files/mp-3.3.9-fix-builtin-regex-warnings.diff b/app-editors/mp/files/mp-3.3.9-fix-builtin-regex-warnings.diff
new file mode 100644
index 000000000000..4954fc4f54ff
--- /dev/null
+++ b/app-editors/mp/files/mp-3.3.9-fix-builtin-regex-warnings.diff
@@ -0,0 +1,38 @@
+diff -urN mp-3.3.9.orig/gnu_regex.c mp-3.3.9/gnu_regex.c
+--- mp-3.3.9.orig/gnu_regex.c	2004-12-21 11:51:05.000000000 -0500
++++ mp-3.3.9/gnu_regex.c	2004-12-21 12:06:50.974403033 -0500
+@@ -1635,10 +1635,12 @@
+               if (syntax & RE_NO_BK_PARENS) goto normal_backslash;
+ 
+               if (COMPILE_STACK_EMPTY)
++		{
+                 if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
+                   goto normal_backslash;
+                 else
+                   return REG_ERPAREN;
++		}
+ 
+             handle_close:
+               if (fixup_alt_jump)
+@@ -1655,10 +1657,12 @@
+ 
+               /* See similar code for backslashed left paren above.  */
+               if (COMPILE_STACK_EMPTY)
++		{
+                 if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
+                   goto normal_char;
+                 else
+                   return REG_ERPAREN;
++		}
+ 
+               /* Since we just checked for an empty stack above, this
+                  ``can't happen''.  */
+@@ -3843,7 +3847,7 @@
+ 		/* Compare that many; failure if mismatch, else move
+                    past them.  */
+ 		if (translate 
+-                    ? bcmp_translate (d, d2, mcnt, translate) 
++                    ? bcmp_translate ((unsigned char *)d, (unsigned char *)d2, mcnt, translate) 
+                     : bcmp (d, d2, mcnt))
+ 		  goto fail;
+ 		d += mcnt, d2 += mcnt;
diff --git a/app-editors/mp/mp-3.3.9.ebuild b/app-editors/mp/mp-3.3.9.ebuild
new file mode 100644
index 000000000000..0b6cbbc83d84
--- /dev/null
+++ b/app-editors/mp/mp-3.3.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-3.3.9.ebuild,v 1.1 2004/12/21 17:16:41 ka0ttic Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Minimum Profit: A text editor for programmers"
+HOMEPAGE="http://www.triptico.com/software/mp.html"
+SRC_URI="http://www.triptico.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+IUSE="gtk gtk2 ncurses pcre"
+
+DEPEND="virtual/libc
+		ncurses? ( sys-libs/ncurses )
+		gtk? (
+			gtk2?  ( >=x11-libs/gtk+-2 )
+			!gtk2? ( =x11-libs/gtk+-1.2* )
+		)
+		!gtk? ( sys-libs/ncurses )
+		pcre? ( dev-libs/libpcre )"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	! use pcre && epatch ${FILESDIR}/${P}-fix-builtin-regex-warnings.diff
+}
+
+src_compile() {
+	local myconf
+
+	if use gtk ; then
+		! use ncurses && myconf="--without-curses"
+		! use gtk2 && myconf="${myconf} --without-gtk2"
+	else
+		myconf="${myconf} --without-gtk1 --without-gtk2"
+	fi
+
+	use pcre || myconf="${myconf} --without-pcre --with-included-regex"
+
+	sh config.sh ${myconf} || die "Configure failed"
+
+	! use pcre && append-flags "-DSTDC_HEADERS -Wno-unused"
+	echo ${CFLAGS} >> config.cflags
+
+	emake || die "Compile Failed"
+}
+
+src_install() {
+	dobin mp || die "Install Failed"
+
+	use gtk && dosym mp ${DESTTREE}/bin/gmp
+
+	dodoc AUTHORS README Changelog mprc.sample
+	doman mp.1
+}