ansi16 patch #26547

4 files changed, 118 insertions, 1 deletions

diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog
index de71b31e96a7..55d19bc73419 100644
--- a/x11-terms/eterm/ChangeLog
+++ b/x11-terms/eterm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/eterm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.18 2003/04/09 15:52:53 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.19 2003/08/14 03:44:15 vapier Exp $
+
+*eterm-0.9.2-r5 (13 Aug 2003)
+
+  13 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add patch to support ansi 16 colors ... already been added upstream #26547.
 
 *eterm-0.9.2-r4 (20 Mar 2003)
 
diff --git a/x11-terms/eterm/eterm-0.9.2-r5.ebuild b/x11-terms/eterm/eterm-0.9.2-r5.ebuild
new file mode 100644
index 000000000000..f5e87b759a1a
--- /dev/null
+++ b/x11-terms/eterm/eterm-0.9.2-r5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.2-r5.ebuild,v 1.1 2003/08/14 03:44:15 vapier Exp $
+
+inherit eutils
+
+MY_PN=${PN/et/Et}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A vt102 terminal emulator for X"
+HOMEPAGE="http://www.eterm.org/"
+SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
+	 http://www.eterm.org/download/${MY_PN}-bg-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha"
+
+DEPEND="virtual/x11
+	>=x11-libs/libast-0.5
+	media-libs/imlib2
+	>=sys-devel/binutils-2.13*"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd ${S}
+	unpack ${MY_PN}-bg-${PV}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-ansi16.patch
+}
+
+src_compile() {
+	econf \
+		--with-imlib \
+		--enable-trans \
+		--with-x \
+		--enable-multi-charset \
+		--with-delete=execute \
+		--with-backspace=auto \
+		--enable-escreen \
+		--enable-etwin \
+		`use_enable mmx` \
+		|| die "conf failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	dodir /usr/share/terminfo
+	make \
+		DESTDIR=${D} \
+		TIC="tic -o ${D}/usr/share/terminfo" \
+		install || die
+
+	dodoc COPYING ChangeLog README ReleaseNotes
+	dodoc bg/README.backgrounds
+}
diff --git a/x11-terms/eterm/files/0.9.2-ansi16.patch b/x11-terms/eterm/files/0.9.2-ansi16.patch
new file mode 100644
index 000000000000..63ea9dd62097
--- /dev/null
+++ b/x11-terms/eterm/files/0.9.2-ansi16.patch
@@ -0,0 +1,54 @@
+diff -r -u -d Eterm-0.9.2-orig/src/screen.c Eterm-0.9.2-current/src/screen.c
+--- Eterm-0.9.2-orig/src/screen.c	2002-10-07 21:18:08.000000000 -0500
++++ Eterm-0.9.2-current/src/screen.c	2003-07-31 10:00:59.000000000 -0500
+@@ -488,11 +488,6 @@
+ #ifndef NO_BRIGHTCOLOR
+             if ((rstyle & Intensity) && color >= minColor && color <= maxColor)
+                 color += (minBright - minColor);
+-            else if (color >= minBright && color <= maxBright) {
+-                if (rstyle & Intensity)
+-                    return;
+-                color -= (minBright - minColor);
+-            }
+ #endif
+         }
+     }
+diff -r -u -d Eterm-0.9.2-orig/src/term.c Eterm-0.9.2-current/src/term.c
+--- Eterm-0.9.2-orig/src/term.c	2002-10-22 22:03:26.000000000 -0500
++++ Eterm-0.9.2-current/src/term.c	2003-07-31 10:01:09.000000000 -0500
+@@ -1646,6 +1646,35 @@
+           case 49:             /* default bg */
+               scr_color(restoreBG, RS_Blink);
+               break;
++
++	  case 90:
++	  case 91:		/* set fg color - bright */
++	  case 92:
++	  case 93:
++	  case 94:
++	  case 95:
++	  case 96:
++	  case 97:
++	      scr_color(minBright + (arg[i] - 90), RS_Bold);
++	      break;
++          case 99:             /* default fg */
++              scr_color(restoreFG, RS_Bold);
++              break;
++
++          case 100:
++          case 101:             /* set bg color - bright*/
++          case 102:
++          case 103:
++          case 104:
++          case 105:
++          case 106:
++          case 107:
++              scr_color(minBright + (arg[i] - 100), RS_Blink);
++              break;
++          case 109:             /* default bg */
++              scr_color(restoreBG, RS_Blink);
++              break;
++
+         }
+ }
+ 
diff --git a/x11-terms/eterm/files/digest-eterm-0.9.2-r5 b/x11-terms/eterm/files/digest-eterm-0.9.2-r5
new file mode 100644
index 000000000000..04c1c525781f
--- /dev/null
+++ b/x11-terms/eterm/files/digest-eterm-0.9.2-r5
@@ -0,0 +1,2 @@
+MD5 e8c82cf52b25fdd51d16ff76b993ba68 Eterm-0.9.2.tar.gz 662636
+MD5 fb465e84f24de348e31bb9fd4d430071 Eterm-bg-0.9.2.tar.gz 379832