Add character width patch thanks to Slava Gorbunov (bug #277830). Do not evaluate USE flags in subshell. Die when emake fails.

Package-Manager: portage-2.2_rc62/cvs/Linux i686

4 files changed, 154 insertions, 2 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 76df99a06c8d..2ff52f84cfb7 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.155 2010/01/29 04:48:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.156 2010/02/03 05:07:45 jer Exp $
+
+*rxvt-unicode-9.07-r1 (03 Feb 2010)
+
+  03 Feb 2010; Jeroen Roovers <jer@gentoo.org>
+  +files/rxvt-unicode-9.06-font-width.patch, +rxvt-unicode-9.07-r1.ebuild:
+  Add character width patch thanks to Slava Gorbunov (bug #277830). Do not
+  evaluate USE flags in subshell. Die when emake fails.
 
   29 Jan 2010; Jeroen Roovers <jer@gentoo.org>
   +files/rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch:
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index df460816460d..5e0c52e3f5f4 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,10 +1,12 @@
 AUX rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch 1411 RMD160 ee947f7243cc5969079f2799e7f93edccc7b699c SHA1 319016954c2c6a1b9d4a847c5c88debf3533da0b SHA256 b5c428d3a1150eca95aa4b2c67756ad12fefb7bbc6aa69e308ad011c4f8ad440
+AUX rxvt-unicode-9.06-font-width.patch 791 RMD160 c2e1a23d55376613806aec20cafc4795548be4c3 SHA1 00292f5f7e7274dbb3953410055c569fdebd8995 SHA256 f0bf83b43a8f6c599be9326859239f5bf10bd1c7c9a1f97ac9cb87086bf1500c
 AUX rxvt-unicode-9.06-glibc-2.10.patch 1380 RMD160 b333caf5b3a6441499051461bbbfa353ac8d3cf0 SHA1 0d6a3c382db068e17a25480eaf67e1a1392a90f3 SHA256 750ec3a79e5d56717cedebd6ab9aa8df9d7785c806c5d54dcf02d2c62a7798b0
 AUX rxvt-unicode-9.06-no-urgency-if-focused.diff 482 RMD160 7d0a0257209beb58751e996e822a10d372a01d7e SHA1 7da560653290f6fd653be2dda396b19961f31c06 SHA256 f518571ae6c63110cc8b49f423c1cb864399335017ca17469df5e78a2f2aabc4
 AUX rxvt-unicode-9.06-popups-hangs.patch 643 RMD160 f35a7c7044602a855c59f80919eb24723bd6f015 SHA1 c3cb2cc796243cba4916d3bfa8bf3e6ee2ef0831 SHA256 ed232e0cca9ea642ba061c1008e724fd61d3821eb1a464ba42aa404d778c5e60
 DIST rxvt-unicode-9.06.tar.bz2 869076 RMD160 ae737ed07e943303318bd81b566146d5426f36bd SHA1 df623ebdad001de534781721f8298ba1add0df2c SHA256 8ef9359c01059efd330626c6cd7b082be9bf10587f2b9fe84caa43a84aa576d1
 DIST rxvt-unicode-9.07.tar.bz2 858616 RMD160 e20d30eac61bc56deac9da11b4d049fbac3f3b66 SHA1 0e623daa15c45ba3add622277d32493a97059619 SHA256 c5a0638ca8249968065076a6f17e6e499f31fdc9050f71aae4ea85cac6aac5a3
 EBUILD rxvt-unicode-9.06-r3.ebuild 3380 RMD160 a5f747286e3702ff9c18af6a460975498b61c813 SHA1 3f8b617ffe5521c21c2f8e13a535c7e9f182a01f SHA256 9d270d9d6ca78611f68771119857b08ffeae4ad929c732df222ee24f5f9204c1
+EBUILD rxvt-unicode-9.07-r1.ebuild 3411 RMD160 51967c310da038a2efd004a0d80980d52e6e3f2c SHA1 369248ff8e11707bc99b908d2629752ec2b29f78 SHA256 2fb14ecba45f385ce7f842e1368eb56672e446c4c4ceaeffa696b761d1fd0aed
 EBUILD rxvt-unicode-9.07.ebuild 3341 RMD160 c50e04a394eccaf3094ea2735d80fea8882ea0aa SHA1 6829861519f3124e4890209a75132382b7c70725 SHA256 78a12a4d7f032c86dc57ecfb63fdfe017c1e952b64d5a1672bc7b039ca044890
-MISC ChangeLog 23574 RMD160 56c69a5d930d844b4f552c1e56764b8c4de7e6b2 SHA1 726a4e8939ad7981cb68170ca02cd76e0a981372 SHA256 7ce992fdbf69a2dbd5c36ce21be386b551ab67b43756397e1b05b8e104b37484
+MISC ChangeLog 23865 RMD160 43531acd61dd9b0ac17e9700eaba744642acdf6f SHA1 137cb2e54c0df7d64b583d676d845f20659c1054 SHA256 789b3da053734e9984c34d6912c52779ddfa6daafc467cdb7795864110394608
 MISC metadata.xml 747 RMD160 636ab1ca576fb13f2fdcf64ee5286a352ca3d714 SHA1 a85e0e39956201d64ece8ab1daa1d5eb2051fb2d SHA256 ef6564b10f56ddc26ec60d7f67490ade8a67462f428c7ea83ab6749870f4e7b9
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch
new file mode 100644
index 000000000000..659ea20cf246
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-font-width.patch
@@ -0,0 +1,21 @@
+--- src/rxvtfont.C.orig	2008-07-09 12:21:45.000000000 +0400
++++ src/rxvtfont.C	2009-10-30 14:32:53.000000000 +0300
+@@ -1195,12 +1195,14 @@
+           XGlyphInfo g;
+           XftTextExtents16 (disp, f, &ch, 1, &g);
+ 
+-          g.width -= g.x;
+-
++/*  
++ * bukind: don't use g.width as a width of a character!
++ * instead use g.xOff, see e.g.: http://keithp.com/~keithp/render/Xft.tutorial
++ */
+           int wcw = WCWIDTH (ch);
+-          if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
++          if (wcw > 1) g.xOff = g.xOff / wcw;
++          if (width < g.xOff) width = g.xOff;
+ 
+-          if (width    < g.width       ) width    = g.width;
+           if (height   < g.height      ) height   = g.height;
+           if (glheight < g.height - g.y) glheight = g.height - g.y;
+         }
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild
new file mode 100644
index 000000000000..476a0173b984
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2010 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.07-r1.ebuild,v 1.1 2010/02/03 05:07:45 jer Exp $
+
+EAPI="2"
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="rxvt clone with xft and unicode support"
+HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html"
+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 xterm-color wcwidth +vanilla"
+
+# 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 )
+	>=sys-libs/ncurses-5.7-r3"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xproto"
+
+src_prepare() {
+	if { use xterm-color || use wcwidth; }; then
+		ewarn "You enabled xterm-color or wcwidth or both."
+		ewarn "Please note that neither of them are supported by upstream."
+		ewarn "You are at your own if you run into problems."
+		ebeep 5
+	fi
+
+	local tdir=/usr/share/terminfo
+	if use xterm-color; then
+		epatch doc/urxvt-8.2-256color.patch
+		sed -e \
+			's/^\(rxvt-unicode\)/\1256/;s/colors#88/colors#256/;s/pairs#256/pairs#32767/' \
+			doc/etc/rxvt-unicode.terminfo > doc/etc/rxvt-unicode256.terminfo
+		sed -i -e \
+			"s~^\(\s\+@TIC@.*\)~\1\n\t@TIC@ -o "${D}"/${tdir} \$(srcdir)/etc/rxvt-unicode256.terminfo~" \
+			doc/Makefile.in
+	fi
+
+	# kill the rxvt-unicode terminfo file - #192083
+	sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in ||
+		die "sed failed"
+
+	use wcwidth && epatch doc/wcwidth.patch
+
+	# bug #240165
+	epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff
+
+	# ncurses will provide rxvt-unicode terminfo, so we don't install them again
+	# see bug #192083
+	#
+	# According to my tests this is not (yet?) true, so keep it prepared and
+	# disabled  until it's needed again.
+	#if has_version '<sys-libs/ncurses-5.7'; then
+	sed -i -e \
+		"s~@TIC@ \(\$(srcdir)/etc/rxvt\)~@TIC@ -o "${D}"/${tdir} \1~" \
+		doc/Makefile.in
+	#else
+	#	# Remove everything except if we have rxvt-unicode256
+	#	sed -i -e \
+	#		'/rxvt-unicode256/p;/@TIC@/d' \
+	#		doc/Makefile.in
+	#fi
+
+	# bug #263638
+	epatch "${FILESDIR}"/${PN}-9.06-popups-hangs.patch
+
+	# bug #237271
+	if ! use vanilla; then
+		ewarn "You are going to include third-party bug fixes/features."
+		ewarn "They came without any warranty and are not supported by the"
+		ewarn "Gentoo community."
+		ebeep 5
+		epatch "${FILESDIR}"/${PN}-9.05_no-MOTIF-WM-INFO.patch
+		epatch "${FILESDIR}"/${PN}-9.06-font-width.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=''
+
+	use iso14755 || myconf='--disable-iso14755'
+	use xterm-color && myconf="$myconf --enable-xterm-colors=256"
+
+	econf --enable-everything \
+		$(use_enable truetype xft) \
+		$(use_enable afterimage) \
+		$(use_enable perl) \
+		--disable-text-blink \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	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."
+}