add gcc2 fix

5 files changed, 20 insertions, 83 deletions

diff --git a/x11-terms/multi-gnome-terminal/ChangeLog b/x11-terms/multi-gnome-terminal/ChangeLog
index 2c4a10265cd2..e03b13656b5e 100644
--- a/x11-terms/multi-gnome-terminal/ChangeLog
+++ b/x11-terms/multi-gnome-terminal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-terms/multi-gnome-terminal
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/ChangeLog,v 1.23 2004/09/03 16:48:52 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/ChangeLog,v 1.24 2005/01/16 22:10:11 foser Exp $
+
+  16 Jan 2005; foser <foser@gentoo.org> multi-gnome-terminal-1.6.2-r1.ebuild :
+  Add gcc2 patch (#65029) thnx to Matt Taylor
 
 *multi-gnome-terminal-1.6.2-r1 (03 Sep 2004)
 
diff --git a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.6.2 b/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.6.2
deleted file mode 100644
index 2f595b780a56..000000000000
--- a/x11-terms/multi-gnome-terminal/files/digest-multi-gnome-terminal-1.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52b65d2326efc4273716383b0196e95f multi-gnome-terminal-1.6.2.tar.bz2 1616529
diff --git a/x11-terms/multi-gnome-terminal/files/multi-gnome-terminal-1.6.2-zvt_term.patch b/x11-terms/multi-gnome-terminal/files/multi-gnome-terminal-1.6.2-zvt_term.patch
new file mode 100644
index 000000000000..d35104f4295d
--- /dev/null
+++ b/x11-terms/multi-gnome-terminal/files/multi-gnome-terminal-1.6.2-zvt_term.patch
@@ -0,0 +1,12 @@
+--- multi-gnome-terminal-1.6.2/gnome-terminal/zvtterm.c~	2004-09-22 18:55:37 -0400
++++ multi-gnome-terminal-1.6.2/gnome-terminal/zvtterm.c	2004-09-22 19:06:43 -0400
+@@ -4546,8 +4546,8 @@
+ 
+   while ( (count>0) && (select_retval==1) && (total_count<32768) )
+   {
+-	  count=0;
+ 	  int maxread=32768-total_count;
++	  count=0;
+ 	  if (maxread>4096)
+ 		  maxread=4096;
+ 
diff --git a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2-r1.ebuild b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2-r1.ebuild
index de4a27da876f..69ddee6c0f4c 100644
--- a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2-r1.ebuild
+++ b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2-r1.ebuild,v 1.2 2004/09/03 23:19:13 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2-r1.ebuild,v 1.3 2005/01/16 22:10:11 foser Exp $
 
 IUSE="nls"
 
@@ -29,6 +29,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-gcc-3.4.patch"
 	# Fix loggin keystrokes (#62322)
 	epatch ${FILESDIR}/${P}-remove_debug.patch
+	# gcc2 fix (#65029)
+	epatch ${FILESDIR}/${P}-zvt_term.patch
 
 }
 
diff --git a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2.ebuild b/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2.ebuild
deleted file mode 100644
index b2ad153ef7eb..000000000000
--- a/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/multi-gnome-terminal/multi-gnome-terminal-1.6.2.ebuild,v 1.9 2004/09/03 07:31:38 lu_zero Exp $
-
-IUSE="nls"
-
-inherit libtool eutils
-
-DESCRIPTION="Extended version of the Gnome Terminal."
-SRC_URI="mirror://sourceforge/multignometerm/${P}.tar.bz2"
-HOMEPAGE="http://multignometerm.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~amd64"
-
-DEPEND="=x11-libs/gtk+-1*
-	>=gnome-base/gnome-libs-1.4.1.7
-	>=media-libs/gdk-pixbuf-0.11.0-r1
-	=gnome-base/libglade-0*
-	>=app-text/scrollkeeper-0.3.10-r1
-	=gnome-base/orbit-0*"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-gcc-3.4.patch"
-
-}
-src_compile() {
-
-	elibtoolize
-
-	local myconf=""
-	use nls || myconf="--disable-nls"
-
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --mandir=/usr/share/man \
-		    --infodir=/usr/share/info \
-		    --sysconfdir=/etc \
-		    ${myconf} || die
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-
-	cp  ${S}/omf-install/Makefile ${S}/omf-install/Makefile.orig
-	sed -e "s:scrollkeeper-update.*::g" \
-	    ${S}/omf-install/Makefile.orig > ${S}/omf-install/Makefile
-
-	# Remove the NO_XALF nonsense from the .desktop file
-	cp ${S}/gnome-terminal/multi-gnome-terminal.desktop \
-	   ${S}/gnome-terminal/mgt.desktop.old
-	sed -e "s:NO_XALF ::" \
-	    ${S}/gnome-terminal/mgt.desktop.old > \
-		${S}/gnome-terminal/multi-gnome-terminal.desktop
-
-	make DESTDIR=${D} install || die "Installation failed"
-
-	dosym mgt/multignometerm.png /usr/share/pixmaps/multignometerm.png
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README
-}
-
-pkg_postinst() {
-
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update &>/dev/null
-}
-
-pkg_postrm() {
-
-	echo ">>> Updating Scrollkeeper database..."
-	scrollkeeper-update &>/dev/null
-}
-