Version bump, see bug #116438. Patches by Gautam Iyer <gautam@math.uchicago.edu>. Added myself as maintainer.

(Portage version: 2.1_pre4-r1)

11 files changed, 304 insertions, 117 deletions

diff --git a/x11-terms/mrxvt/ChangeLog b/x11-terms/mrxvt/ChangeLog
index 653c389e9efe..c4f2a33cb2e6 100644
--- a/x11-terms/mrxvt/ChangeLog
+++ b/x11-terms/mrxvt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-terms/mrxvt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/ChangeLog,v 1.31 2006/01/13 23:57:55 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/ChangeLog,v 1.32 2006/02/03 14:01:29 nelchael Exp $
+
+*mrxvt-0.4.2 (03 Feb 2006)
+
+  03 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/noflicker-0.4.2.patch, +files/xft-colorbd-0.4.2.patch,
+  metadata.xml, mrxvt-0.3.13-r1.ebuild, -mrxvt-0.4.0.ebuild,
+  -mrxvt-0.4.0-r1.ebuild, +mrxvt-0.4.2.ebuild:
+  Version bump, see bug #116438. Patches by Gautam Iyer
+  <gautam@math.uchicago.edu>. Added myself as maintainer.
 
   13 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> mrxvt-0.4.1.ebuild:
   Fixed DEPEND for modular X.
diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest
index 8e9d0b0afba8..f7faef6c62fb 100644
--- a/x11-terms/mrxvt/Manifest
+++ b/x11-terms/mrxvt/Manifest
@@ -1,11 +1,33 @@
 MD5 4066071c6b45452002f19a874b564cb5 ChangeLog 4339
+RMD160 e6459bd2d863a4378e8a6513a673606a77e93fac ChangeLog 4339
+SHA256 f3ad5af5f7abeb422d943dff73c6b36d649b12fe8d08c34d465c59241fa089ea ChangeLog 4339
 MD5 c1c69c0365b65e6fe61bb9d71061a16a files/digest-mrxvt-0.3.13-r1 64
-MD5 830b24e022601d0b5a2cf12b56a4a389 files/digest-mrxvt-0.4.0 63
-MD5 830b24e022601d0b5a2cf12b56a4a389 files/digest-mrxvt-0.4.0-r1 63
+RMD160 0311466376bbc5db4551cee49b4e11976dfc2e14 files/digest-mrxvt-0.3.13-r1 64
+SHA256 bb0751a44e20533826a2cabd1a5effbd9054b00d4bb4984805a8cff06564afc0 files/digest-mrxvt-0.3.13-r1 64
 MD5 7543e73c29de0cdf2bb56ee68aa5ef86 files/digest-mrxvt-0.4.1 63
+RMD160 038313bfe42e3fb02d807f68e247ee3f39254b76 files/digest-mrxvt-0.4.1 63
+SHA256 c9dd762163a821f858e63528556d1953c70eacba8fd2393501b2407514edb4bc files/digest-mrxvt-0.4.1 63
+MD5 2165d78cb316cb30ab32d841eaf21484 files/digest-mrxvt-0.4.2 226
+RMD160 b2e10bb46a57a45d23bcecffffd07a4f878e8927 files/digest-mrxvt-0.4.2 226
+SHA256 32ccd3351bac6db9ff26ef64872fa6461312c13ff181c4158e417de186c1ace1 files/digest-mrxvt-0.4.2 226
 MD5 d7ac26627011150a523bf15955a9067d files/mrxvt-0.3.13-xdefaults.patch 7709
-MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
-MD5 d1f0588da51da543594d58599b989109 mrxvt-0.3.13-r1.ebuild 2239
-MD5 ea1ecd6fd30dcbcea34f37b20cf25c7f mrxvt-0.4.0-r1.ebuild 1740
-MD5 7e9267cd8d4f6472fbc67c97433ab41c mrxvt-0.4.0.ebuild 2151
+RMD160 430eafecd6f8984b4e1b60e58b64bdd53d8e93f5 files/mrxvt-0.3.13-xdefaults.patch 7709
+SHA256 9391593a3bf7c953d95a2b9a3f6c973f17b3551608448b934fbc0260e917babd files/mrxvt-0.3.13-xdefaults.patch 7709
+MD5 51f180e88f5a28f6da5f0a5fdd7cfcc5 files/noflicker-0.4.2.patch 4322
+RMD160 b92aa3f07709ea6b50f8f529a0dcb2bf794a34d0 files/noflicker-0.4.2.patch 4322
+SHA256 13d385cbed91ac18df549b0049cce0e8a48e3dd21db3ec4956d48d3b5f00adc5 files/noflicker-0.4.2.patch 4322
+MD5 4e65bda48b0b3bffda7ecccb2ffadfd8 files/xft-colorbd-0.4.2.patch 1716
+RMD160 d095ae59d35022c7826f16b4dde7974d187e3dd8 files/xft-colorbd-0.4.2.patch 1716
+SHA256 bd875cceebbdd1a1329404883680f9859f32dc58b46a5e5dd5654c4f16b1e013 files/xft-colorbd-0.4.2.patch 1716
+MD5 3d61af9a82832d3ee3595f41c1bcff41 metadata.xml 285
+RMD160 7a393ddbd1e4bc0b8c8105de7db5fb64469ab0eb metadata.xml 285
+SHA256 849e6d884378550f853c172d2a2f5095b9a167259155c0ec629c893c3ac13b83 metadata.xml 285
+MD5 b71d77ba6fc7af7826695522133b3ee4 mrxvt-0.3.13-r1.ebuild 2320
+RMD160 1ad723fbecb92ab1fce624f688af37b5d97e00f4 mrxvt-0.3.13-r1.ebuild 2320
+SHA256 ae01aba91e69536b2ba720688678f3426b70e039d652fe159b470e46cebcaae8 mrxvt-0.3.13-r1.ebuild 2320
 MD5 40c3cc4fd2ceb4531369cd4c3943e548 mrxvt-0.4.1.ebuild 1869
