[Bump] Update x11-terms/rxvt-unicode from 9.05 to 9.06, based on current portage version

3 files changed, 104 insertions, 68 deletions

diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index b0ebe58..9f65725 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,4 +1,4 @@
 AUX scrolling-one-line.patch 440 RMD160 a796a5fb3412ba89049efa29bae52bbde2a6f80a SHA1 dc6ab953dd80a900626a0957f7a70b88d8df0931 SHA256 41714925ddec020950a00350034c28c650e671b876c3138b5535732a337e77b5
-DIST rxvt-unicode-9.05.tar.bz2 865815 RMD160 0f4343a9aa0a8b26d10c6049c1afca2cc7569fc3 SHA1 758d57a88c3521f780bcd21c70d3995f53a2f6e3 SHA256 25a85d977c39aa7da615c3b375544e09168d7a5eaddd57c98b9848ca15dd7873
-EBUILD rxvt-unicode-9.05.ebuild 1586 RMD160 00d96db472450baa8e0a06ce9874ba7b34588aac SHA1 71d453da0de824d17990029438bbb81c929bbcdc SHA256 553239f1b5ab3292d70f82b7dbfd9d69c7844cad8b6e660763b36d53fb43c6e7
+DIST rxvt-unicode-9.06.tar.bz2 869076 RMD160 ae737ed07e943303318bd81b566146d5426f36bd SHA1 df623ebdad001de534781721f8298ba1add0df2c SHA256 8ef9359c01059efd330626c6cd7b082be9bf10587f2b9fe84caa43a84aa576d1
+EBUILD rxvt-unicode-9.06.ebuild 2819 RMD160 a49d9b1e1a331176abbb2aeae9b7cfc684120244 SHA1 add6438c4718ee659924fbdf42433005fafd7999 SHA256 56433023348751c680f260db26f252bf36a923c0542530a264359118e57f5234
 MISC metadata.xml 226 RMD160 6f2bcba5e169f4219ce334fa4a3326d25c4e9955 SHA1 cafd2c6e1368c9cf70e80e3e253940a29f392f11 SHA256 1bcb550b8b5c6c67b63898ecec6fbbf0d1e78c7b21a99776057c1eae946d0215
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.05.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.05.ebuild
deleted file mode 100644
index 3b588c3..0000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.05.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-8.0.ebuild,v 1.1 2006/11/08 20:35:16 killerfox Exp $
-
-inherit 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 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="truetype perl iso14755"
-
-# see bug #115992 for modular x deps
-RDEPEND="x11-libs/libX11
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrender
-	media-libs/libafterimage
-	perl? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	local tdir=/usr/share/terminfo
-	sed -i -e \
-		"s~@TIC@ \(\$(srcdir)etc/rxvt\)~@TIC@ -o ${D}/${tdir} \1~" \
-		doc/Makefile.in
-}
-
-src_compile() {
-	econf \
-		--enable-everything \
-		$(use_enable truetype xft) \
-		$(use_enable truetype unicode3) \
-		$(use_enable truetype combining) \
-		$(use_enable perl) \
-		$(use_enable iso14755) \
-		--disable-text-blink \
-		|| 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."
-}
-
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.06.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.06.ebuild
new file mode 100644
index 0000000..52505e8
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.06.ebuild
@@ -0,0 +1,102 @@
+# 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.06.ebuild,v 1.1 2008/12/21 20:44:23 killerfox 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 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}"
+
+	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
+
+	# 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 truetype unicode3) \
+		$(use_enable truetype combining) \
+		$(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."
+}