version bump

Package-Manager: portage-2.0.51-r12

5 files changed, 137 insertions, 5 deletions

diff --git a/app-editors/mp/ChangeLog b/app-editors/mp/ChangeLog
index f4bfc9489551..ab9d46de802d 100644
--- a/app-editors/mp/ChangeLog
+++ b/app-editors/mp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/mp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.27 2005/01/01 13:31:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.28 2005/01/15 08:27:42 compnerd Exp $ 
+
+*mp-3.3.10 (15 Jan 2005)
+  15 Jan 2005; Saleem Abdulrasool <compnerd@compnerd.org> mp-3.3.10.ebuild
+  Version bump; Masked for testing on x86
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/app-editors/mp/Manifest b/app-editors/mp/Manifest
index e5fd8d050af5..cc7743a04fbb 100644
--- a/app-editors/mp/Manifest
+++ b/app-editors/mp/Manifest
@@ -1,14 +1,17 @@
-MD5 c0747ce254cedcbffbc60572c30d52ba ChangeLog 3184
+MD5 3a332397959a9e666c1bc360e55887f6 ChangeLog 3326
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 a84ba8795412c9dfd6fa7bda75bdd635 mp-3.1.9.ebuild 675
 MD5 38dea2513d652b4f727653f3492eb769 mp-3.2.10.ebuild 953
 MD5 1913b2bce1e68c1a8f11e2dab171cbb4 mp-3.2.11.ebuild 1044
 MD5 dcef69b68c93d433d0ea24a7d76cd143 mp-3.3.1.ebuild 1159
+MD5 996ba09ddbb7dab9ee3df68e138988ee mp-3.3.10.ebuild 1518
 MD5 e001dc78cf8d27dbf5a8d33cf53c2ed2 mp-3.3.9.ebuild 1446
-MD5 135880e17116622cd1cfff6f0b370a29 files/digest-mp-3.1.9 59
 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 116c709ba4054cdd8a781698f8276d82 files/digest-mp-3.3.9 60
+MD5 d22844d76e60bb29e5368dfedaf91501 files/digest-mp-3.3.10 61
+MD5 9ba478d874ba2172b5e7a75d56748d41 files/regex-warnings.patch 2120
 MD5 82dd8f227fdd5b56584b2adf5242a53b files/gentoo-synh-mp.patch-3.2.11 2027
 MD5 f58c1b9239be39f8724f3a172f67c465 files/mp-3.3.9-fix-builtin-regex-warnings.diff 1353
+MD5 7835cbf7dd8763f5ab1be1769263021d files/digest-mp-3.3.1 60
+MD5 135880e17116622cd1cfff6f0b370a29 files/digest-mp-3.1.9 59
+MD5 116c709ba4054cdd8a781698f8276d82 files/digest-mp-3.3.9 60
diff --git a/app-editors/mp/files/digest-mp-3.3.10 b/app-editors/mp/files/digest-mp-3.3.10
new file mode 100644
index 000000000000..77d42b75d3ad
--- /dev/null
+++ b/app-editors/mp/files/digest-mp-3.3.10
@@ -0,0 +1 @@
+MD5 9b0358921547b29e83ce7dcc6de42b3e mp-3.3.10.tar.gz 257508
diff --git a/app-editors/mp/files/regex-warnings.patch b/app-editors/mp/files/regex-warnings.patch
new file mode 100644
index 000000000000..436b9e13c02b
--- /dev/null
+++ b/app-editors/mp/files/regex-warnings.patch
@@ -0,0 +1,59 @@
+*** gnu_regex.c	2004-03-19 04:10:29.000000000 -0600
+--- gnu_regex.c	2005-01-15 00:43:20.709695328 -0600
+*************** regex_compile (pattern, size, syntax, bu
+*** 1635,1644 ****
+--- 1635,1646 ----
+                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)
+*************** regex_compile (pattern, size, syntax, bu
+*** 1655,1664 ****
+--- 1657,1668 ----
+  
+                /* 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''.  */
+*************** typedef struct
+*** 2362,2368 ****
+  
+  #define PUSH_FAILURE_POINT(pattern_place, string_place, failure_code)	\
+    do {									\
+-     char *destination;							\
+      /* Must be int, so when we don't save any registers, the arithmetic	\
+         of 0 + -1 isn't done as unsigned.  */				\
+      int this_reg;							\
+--- 2366,2371 ----
+*************** re_match_2 (bufp, string1, size1, string
+*** 3843,3849 ****
+  		/* Compare that many; failure if mismatch, else move
+                     past them.  */
+  		if (translate 
+!                     ? bcmp_translate (d, d2, mcnt, translate) 
+                      : bcmp (d, d2, mcnt))
+  		  goto fail;
+  		d += mcnt, d2 += mcnt;
+--- 3846,3852 ----
+  		/* Compare that many; failure if mismatch, else move
+                     past them.  */
+  		if (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.10.ebuild b/app-editors/mp/mp-3.3.10.ebuild
new file mode 100644
index 000000000000..3822b1054e80
--- /dev/null
+++ b/app-editors/mp/mp-3.3.10.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-3.3.10.ebuild,v 1.1 2005/01/15 08:27:42 compnerd 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"
+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}
+
+	# Fix regex warnings
+	! use pcre && epatch ${FILESDIR}/regex-warnings.patch
+}
+
+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"
+
+	# -fno-builtin prevents warnings!
+	! use pcre && append-flags "-DSTDC_HEADERS -Wno-unused -fno-builtin"
+
+	echo ${CFLAGS} >> config.cflags
+	echo ${LDFLAGS} >> config.ldflags
+
+	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
+}