+RMD160 92ac8c602cc4b35694bd0e7838df7942c8e5fba1 mrxvt-0.4.1.ebuild 1869
+SHA256 934b3dac132521031a3213acc0b17b4c8db1af6a451b6c4cbe7015af2dbc1d08 mrxvt-0.4.1.ebuild 1869
+MD5 64b24de8826523bd923fe9beb44ababc mrxvt-0.4.2.ebuild 2242
+RMD160 cf8083379b051c41223408cfc4abe45da3087adb mrxvt-0.4.2.ebuild 2242
+SHA256 7e942f60427dbd7461177468e48f8a0ad58dd962202d9099e2ebd6891cccf69f mrxvt-0.4.2.ebuild 2242
diff --git a/x11-terms/mrxvt/files/digest-mrxvt-0.4.0 b/x11-terms/mrxvt/files/digest-mrxvt-0.4.0
deleted file mode 100644
index 1d402768b0c6..000000000000
--- a/x11-terms/mrxvt/files/digest-mrxvt-0.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 177a1fa40f15cf6787984412694bd4cc mrxvt-0.4.0.tar.gz 500525
diff --git a/x11-terms/mrxvt/files/digest-mrxvt-0.4.0-r1 b/x11-terms/mrxvt/files/digest-mrxvt-0.4.0-r1
deleted file mode 100644
index 1d402768b0c6..000000000000
--- a/x11-terms/mrxvt/files/digest-mrxvt-0.4.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 177a1fa40f15cf6787984412694bd4cc mrxvt-0.4.0.tar.gz 500525
diff --git a/x11-terms/mrxvt/files/digest-mrxvt-0.4.2 b/x11-terms/mrxvt/files/digest-mrxvt-0.4.2
new file mode 100644
index 000000000000..701f387b5efa
--- /dev/null
+++ b/x11-terms/mrxvt/files/digest-mrxvt-0.4.2
@@ -0,0 +1,3 @@
+MD5 1e930a35ca2892f854b3d34e1ee0b6d0 mrxvt-0.4.2.tgz 508718
+RMD160 205a5df674ea37639108d60d4bc78373749ce58e mrxvt-0.4.2.tgz 508718
+SHA256 a6d348670641b043aa3cb7b55c2f3ebb4fbb521f8134b67e0821991b959f1830 mrxvt-0.4.2.tgz 508718
diff --git a/x11-terms/mrxvt/files/noflicker-0.4.2.patch b/x11-terms/mrxvt/files/noflicker-0.4.2.patch
new file mode 100644
index 000000000000..9ce42c0a9c27
--- /dev/null
+++ b/x11-terms/mrxvt/files/noflicker-0.4.2.patch
@@ -0,0 +1,159 @@
+diff -ru /tmp/mrxvt-0.4.2/src/command.c ./src/command.c
+--- /tmp/mrxvt-0.4.2/src/command.c	2005-06-24 17:16:26.000000000 -0500
++++ ./src/command.c	2005-12-21 12:57:21.000000000 -0600
+@@ -36,6 +36,12 @@
+ /*
+ ** $Id: noflicker-0.4.2.patch,v 1.1 2006/02/03 14:01:29 nelchael Exp $
+ */
++/* Modified 2005-12-21 by Gautam Iyer <gautam@math.uchicago.edu>
++ *
++ *	1. Eliminated the "BadMatch" XError sometimes generated
++ *	2. Eliminated "flicker" seen when using a transparent shaded terminal
++ *	   while changing desktop pages.
++ */
+ 
+ #include "../config.h"
+ #include "rxvt.h"
+@@ -3740,10 +3746,22 @@
+ 	}
+ #endif
+ 
+-#ifdef TRANSPARENT		/* XXX: maybe not needed - leave in for now */
++#ifdef TRANSPARENT
++	/*
++	 * Check to see if the previous position we grabbed the background is
++	 * different from the current window position. If yes, then update
++	 * everything.
++	 */
+ 	if (r->Options & Opt_transparent)	{
+-		rxvt_check_our_parents(r);
+-		r->h->want_full_refresh = 1;
++		if( !r->bgGrabbed
++		    || r->prevPos.x != ev->x
++		    || r->prevPos.y != ev->y
++		    || r->prevPos.width != ev->width
++		    || r->prevPos.height != ev->height
++		  ) {
++			rxvt_check_our_parents(r);
++			r->h->want_full_refresh = 1;
++		}
+ 	}
+ #endif
+ }
+@@ -3782,7 +3800,9 @@
+ 	if (ev->atom != r->h->xa[XA_XROOTPMAPID])
+ 		return ;
+ 
+-	if ((r->Options & Opt_transparent) && rxvt_check_our_parents(r)) {
++	if (r->Options & Opt_transparent) {
++		r->bgGrabbed = False;
++		rxvt_check_our_parents(r);
+ 		r->h->want_full_refresh = 1;
+ 	}
+ #endif		/* TRANSPARENT */
+@@ -4549,6 +4569,14 @@
+ 		0, 0, &sx, &sy, &cr);
+ 	nw = r->szHint.width;
+ 	nh = r->szHint.height;
++
++#if DEBUG_LEVEL
++	if( sx + nw <= 0 || sx >= (int) rootw || sy + nh <= 0 || sy >= (int) rooth) {
++	    DBG_MSG( 1, (stderr, "Possible error: grabbing offscreen (%d, %d, %u, %u)\n",
++			    sx, sy, nw, nh));
++	}
++#endif
++
+ 	*nx = *ny = 0;
+ 	if (sx < 0) {
+ 		nw += sx;
+@@ -4707,8 +4735,14 @@
+ 		rootpixmap = *((Pixmap*) prop);
+ 		XFree(prop);
+ 	}
++	else r->bgGrabbed = False;
++
++	/*
++	 * Use "while" instead of "if" so we can break out if transparency
++	 * updates don't need to be performed.
++	 */
++	while (have_pixmap) {
+ 
+-	if (have_pixmap) {
+ 		/*
+ 		** Copy XROOT pixmap transparency
+ 		*/
+@@ -4716,13 +4750,21 @@
+ 		XImage*			imagetw;
+ 
+ 		/*
+-		** handle BadMatch - usually because we're outside the
+-		** pixmap. may need a delay here?
+-		*/
+-		r->h->allowedxerror = -1;
++		 * Calling get_parent_ximage when the terminal window is off
++		 * screen is pointless and generates a "Bad Match" XError while
++		 * calling XGetImage.
++		 */
++
++		if (	r->szHint.x + r->szHint.width  <= 0
++			|| r->szHint.x >= (int) wrootattr.width
++			|| r->szHint.y + r->szHint.height <= 0
++			|| r->szHint.y >= (int) wrootattr.height
++		   )
++			/* We're off screen. Don't update */
++			break;
++
+ 		imagetw = get_parent_ximage (r, rootpixmap,
+ 					wrootattr.width, wrootattr.height, &nx, &ny);
+-		r->h->allowedxerror = 0;
+ 
+ 		if (NULL == imagetw) {
+ 			if (r->h->am_transparent && r->h->am_pixmap_trans) {
+@@ -4746,10 +4788,18 @@
+ 			if ((!r->h->am_transparent || !r->h->am_pixmap_trans) &&
+ 				retvt)
+ 			*/
+-			if (retvt)
++			if (retvt) {
++				r->bgGrabbed = True;
++				r->prevPos.x = r->szHint.x;
++				r->prevPos.y = r->szHint.y;
++				r->prevPos.width = r->szHint.width;
++				r->prevPos.height = r->szHint.height;
++
+ 				have_changed = 1;
++			}
+ 			r->h->am_transparent = r->h->am_pixmap_trans = 1;
+ 		}
++		break;
+ 	}
+ 
+ 	/*
+diff -ru /tmp/mrxvt-0.4.2/src/init.c ./src/init.c
+--- /tmp/mrxvt-0.4.2/src/init.c	2005-10-07 20:07:45.000000000 -0500
++++ ./src/init.c	2005-12-21 12:57:21.000000000 -0600
+@@ -1927,6 +1927,10 @@
+ 	r->szHint.x = 0;
+ 	r->szHint.y = 0;
+ 
++#ifdef TRANSPARENT
++	r->bgGrabbed = False;
++#endif
++
+ 	/* Parse geometry */
+ 	if (r->h->rs[Rs_geometry])
+ 		flags = XParseGeometry(r->h->rs[Rs_geometry], &x, &y, &w, &h);
+diff -ru /tmp/mrxvt-0.4.2/src/rxvtlib.h ./src/rxvtlib.h
+--- /tmp/mrxvt-0.4.2/src/rxvtlib.h	2005-06-23 20:54:07.000000000 -0500
++++ ./src/rxvtlib.h	2005-12-21 12:57:21.000000000 -0600
+@@ -757,6 +757,10 @@
+ 	unsigned long   Options;
+ 	unsigned long   Options2;
+ 	XSizeHints      szHint;
++#ifdef TRANSPARENT
++	XRectangle	prevPos;	/* previous onscreen position */
++	Bool		bgGrabbed;	/* weather the bg was succesfully grabbed at prevPos */
++#endif
+ 
+ 	/* hotkeys */
+ 	hotkeys_t*		hotkeys;
diff --git a/x11-terms/mrxvt/files/xft-colorbd-0.4.2.patch b/x11-terms/mrxvt/files/xft-colorbd-0.4.2.patch
new file mode 100644
index 000000000000..a0b45f0c238f
--- /dev/null
+++ b/x11-terms/mrxvt/files/xft-colorbd-0.4.2.patch
@@ -0,0 +1,53 @@
+diff -ru /tmp/mrxvt-0.4.2-orig/src/screen.c ./src/screen.c
+--- /tmp/mrxvt-0.4.2-orig/src/screen.c	2005-06-23 23:26:55.000000000 -0500
++++ ./src/screen.c	2005-12-22 14:33:46.000000000 -0600
+@@ -3278,7 +3278,7 @@
+ 					}
+ 				}	/* if (wbyte) */
+ #else
+-			{
++			{ /* } for correct % bouncing*/
+ #endif
+ 				if (!fprop) {
+ 					/* single stepping - `normal' mode */
+@@ -3380,8 +3380,20 @@
+ 				if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_BD) &&
+ 					r->PixColors[fore] != r->PixColors[Color_BD] &&
+ 					r->PixColors[back] != r->PixColors[Color_BD]) {
+-					gcvalue.foreground = r->PixColors[Color_BD];
+-					gcmask |= GCForeground;
++# ifdef XFT_SUPPORT
++					/*
++					 * XFT won't use the colors from the GC, so we need to set
++					 * fore. Setting fore even when we're not using XFT
++					 * shouldn't make a difference, but why take a chance :)
++					 */
++					if( (r->Options & Opt_xft) && PVTS(r, page)->xftvt )
++						fore = Color_BD;
++					else
++# endif
++					{
++						gcvalue.foreground = r->PixColors[Color_BD];
++						gcmask |= GCForeground;
++					}
+ 					if (!(r->Options2 & Opt2_veryBold))
+ 						rend &= ~RS_Bold;	/* we've taken care of it */
+ 				}
+@@ -3390,8 +3402,15 @@
+ 				if (XDEPTH > 2 && ISSET_PIXCOLOR(h, Color_UL) &&
+ 					r->PixColors[fore] != r->PixColors[Color_UL] &&
+ 					r->PixColors[back] != r->PixColors[Color_UL]) {
+-					gcvalue.foreground = r->PixColors[Color_UL];
+-					gcmask |= GCForeground;
++# ifdef XFT_SUPPORT
++					if( (r->Options & Opt_xft) && PVTS(r, page)->xftvt )
++						fore = Color_UL;
++					else
++# endif
++					{
++						gcvalue.foreground = r->PixColors[Color_UL];
++						gcmask |= GCForeground;
++					}
+ 					rend &= ~RS_Uline;	/* we've taken care of it */
+ 				}
+ 			}
diff --git a/x11-terms/mrxvt/metadata.xml b/x11-terms/mrxvt/metadata.xml
index 0d93ebc2d237..63bb14456271 100644
--- a/x11-terms/mrxvt/metadata.xml
+++ b/x11-terms/mrxvt/metadata.xml
@@ -5,4 +5,7 @@
 <maintainer>
   <email>usata@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>nelchael@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-terms/mrxvt/mrxvt-0.3.13-r1.ebuild b/x11-terms/mrxvt/mrxvt-0.3.13-r1.ebuild
