[rxvt-unicode] version bump, bug #298952

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 130 insertions, 2 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 510b4e5e99ac..f5724b12615e 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,11 @@
 # 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.144 2009/12/13 15:35:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.145 2009/12/31 00:45:14 wired Exp $
+
+*rxvt-unicode-9.07 (31 Dec 2009)
+
+  31 Dec 2009; Alex Alexander <wired@gentoo.org> +rxvt-unicode-9.07.ebuild:
+  version bump, bug #298952
 
   13 Dec 2009; Brent Baude <ranger@gentoo.org> rxvt-unicode-9.05-r3.ebuild:
   Marking rxvt-unicode-9.05-r3 ppc64 for bug 260199
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 30f9bf5f903f..56c7965d5702 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -5,6 +5,7 @@ AUX rxvt-unicode-9.06-popups-hangs.patch 643 RMD160 f35a7c7044602a855c59f80919eb
 AUX rxvt-unicode_no-urgency-if-focused.diff 314 RMD160 844495b221e0c7efba52172ce230a5102ef6cdf4 SHA1 9e55a4248c949a6c7d383a89e183b508b388102f SHA256 e21f57673e64a03ed6385c8c78b23054dc196a07578f3e262b5aa87fabc9bf25
 DIST rxvt-unicode-9.05.tar.bz2 865815 RMD160 0f4343a9aa0a8b26d10c6049c1afca2cc7569fc3 SHA1 758d57a88c3521f780bcd21c70d3995f53a2f6e3 SHA256 25a85d977c39aa7da615c3b375544e09168d7a5eaddd57c98b9848ca15dd7873
 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.05-r2.ebuild 2343 RMD160 325bbd4740605a30c32eec2507d7f6ca5e97efd3 SHA1 7d397f088966c6dcef43df3ac1df3398c6da0070 SHA256 10c938829afdd9c228bf7f40bd6d997daa748fe60dddb8a84d3f191bc5d8945c
 EBUILD rxvt-unicode-9.05-r3.ebuild 2686 RMD160 a4d752c1035b25a43edc8cd33114cc9dbd86b488 SHA1 86631959dfcc43b3d6400b86ef5b42f2e204704b SHA256 52a4498b649e1118807f0d93fe3155be05736353864fb16b59241515a5aaaa6b
 EBUILD rxvt-unicode-9.05.ebuild 1586 RMD160 a9609b208760571b811e3dff4716156d73fc745e SHA1 dc1e63f08297a2120d220620a2b4e0a238fb9fe6 SHA256 440575b0f21ca7ad71c7a2cbd23905185c1b9fc405a4307c689b81b491a480a6
@@ -12,5 +13,6 @@ EBUILD rxvt-unicode-9.06-r1.ebuild 2975 RMD160 1d0f6f29f97e2176bb9e342d832f31270
 EBUILD rxvt-unicode-9.06-r2.ebuild 3241 RMD160 e6349c9737e3b75704904e32cc4828b1af2cb07f SHA1 fe3f2beadfde0c28e49840edcf444e59fdd2a3e7 SHA256 06a5752cf7eb19a3cd5d936e922b0bcb323665826e2543d7599d95dc78feeb4d
 EBUILD rxvt-unicode-9.06-r3.ebuild 3396 RMD160 5d9bcfa4f6470b5414ed49391ca7482bf4036195 SHA1 57ae07d122391a6ead919c5efe42ef955d2f845c SHA256 b79ee0a2485bc234e9546ce060c7878fee4977c353640f91f354b97a550bd23c
 EBUILD rxvt-unicode-9.06.ebuild 2815 RMD160 b018826ba9a55f38d6350f2d67a162343c9ba34e SHA1 0fb0447da104917deaf641445632214380aa2cf5 SHA256 e7359d543fbc2f488782d825d18f8766f1d61e2d64f42672f74ba025cd56c5b0
-MISC ChangeLog 22082 RMD160 485c57b889bf77037bdeeba1002e26584351c22b SHA1 6ba062ee35237c645a778c6056702bd69c42ae6e SHA256 d59727c291016384c156e78b06f6dace251c918766e31eb5a37cc06070d7f18b
+EBUILD rxvt-unicode-9.07.ebuild 3341 RMD160 c50e04a394eccaf3094ea2735d80fea8882ea0aa SHA1 6829861519f3124e4890209a75132382b7c70725 SHA256 78a12a4d7f032c86dc57ecfb63fdfe017c1e952b64d5a1672bc7b039ca044890
+MISC ChangeLog 22220 RMD160 b2a46eec23db07ff0e1d3e47e94856fa921e1a30 SHA1 b00ceaf58b82113271d301c56dd64c2659e14437 SHA256 34b5fc38f9d05c852efd9239241c2377a959757cd0ff63dfc0705e264118cf4f
 MISC metadata.xml 747 RMD160 636ab1ca576fb13f2fdcf64ee5286a352ca3d714 SHA1 a85e0e39956201d64ece8ab1daa1d5eb2051fb2d SHA256 ef6564b10f56ddc26ec60d7f67490ade8a67462f428c7ea83ab6749870f4e7b9
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.07.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.07.ebuild
new file mode 100644
index 000000000000..20f0e4a698be
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.07.ebuild
@@ -0,0 +1,121 @@
+# 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.07.ebuild,v 1.1 2009/12/31 00:45:14 wired 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
+	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
+
+	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."
+}