Fixing home page bug 290472 , Fixing urgency hint, patch thanks to Jan Hruban <hrubi13@gmail.com> bug 274129

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 135 insertions, 12 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 4c09a343dfdb..d4d779d2ccc7 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.129 2009/09/12 03:25:59 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.130 2009/10/25 18:09:06 vostorga Exp $
+
+*rxvt-unicode-9.06-r1 (25 Oct 2009)
+
+  25 Oct 2009; Víctor Ostorga <vostorga@gentoo.org>
+  +rxvt-unicode-9.06-r1.ebuild,
+  +files/rxvt-unicode-9.06-no-urgency-if-focused.diff:
+  Fixing home page bug 290472 , Fixing urgency hint, patch thanks to Jan
+  Hruban <hrubi13@gmail.com> bug #274129 
 
   12 Sep 2009; Víctor Ostorga <vostorga@gentoo.org>
   -files/scrolling-one-line.patch:
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 6ea3422203b0..26564fe8d0ab 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch 988 RMD160 d95d34836266f97bc4bdd18376a3a4f2b01d7e7c SHA1 de0ef44bdf799c7a41469f1082f7981348379faa SHA256 7ae0f24b7b7db3e8a4d8133a8c2e5daf185f69ab0bfb5a82d11d10e6fee7a9f1
 AUX rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch 1411 RMD160 ee947f7243cc5969079f2799e7f93edccc7b699c SHA1 319016954c2c6a1b9d4a847c5c88debf3533da0b SHA256 b5c428d3a1150eca95aa4b2c67756ad12fefb7bbc6aa69e308ad011c4f8ad440
 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_no-urgency-if-focused.diff 314 RMD160 844495b221e0c7efba52172ce230a5102ef6cdf4 SHA1 9e55a4248c949a6c7d383a89e183b508b388102f SHA256 e21f57673e64a03ed6385c8c78b23054dc196a07578f3e262b5aa87fabc9bf25
 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
@@ -12,13 +10,7 @@ EBUILD rxvt-unicode-9.02-r1.ebuild 1610 RMD160 b91b03ef38c033cf25400276c7f71aa33
 EBUILD rxvt-unicode-9.05-r2.ebuild 2343 RMD160 325bbd4740605a30c32eec2507d7f6ca5e97efd3 SHA1 7d397f088966c6dcef43df3ac1df3398c6da0070 SHA256 10c938829afdd9c228bf7f40bd6d997daa748fe60dddb8a84d3f191bc5d8945c
 EBUILD rxvt-unicode-9.05-r3.ebuild 2752 RMD160 84cbc070a4d34e2f73433cd434f8a1832227f575 SHA1 7b6d51e10666a402223ed98c8930b3019f1a5850 SHA256 9f310e518b737d64df78826be22446a0cba661bcd861d70c34fc7ae02896b9dd
 EBUILD rxvt-unicode-9.05.ebuild 1586 RMD160 a9609b208760571b811e3dff4716156d73fc745e SHA1 dc1e63f08297a2120d220620a2b4e0a238fb9fe6 SHA256 440575b0f21ca7ad71c7a2cbd23905185c1b9fc405a4307c689b81b491a480a6
+EBUILD rxvt-unicode-9.06-r1.ebuild 2908 RMD160 50e205e033a400f41fef0adaebe6729fce8ccf6f SHA1 6bef8722875500394a7812de2e3d51f2102d10b4 SHA256 2efb1f88267f6c45bfde950546125e2f645cb42b6e75a0329c41c2f6c45c2810
 EBUILD rxvt-unicode-9.06.ebuild 2809 RMD160 c11fba5c410024c7ffa259bfb728137d7aa4bcce SHA1 bf2727ab1724fa781b492498cbf989bfe08f742b SHA256 3236259241d5355e5e74363a84dc8f27b967e44a1d009ce1799ac9d731ff5647
-MISC ChangeLog 19816 RMD160 36fc66f7c3d3e17b5a7787eb995ad90709747df5 SHA1 22cd49dfbae173f77b5fcd9b0ae1a6e361e6cd44 SHA256 3dcb0082cc332ab3173b5fd40610136b8ed6e3d5f9fe1eac738833c890bd172e
+MISC ChangeLog 20109 RMD160 6d3aa798a685cfd82a896b48a7e4f3ec55007432 SHA1 cffe95ce565adce91b686465190beb3b855a347d SHA256 46bc19d28cf318334204a8eb1f994b6cf89471aba4d17e8a8a5b73d22cd302dd
 MISC metadata.xml 547 RMD160 c358245b66d51fca6aee10b37383fdc275726cd8 SHA1 c5cb8ee1bde54afb4a9549781023934ce741521c SHA256 a500a674b2b6fa67c59ea65706475d5fe900c15fb3a69d089c4517b6efe0d2eb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrkf1oACgkQV3J2n04Eauyg5QCgxvelmLnjYiezJO5lKHZA0lbn
-ADgAn08laCJb7NPZXr6jrhYFiMJalNBx
-=GK5L
------END PGP SIGNATURE-----
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff
new file mode 100644
index 000000000000..81a3646d4859
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff
@@ -0,0 +1,16 @@
+diff -NrU5 rxvt-unicode-9.06.original/src/screen.C rxvt-unicode-9.06/src/screen.C
+--- rxvt-unicode-9.06.original/src/screen.C	2009-10-25 18:16:16.000000000 -0600
++++ rxvt-unicode-9.06/src/screen.C	2009-10-25 18:17:53.000000000 -0600
+@@ -1927,11 +1927,11 @@
+ #  endif
+     XMapWindow (dpy, parent[0]);
+ # endif
+ 
+ # if ENABLE_FRILLS
+-  if (option (Opt_urgentOnBell))
++  if (option (Opt_urgentOnBell) && !focus)
+     set_urgency (1);
+ # endif
+ 
+   if (option (Opt_visualBell))
+     {
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.06-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.06-r1.ebuild
new file mode 100644
index 000000000000..3aaf3f90ed0f
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.06-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2009 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.06-r1.ebuild,v 1.1 2009/10/25 18:09:06 vostorga Exp $
+
+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 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	#Bug 270694
+	epatch "${FILESDIR}/${PN}-9.06-glibc-2.10.patch"
+
+	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
+
+	use wcwidth && epatch doc/wcwidth.patch
+
+	# bug #240165
+	epatch "${FILESDIR}"/${P}-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
+
+	eautoreconf
+}
+
+src_compile() {
+	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}
+
+	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."
+}