index 13b284b4d71a..ed54b1d266c3 100644
--- a/x11-terms/mrxvt/mrxvt-0.3.13-r1.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.3.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.3.13-r1.ebuild,v 1.4 2005/03/19 09:50:28 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.3.13-r1.ebuild,v 1.5 2006/02/03 14:01:29 nelchael Exp $
 
 inherit eutils
 
@@ -15,18 +15,22 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc-macos ~amd64 ppc alpha"
 
-RDEPEND="virtual/libc
-	virtual/x11
-	dev-libs/expat
+RDEPEND="dev-libs/expat
 	media-libs/libpng
 	media-libs/jpeg
 	truetype? ( virtual/xft
 		media-libs/fontconfig
-		media-libs/freetype )"
-#	utempter? ( sys-apps/utempter )
+		media-libs/freetype )
+	|| ( (
+			x11-libs/libX11
+			x11-libs/libXt
+			x11-libs/libXpm
+			x11-libs/libXrender )
+		virtual/x11 )"
+#      utempter? ( sys-apps/utempter )
+
 DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
+	|| ( x11-proto/xproto virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-terms/mrxvt/mrxvt-0.4.0.ebuild b/x11-terms/mrxvt/mrxvt-0.4.0.ebuild
deleted file mode 100644
index 7339ca19649b..000000000000
--- a/x11-terms/mrxvt/mrxvt-0.4.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.4.0.ebuild,v 1.4 2005/05/14 10:46:53 kloeri Exp $
-
-inherit eutils
-
-IUSE="debug truetype xgetdefault"
-#IUSE="${IUSE} utempter"
-
-DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support"
-HOMEPAGE="http://materm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/materm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc-macos ~amd64 ppc alpha"
-
-RDEPEND="virtual/libc
-	virtual/x11
-	dev-libs/expat
-	media-libs/libpng
-	media-libs/jpeg
-	truetype? ( virtual/xft
-		media-libs/fontconfig
-		media-libs/freetype )"
-#	utempter? ( sys-apps/utempter )
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-devel/automake"
-
-src_compile() {
-	local myconf
-
-	# if you want to pass any other flags, use EXTRA_ECONF.
-	if use linguas_el ; then
-		myconf="${myconf} --enable-greek"
-	fi
-	if use linguas_ja ; then
-		# --with-encoding=sjis
-		myconf="${myconf} --enable-kanji --with-encoding=eucj"
-	fi
-	if use linguas_ko ; then
-		myconf="${myconf} --enable-kr --with-encoding=kr"
-	fi
-	if use linguas_th ; then
-		myconf="${myconf} --enable-thai"
-	fi
-	if use linguas_zh_CN ; then
-		# --with-encoding=gbk
-		myconf="${myconf} --enable-gb --with-encoding=gb"
-	fi
-	if use linguas_zh_TW ; then
-		myconf="${myconf} --enable-big5 --with-encoding=big5"
-	fi
-
-	./bootstrap.sh
-
-	econf \
-		--enable-everything \
-		--enable-rxvt-scroll \
-		--enable-next-scroll \
-		--enable-xterm-scroll \
-		--enable-transparency \
-		--enable-xpm-background \
-		--enable-fading \
-		--enable-utmp \
-		--enable-wtmp \
-		--enable-mousewheel \
-		--enable-slipwheeling \
-		--enable-smart-resize \
-		--enable-ttygid \
-		--enable-256-color \
-		--enable-xim \
-		--enable-shared \
-		--enable-keepscrolling \
-		--enable-xft \
-		$(use_enable xgetdefault) \
-		$(use_enable truetype xft) \
-		$(use_enable debug) \
-		--disable-text-blink \
-		--disable-menubar \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} docdir=/usr/share/doc/${PF} install || die
-
-	dodoc AUTHORS CREDITS ChangeLog FAQ NEWS README* TODO
-}
diff --git a/x11-terms/mrxvt/mrxvt-0.4.0-r1.ebuild b/x11-terms/mrxvt/mrxvt-0.4.2.ebuild
index e8330e07d854..5b57ed0954d2 100644
--- a/x11-terms/mrxvt/mrxvt-0.4.0-r1.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.4.0-r1.ebuild,v 1.1 2005/04/23 07:34:07 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mrxvt/mrxvt-0.4.2.ebuild,v 1.1 2006/02/03 14:01:29 nelchael Exp $
 
 inherit eutils
 
