New version. Modular X deps, see bug #115992.

(Portage version: 2.1_pre3-r1)

4 files changed, 102 insertions, 12 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index 52442f246bbf..039f49578a26 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/rxvt-unicode
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.63 2005/12/27 23:23:18 ciaranm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.64 2006/01/03 07:30:21 ciaranm Exp $
+
+*rxvt-unicode-6.2 (03 Jan 2006)
+
+  03 Jan 2006; Ciaran McCreesh <ciaranm@gentoo.org>
+  +rxvt-unicode-6.2.ebuild:
+  New version. Modular X deps, see bug #115992.
 
 *rxvt-unicode-6.1 (27 Dec 2005)
 
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index e1eb662fb654..6cce93d76b2d 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 301780e04520a94a4653b7a41d5149f3 ChangeLog 9999
 MD5 ff186f769724f65b45dcedf2b9e7c9a3 files/digest-rxvt-unicode-3.0 69
 MD5 0454b0e411ee7798e273a94fcabdc823 files/digest-rxvt-unicode-4.0 69
@@ -8,6 +5,7 @@ MD5 749b453f3a41c4bcc2e8706cad32f568 files/digest-rxvt-unicode-5.1 69
 MD5 b7923e2725d925a7ae5210a144a3eeaa files/digest-rxvt-unicode-5.3 69
 MD5 c494bb5f1ed7426e67a3661e93145df2 files/digest-rxvt-unicode-5.9 69
 MD5 ba98ed310154234b15ccbd0cfa55833a files/digest-rxvt-unicode-6.1 69
+MD5 4cdacb664837de9776d72fce3a9d2ce7 files/digest-rxvt-unicode-6.2 69
 MD5 27f475fce3946d48a23f36e0279a978c files/rxvt-unicode-2.3-font-fix.diff 431
 MD5 8d13934dc747f15f11334bd642c342cd files/rxvt-unicode-3.9-64bit.patch 632
 MD5 63548e76ee03f6dc4fee9e2239453ca1 files/rxvt-unicode-4.0-64bit.patch 728
@@ -18,10 +16,4 @@ MD5 4a59732c305c41e1347aa674334213a1 rxvt-unicode-5.1.ebuild 1571
 MD5 a85edd99140d01a457111d8d28f52bf9 rxvt-unicode-5.3.ebuild 1919
 MD5 1a8601605d766c3a35c45b70bf4b64d0 rxvt-unicode-5.9.ebuild 1982
 MD5 83f2dc0a5b5e318e99e9a0d04de4ba0b rxvt-unicode-6.1.ebuild 1982
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDsczyLLFUmVNQ7rkRAsVfAKDRh3yVG0UZ1K05npAqyfbOW4LY0QCffg6B
-QatTUmG+YIrCrgE3CqrIdKs=
-=Ze5g
------END PGP SIGNATURE-----
+MD5 cba58c710521ecd395cc603003239000 rxvt-unicode-6.2.ebuild 1865
diff --git a/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-6.2 b/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-6.2
new file mode 100644
index 000000000000..d8c153db20e1
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-6.2
@@ -0,0 +1 @@
+MD5 0b1366ae8383c7d7252cd3096f4586c5 rxvt-unicode-6.2.tar.bz2 852805
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-6.2.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-6.2.ebuild
new file mode 100644
index 000000000000..4fbb097da21b
--- /dev/null
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-6.2.ebuild
@@ -0,0 +1,91 @@
+# 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-6.2.ebuild,v 1.1 2006/01/03 07:30:21 ciaranm 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"
+IUSE="xgetdefault"
+
+# see bug #115992 for modular x deps
+RDEPEND="
+	|| (
+		(
+			x11-libs/libX11
+			x11-libs/libXft
+			x11-libs/libXpm
+			x11-libs/libXrender
+		)
+		virtual/x11
+	)
+	dev-lang/perl"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/libtool
+	|| (
+		(
+			x11-proto/xproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	local tdir=/usr/share/terminfo
+	sed -i -e \
+		"s~@TIC@ \(etc/rxvt\)~@TIC@ -o ${D}/${tdir} \1~" \
+		doc/Makefile.in
+	sed -i -e \
+		"s:-g -O3:${CFLAGS}:" \
+		configure
+}
+
+src_compile() {
+	econf \
+		--enable-everything \
+		--enable-rxvt-scroll \
+		--enable-next-scroll \
+		--enable-xterm-scroll \
+		--enable-transparency \
+		--enable-xpm-background \
+		--enable-fading \
+		--enable-utmp \
+		--enable-wtmp \
+		--enable-mousewheel \
+		--enable-slipwheeling \
+		--enable-smart-resize \
+		--enable-ttygid \
+		--enable-256-color \
+		--enable-24bit \
+		--enable-xim \
+		--enable-shared \
+		--enable-keepscrolling \
+		--enable-xft \
+		`use_enable xgetdefault` \
+		--disable-text-blink \
+		--disable-iso14755 \
+		--disable-menubar || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc README.FAQ Changes
+	cd ${S}/doc
+	dodoc README* changes.txt etc/*
+}
+
+pkg_postinst() {
+	einfo "urxvt now always uses TERM=rxvt-unicode so that the"
+	einfo "upstream-supplied terminfo files can be used."
+}