Add patch from upstream to fix weird blue tinting.

Package-Manager: portage-2.0.51.19

5 files changed, 124 insertions, 4 deletions

diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog
index 652220649fee..a9f40bbfc6b3 100644
--- a/x11-terms/eterm/ChangeLog
+++ b/x11-terms/eterm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.27 2005/04/18 23:50:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.28 2005/04/19 05:02:09 vapier Exp $
+
+*eterm-0.9.3-r1 (19 Apr 2005)
+
+  19 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/eterm-0.9.3-pixmap-colmod.patch, +eterm-0.9.3-r1.ebuild:
+  Add patch from upstream to fix weird blue tinting.
 
 *eterm-9999 (18 Apr 2005)
 
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 865ec1004ec1..c9426ea583dd 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,10 +1,11 @@
-MD5 db3045d157d06e34bec95ad0eb16dcde ChangeLog 4283
-MD5 d350a4ef31421873df49b345bc255129 eterm-0.9.3.ebuild 1523
+MD5 ff8cf4d9abfaca8875702c4d892ce0f0 ChangeLog 4484
 MD5 c97cacef51ce9af2ed721636c4436fe1 metadata.xml 631
 MD5 5bdc146a5149a57a546d232bd69e9bad eterm-0.9.2-r6.ebuild 1592
 MD5 09c32e59c3e91cd8542caea3f5903eab eterm-9999.ebuild 1652
+MD5 c4f3fdbad0987a554c54e4b522c4ed47 eterm-0.9.3-r1.ebuild 1536
 MD5 c06f18d32325d81aa5c4a895a8798a82 files/0.9.2-ansi16.patch 1730
-MD5 c40df349d427482025208b7bea5bcb0a files/digest-eterm-0.9.3 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 c40df349d427482025208b7bea5bcb0a files/digest-eterm-0.9.3-r1 130
diff --git a/x11-terms/eterm/eterm-0.9.3-r1.ebuild b/x11-terms/eterm/eterm-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..526efaa82f0b
--- /dev/null
+++ b/x11-terms/eterm/eterm-0.9.3-r1.ebuild
@@ -0,0 +1,62 @@
+# 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-r1.ebuild,v 1.1 2005/04/19 05:02:09 vapier Exp $
+
+inherit eutils
+
+MY_P=Eterm-${PV}
+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/Eterm-bg-${PV}.tar.gz
+	mirror://sourceforge/eterm/${MY_P}.tar.gz
+	mirror://sourceforge/eterm/Eterm-bg-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="mmx etwin escreen"
+
+DEPEND="virtual/x11
+	>=x11-libs/libast-0.6.1
+	media-libs/imlib2
+	etwin? ( app-misc/twin )
+	escreen? ( app-misc/screen )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-pixmap-colmod.patch
+	unpack Eterm-bg-${PV}.tar.gz
+	sed -i 's:Tw/Tw_1\.h:Tw/Tw1.h:' src/libscream.c || die
+}
+
+src_compile() {
+	local mymmx
+	use x86 \
+		&& mymmx="$(use_enable mmx)" \
+		|| mymmx="--disable-mmx"
+	econf \
+		$(use_enable escreen) \
+		$(use_enable etwin) \
+		--with-imlib \
+		--enable-trans \
+		${mymmx} \
+		--enable-multi-charset \
+		--with-delete=execute \
+		--with-backspace=auto \
+		|| die "conf failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make \
+		TIC="tic -o ${D}/usr/share/terminfo" \
+		DESTDIR="${D}" \
+		install || die "install failed"
+	dodoc ChangeLog README ReleaseNotes
+	use escreen && dodoc doc/README.Escreen
+	dodoc bg/README.backgrounds
+}
diff --git a/x11-terms/eterm/files/digest-eterm-0.9.3-r1 b/x11-terms/eterm/files/digest-eterm-0.9.3-r1
new file mode 100644
index 000000000000..099bf720b418
--- /dev/null
+++ b/x11-terms/eterm/files/digest-eterm-0.9.3-r1
@@ -0,0 +1,2 @@
+MD5 dd089fa7768f945341d721dd4942c702 Eterm-0.9.3.tar.gz 660767
+MD5 e8c6567b13d7fb760bded56c1d1a181d Eterm-bg-0.9.3.tar.gz 1883627
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
new file mode 100644
index 000000000000..963281d1ebda
--- /dev/null
+++ b/x11-terms/eterm/files/eterm-0.9.3-pixmap-colmod.patch
@@ -0,0 +1,49 @@
+Patch taken from upstream cvs to fix funky blue tinting.
+
+--- src/pixmap.c
++++ src/pixmap.c
+@@ -1649,12 +1649,12 @@
+                 int r, g, b;
+ 
+ # 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;
+ 
+ # 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);
+                 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;