@@ -9,23 +9,47 @@ IUSE="debug truetype xgetdefault menubar"
 
 DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support"
 HOMEPAGE="http://materm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/materm/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/materm/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc-macos ~amd64 ~ppc ~alpha"
 
-DEPEND="virtual/libc
-	virtual/x11
-	dev-libs/expat
+RDEPEND="dev-libs/expat
 	media-libs/libpng
 	media-libs/jpeg
 	truetype? ( virtual/xft
 		media-libs/fontconfig
-		media-libs/freetype )"
-#	utempter? ( sys-apps/utempter )
+		media-libs/freetype )
+	|| ( (
+			x11-libs/libX11
+			x11-libs/libXt
+			x11-libs/libXpm
+			x11-libs/libXrender )
+		virtual/x11 )"
+#      utempter? ( sys-apps/utempter )
+
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
+
+src_unpack() {
+
+	unpack "${A}"
+	cd "${S}"
+
+	# 2005-12-21: Eliminate flicker for transparent terminals
+	epatch "${FILESDIR}/noflicker-${PV}.patch"
+
+	# 2005-12-22: Fix bug #1337635. Use ColorBD / ColorUL with xft
+	epatch "${FILESDIR}/xft-colorbd-${PV}.patch"
+
+	# 2005-12-22: Enable hilight color for selection
+	sed -ie '99s/\/\* \(.*\) \*\//\1/' src/feature.h
+
+}
 
 src_compile() {
+
 	local myconf
 
 	# if you want to pass any other flags, use EXTRA_ECONF.
@@ -60,11 +84,14 @@ src_compile() {
 		${myconf} || die
 
 	emake || die
+
 }
 
 src_install() {
+
 	make DESTDIR=${D} docdir=/usr/share/doc/${PF} install || die
 
 	gzip -9 ${D}/usr/share/doc/${PF}/*
 	dodoc AUTHORS CREDITS ChangeLog FAQ NEWS README* TODO
+
 }