Adding 256color and widechar useflags to apply upstream patches. Fixes bug 224787.

(Portage version: 2.2_rc9/cvs/Linux 2.6.26.5 i686)

3 files changed, 91 insertions, 10 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 7d84dff4e30b..e449fe7f6443 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.113 2008/08/21 22:33:19 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.114 2008/09/23 22:53:34 yngwin Exp $
+
+*rxvt-unicode-9.05-r1 (23 Sep 2008)
+
+  23 Sep 2008; Ben de Groot <yngwin@gentoo.org> metadata.xml,
+  +rxvt-unicode-9.05-r1.ebuild:
+  Adding 256color and widechar useflags to apply upstream patches. Fixes bug
+  224787.
 
   21 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index 743b1ba34360..98e9c3b2d8b7 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>killerfox@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name='afterimage'>Enable support for
-			<pkg>media-libs/libafterimage</pkg></flag>
-		<flag name='iso14755'>Enable ISO-14755 support</flag>
-	</use>
+  <herd>no-herd</herd>
+  <maintainer>
+    <email>killerfox@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name='afterimage'>Enable support for
+      <pkg>media-libs/libafterimage</pkg>
+    </flag>
+    <flag name='iso14755'>Enable ISO-14755 support</flag>
+    <flag name='256color'>Enable 256 color display, instead of just 88</flag>
+    <flag name='widechar'>Enable the wide character width patch from upstream</flag>
+  </use>
 </pkgmetadata>
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.05-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.05-r1.ebuild
new file mode 100644
index 000000000000..f1116d1f503c
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.05-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.05-r1.ebuild,v 1.1 2008/09/23 22:53:34 yngwin Exp $
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/"
+SRC_URI="http://dist.schmorp.de/rxvt-unicode/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="truetype perl iso14755 afterimage 256color widechar"
+
+# see bug #115992 for modular x deps
+RDEPEND="x11-libs/libX11
+	x11-libs/libXft
+	afterimage? ( media-libs/libafterimage )
+	x11-libs/libXrender
+	perl? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	local tdir=/usr/share/terminfo
+	use 256color && epatch doc/urxvt-8.2-256color.patch
+	use widechar && epatch doc/wcwidth.patch
+	sed -i -e \
+		"s~@TIC@ \(\$(srcdir)/etc/rxvt\)~@TIC@ -o ${D}/${tdir} \1~" \
+		doc/Makefile.in
+	eautoreconf
+}
+
+src_compile() {
+	myconf=''
+
+	use iso14755 || myconf='--disable-iso14755'
+
+	econf \
+		--enable-everything \
+		$(use_enable truetype xft) \
+		$(use_enable afterimage) \
+		$(use_enable perl) \
+		$(use_enable 256color xterm-colors=256) \
+		--disable-text-blink \
+		${myconf} \
+		|| die
+
+	emake || die
+
+	sed -i \
+		-e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \
+		"${S}"/doc/rxvt-tabbed || die "tabs sed failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc README.FAQ Changes
+	cd "${S}"/doc
+	dodoc README* changes.txt etc/* rxvt-tabbed
+}
+
+pkg_postinst() {
+	einfo "urxvt now always uses TERM=rxvt-unicode so that the"
+	einfo "upstream-supplied terminfo files can be used."
+}