Properly fix weird blue tinting with a diff upstream patch #90547.

Package-Manager: portage-2.0.51.20-r4

5 files changed, 48 insertions, 48 deletions

diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog
index 49269882c2e4..599d5cf7d27b 100644
--- a/x11-terms/eterm/ChangeLog
+++ b/x11-terms/eterm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/eterm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.29 2005/04/20 23:11:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.30 2005/04/26 23:20:36 vapier Exp $
+
+*eterm-0.9.3-r3 (26 Apr 2005)
+
+  26 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  files/eterm-0.9.3-pixmap-colmod.patch, -eterm-0.9.3-r2.ebuild,
+  +eterm-0.9.3-r3.ebuild:
+  Properly fix weird blue tinting with a diff upstream patch #90547.
 
 *eterm-0.9.3-r2 (20 Apr 2005)
 
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 5fe155bd016c..ccea8a401449 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,12 +1,12 @@
-MD5 a85829a63cce8084bece7a225a29c974 ChangeLog 4700
-MD5 793512b14a26edcb2fdcd5608d9ca424 eterm-0.9.3-r2.ebuild 1583
+MD5 a02a6c1cbc31a17f4a1d07b5d025c604 ChangeLog 4942
 MD5 c97cacef51ce9af2ed721636c4436fe1 metadata.xml 631
 MD5 5bdc146a5149a57a546d232bd69e9bad eterm-0.9.2-r6.ebuild 1592
 MD5 09c32e59c3e91cd8542caea3f5903eab eterm-9999.ebuild 1652
+MD5 446e5cb0577a384a6090ae5da6ea71a0 eterm-0.9.3-r3.ebuild 1583
 MD5 c06f18d32325d81aa5c4a895a8798a82 files/0.9.2-ansi16.patch 1730
-MD5 c40df349d427482025208b7bea5bcb0a files/digest-eterm-0.9.3-r2 130
 MD5 2914b242770c0fd9c37bf68d32205a0f files/0.9.2-tiling.patch 1206
 MD5 309a7b42f0c4a1580943f0078f90bd50 files/digest-eterm-0.9.2-r6 129
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-eterm-9999 0
-MD5 2dcd1903262e689e5166f32202260106 files/eterm-0.9.3-pixmap-colmod.patch 1583
+MD5 0cb62ade9b1d35746c7d8a55949137a1 files/eterm-0.9.3-pixmap-colmod.patch 1004
 MD5 1ae3058201549b1de7fb8df2753712e0 files/eterm-0.9.3-CARD64.patch 767
+MD5 c40df349d427482025208b7bea5bcb0a files/digest-eterm-0.9.3-r3 130
diff --git a/x11-terms/eterm/eterm-0.9.3-r2.ebuild b/x11-terms/eterm/eterm-0.9.3-r3.ebuild
index 9d0e04ab66e4..ca47d088ba86 100644
--- a/x11-terms/eterm/eterm-0.9.3-r2.ebuild
+++ b/x11-terms/eterm/eterm-0.9.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.3-r2.ebuild,v 1.1 2005/04/20 23:11:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.3-r3.ebuild,v 1.1 2005/04/26 23:20:36 vapier Exp $
 
 inherit eutils
 
diff --git a/x11-terms/eterm/files/digest-eterm-0.9.3-r2 b/x11-terms/eterm/files/digest-eterm-0.9.3-r3
index 099bf720b418..099bf720b418 100644
--- a/x11-terms/eterm/files/digest-eterm-0.9.3-r2
+++ b/x11-terms/eterm/files/digest-eterm-0.9.3-r3
diff --git a/x11-terms/eterm/files/eterm-0.9.3-pixmap-colmod.patch b/x11-terms/eterm/files/eterm-0.9.3-pixmap-colmod.patch
index 963281d1ebda..79f1abd53266 100644
--- a/x11-terms/eterm/files/eterm-0.9.3-pixmap-colmod.patch
+++ b/x11-terms/eterm/files/eterm-0.9.3-pixmap-colmod.patch
@@ -2,48 +2,41 @@ Patch taken from upstream cvs to fix funky blue tinting.
 
 --- src/pixmap.c
 +++ src/pixmap.c
-@@ -1649,12 +1649,12 @@
-                 int r, g, b;
+@@ -54,2 +54,7 @@
  
- # ifdef WORDS_BIGENDIAN
--                r = (ptr[x + 1] * rm) >> 8;
--                g = (ptr[x + 2] * gm) >> 8;
--                b = (ptr[x + 3] * bm) >> 8;
--                ptr[x + 1] = r;
--                ptr[x + 2] = g;
--                ptr[x + 3] = b;
-+                r = (ptr[x + 6] * rm) >> 8;
-+                g = (ptr[x + 5] * gm) >> 8;
-+                b = (ptr[x + 4] * bm) >> 8;
-+                ptr[x + 6] = r;
-+                ptr[x + 5] = g;
-+                ptr[x + 4] = b;
- # else
-                 r = (ptr[x + 2] * rm) >> 8;
-                 g = (ptr[x + 1] * gm) >> 8;
-@@ -1672,9 +1672,9 @@
-                 int r, g, b;
++/* FIXME:  Workaround for older versions of libast. */
++#ifndef WORDS_BIGENDIAN
++#  define WORDS_BIGENDIAN 0
++#endif
++
+ /* Assembler routines */
+@@ -1636,3 +1641,3 @@
  
- # ifdef WORDS_BIGENDIAN
--                r = (ptr[x + 1] * rm) >> 8;
--                g = (ptr[x + 2] * gm) >> 8;
--                b = (ptr[x + 3] * bm) >> 8;
-+                r = (ptr[x + 6] * rm) >> 8;
-+                g = (ptr[x + 5] * gm) >> 8;
-+                b = (ptr[x + 4] * bm) >> 8;
- # else
-                 r = (ptr[x + 2] * rm) >> 8;
-                 g = (ptr[x + 1] * gm) >> 8;
-@@ -1684,9 +1684,9 @@
-                 g |= (!(g >> 8) - 1);
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+                 r = (ptr[x + 1] * rm) >> 8;
+@@ -1659,3 +1664,3 @@
+ 
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+                 r = (ptr[x + 1] * rm) >> 8;
+@@ -1671,3 +1676,3 @@
+                 b |= (!(b >> 8) - 1);
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+                 ptr[x + 1] = r;
+@@ -1701,3 +1706,3 @@
+ 
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+                 r = (ptr[x + 0] * rm) >> 8;
+@@ -1724,3 +1729,3 @@
+ 
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+                 r = (ptr[x + 0] * rm) >> 8;
+@@ -1736,3 +1741,3 @@
                  b |= (!(b >> 8) - 1);
- # ifdef WORDS_BIGENDIAN
--                ptr[x + 1] = r;
--                ptr[x + 2] = g;
--                ptr[x + 3] = b;
-+                ptr[x + 6] = r;
-+                ptr[x + 5] = g;
-+                ptr[x + 4] = b;
- # else
-                 ptr[x + 2] = r;
-                 ptr[x + 1] = g;
+-# ifdef WORDS_BIGENDIAN
++# if WORDS_BIGENDIAN
+                 ptr[x + 0] = r;