Revision bump to include patch again (bug #237271), clean up a bit, move to EAPI="2".

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

3 files changed, 129 insertions, 2 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index d112c855ae0d..4b1ae69797c5 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,12 @@
 # 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.133 2009/10/25 21:46:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.134 2009/10/25 22:21:11 jer Exp $
+
+*rxvt-unicode-9.06-r2 (25 Oct 2009)
+
+  25 Oct 2009; Jeroen Roovers <jer@gentoo.org> +rxvt-unicode-9.06-r2.ebuild:
+  Revision bump to include patch again (bug #237271), clean up a bit, move
+  to EAPI="2".
 
   25 Oct 2009; Jeroen Roovers <jer@gentoo.org> -rxvt-unicode-9.02-r1.ebuild,
   -files/rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch:
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index de1efbe0d934..18515b934c3f 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -9,6 +9,7 @@ EBUILD rxvt-unicode-9.05-r2.ebuild 2343 RMD160 325bbd4740605a30c32eec2507d7f6ca5
 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 2970 RMD160 522251d2571eaec491d847dd992f621f55ecbe47 SHA1 d8c5027238d7ded07fda8ad488f162c820bf7526 SHA256 0e3c9ffe9bcbdb32fd702665fc41f07347d30ee94cadf4199373a9c45a6765f9
+EBUILD rxvt-unicode-9.06-r2.ebuild 3241 RMD160 b75ba8dcd9a38fe83e6dfa3ca6182e9bd7a94b7a SHA1 93a6b51d12a74ea132649a7a6d7f692ea1ea7d71 SHA256 9b06d4995d0083701978d84d6243ab0df353d03a29f3d7c9b7245538ffb29b62
 EBUILD rxvt-unicode-9.06.ebuild 2809 RMD160 c11fba5c410024c7ffa259bfb728137d7aa4bcce SHA1 bf2727ab1724fa781b492498cbf989bfe08f742b SHA256 3236259241d5355e5e74363a84dc8f27b967e44a1d009ce1799ac9d731ff5647
-MISC ChangeLog 20587 RMD160 f203798ba6cdb12dde4376da28721043b3db1863 SHA1 0a213c98446fc2033c7e0c9caeba85c237a88241 SHA256 933ffe3172d9adae56b668b6ceb1d9cd37dc7a158ef37de25b9268d6e5773675
+MISC ChangeLog 20792 RMD160 0d3d6f554b2c73d92d34c3a8820a33e2a1ddab86 SHA1 eb9fa7e363bc2fd9bf28456409cfa458df2a73f1 SHA256 3ef2e0551fa1d1d6323476fd5058da9444e8799cea3cc3202c309987d6504591
 MISC metadata.xml 562 RMD160 847a5526e4f89397974fb55c6b521ef6a4e195a6 SHA1 6a2a69ea5461ab5832f7b8452d9dccbce1d526e4 SHA256 f4a2c379c3cbab060bc50e1b248f987c06bcb7ea46a17698d4eedb91efdc1f03
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.06-r2.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.06-r2.ebuild
new file mode 100644
index 000000000000..ebe4ebd68a16
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.06-r2.ebuild
@@ -0,0 +1,120 @@
+# 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-r2.ebuild,v 1.1 2009/10/25 22:21:11 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 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xproto"
+
+src_prepare() {
+	#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
+
+	# bug #263638
+	epatch "${FILESDIR}"/${P}-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."
+}