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

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.26.5 i686

4 files changed, 94 insertions, 22 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/Manifest b/x11-terms/rxvt-unicode/Manifest
index de41230b7f36..9e199345fe09 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch 988 RMD160 d95d34836266f97bc4bdd18376a3a4f2b01d7e7c SHA1 de0ef44bdf799c7a41469f1082f7981348379faa SHA256 7ae0f24b7b7db3e8a4d8133a8c2e5daf185f69ab0bfb5a82d11d10e6fee7a9f1
 AUX scrolling-one-line.patch 440 RMD160 a796a5fb3412ba89049efa29bae52bbde2a6f80a SHA1 dc6ab953dd80a900626a0957f7a70b88d8df0931 SHA256 41714925ddec020950a00350034c28c650e671b876c3138b5535732a337e77b5
 DIST rxvt-unicode-9.02.tar.bz2 862299 RMD160 72caf4a06ea3b32d1bbab3a5cd1fee4189571867 SHA1 f58a851ab4bf2da60a926a4885749302e73a92ed SHA256 234b9a3e3f88c4984b1e909f8028638fc3b61d801d8afaa9cd08154b1a480a31
 DIST rxvt-unicode-9.05.tar.bz2 865815 RMD160 0f4343a9aa0a8b26d10c6049c1afca2cc7569fc3 SHA1 758d57a88c3521f780bcd21c70d3995f53a2f6e3 SHA256 25a85d977c39aa7da615c3b375544e09168d7a5eaddd57c98b9848ca15dd7873
 EBUILD rxvt-unicode-9.02-r1.ebuild 1610 RMD160 b91b03ef38c033cf25400276c7f71aa33b6aa573 SHA1 d9366cd345df68b85c854d8cc971961cc899dd12 SHA256 df461ea77a1fc9b0463bcce1116eadf73564325de494a33d1458c479ccfebe23
+EBUILD rxvt-unicode-9.05-r1.ebuild 1775 RMD160 542882d36b1810aa59a486a2cb40de9655e3a85a SHA1 814cd40f3496adbf145d0a896fdbd305797d8a64 SHA256 e2bc679b5446364530188ad6823de1db618de6549d57bd0f1b0e222543bf324b
 EBUILD rxvt-unicode-9.05.ebuild 1596 RMD160 655d73a3570b47c46c4a00ca321f54935c622636 SHA1 ad0611a7e878403f920685fd7cb4d1e59a9fdc98 SHA256 f51921006c18f79cb0674bb5213db40f147571888795ec99282373be6566549c
-MISC ChangeLog 17227 RMD160 bc6ea3ad55de87fef06e95244306673de95a2b3f SHA1 d3dea0bdfaa00e413e906bc8af5f61a670fb3952 SHA256 d6da511e0ef5d951b01ee15b4e6d19d92551b52cce728eb663c295ff4567e6bb
-MISC metadata.xml 390 RMD160 64a442d4f1eeb07717ee430a660b51ddc567892c SHA1 4541b56a10729a7f1f32798117cfe7bad43c9ea2 SHA256 9bcf6104f0bc22a9ba8d6fdbc5792945037e5646c88f3ae97b249fcad4878ad1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkit7TQACgkQoeSe8B0zEfzEoQCeP1/DsNBC3oCLriR4eicz9C5n
-mmkAniDCbTZBseQ7TSkCLDb71vSRIDJt
-=JjxW
------END PGP SIGNATURE-----
+MISC ChangeLog 17446 RMD160 d0b8a968521c1ed2dcae1d700b77ce905bcb2d66 SHA1 514fd999f4220dc5fd1833f1275166724b86a292 SHA256 ea99464565a4db7e33e7d3817f541996f81b3882944720351314f7c87f6e1316
+MISC metadata.xml 572 RMD160 429b7980619b0a2869d9a9525385d227a88bebe5 SHA1 97cae14e396d09d8c68e15146a1431441dc9856a SHA256 11f1ea560a6236bc72698ca58ee42f8bbbbba45455796d7d31fabf4603b3c99c
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."
+}