Bump, fix some deps, and remove some older versions. See bug #62418 for dep change details.

14 files changed, 61 insertions, 269 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index c4668bdb79ee..644474046b29 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.31 2004/09/09 22:14:28 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.32 2004/09/28 22:10:47 latexer Exp $
+
+*rxvt-unicode-4.0 (28 Sep 2004)
+
+  28 Sep 2004; <peter@gentoo.org> +files/rxvt-unicode-4.0-64bit.patch,
+  -rxvt-unicode-2.8.ebuild, -rxvt-unicode-2.9.ebuild,
+  -rxvt-unicode-3.1.ebuild, -rxvt-unicode-3.2.ebuild, rxvt-unicode-3.6.ebuild,
+  rxvt-unicode-3.9.ebuild, +rxvt-unicode-4.0.ebuild:
+  Bump, fix a few deps, and do some cleanup of older versions. See bug #62418
+  for dep change info.
 
   10 Sep 2004; Danny van Dyk <kugelfang@gentoo.org>
   +files/rxvt-unicode-3.9-64bit.patch, rxvt-unicode-3.9.ebuild:
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 5374477fb18f..b31666b7f8ed 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,22 +1,17 @@
-MD5 09af2075d6ea3cc5902eede4e27f828e ChangeLog 5070
-MD5 b5865f551fa6dd21658e0f8349638c9f metadata.xml 223
-MD5 538d894e6bb5adfd404015c2624f0597 rxvt-unicode-2.8.ebuild 1746
-MD5 dd7783dab44124a913cf8dd2ac09534e rxvt-unicode-2.9.ebuild 1746
+MD5 6f1dbb31c9aba059913fd489463df9d6 rxvt-unicode-4.0.ebuild 1576
+MD5 bad3082934e90ac4e5827b6ccecc3249 rxvt-unicode-3.9.ebuild 1575
+MD5 65fb40f42e5f98c3c88f0ef39e221213 rxvt-unicode-3.6.ebuild 1791
+MD5 e53017437823f5bf1dd9b0abc1d08e61 rxvt-unicode-3.5.ebuild 1812
 MD5 48eca4a12e5bb5a4047a097e7b2b051a rxvt-unicode-3.0.ebuild 1750
-MD5 b87136829a1f48de2b6b2f45a89f86fa rxvt-unicode-3.1.ebuild 1760
-MD5 0f1b5dd6eb175d1a51dc1206b6c2badd rxvt-unicode-3.2.ebuild 1767
-MD5 61d3db4c57892eb22b72281094c5f10c rxvt-unicode-3.9.ebuild 1577
+MD5 4df71836ce6b85dd67136b512a674b6c ChangeLog 5460
+MD5 b5865f551fa6dd21658e0f8349638c9f metadata.xml 223
 MD5 ba48f98971da8a8d9477976666fb77d1 rxvt-unicode-2.4.ebuild 1738
-MD5 e53017437823f5bf1dd9b0abc1d08e61 rxvt-unicode-3.5.ebuild 1812
-MD5 fd1bfbc87ed0b73d7dca6982be1c37e4 rxvt-unicode-3.6.ebuild 1792
-MD5 5d300db864f1b5c28562993846079708 files/digest-rxvt-unicode-2.8 69
-MD5 3e08af820a82d571916267f4f593c774 files/digest-rxvt-unicode-2.9 69
+MD5 f468485a662d35d7b2fbfe9b22ad32f3 files/digest-rxvt-unicode-2.4 69
 MD5 ff186f769724f65b45dcedf2b9e7c9a3 files/digest-rxvt-unicode-3.0 69
-MD5 41e6ce880d3784adc34681eb77a3d34f files/digest-rxvt-unicode-3.1 69
-MD5 45ce1eb545e9e36005eb4f9a39edd899 files/digest-rxvt-unicode-3.2 69
 MD5 fc0075daf912b2b1eb57d346f2586b0b files/digest-rxvt-unicode-3.5 69
-MD5 f468485a662d35d7b2fbfe9b22ad32f3 files/digest-rxvt-unicode-2.4 69
-MD5 8d13934dc747f15f11334bd642c342cd files/rxvt-unicode-3.9-64bit.patch 632
-MD5 27f475fce3946d48a23f36e0279a978c files/rxvt-unicode-2.3-font-fix.diff 431
 MD5 3e1fa0c7b57da107c46b141485c8f5bf files/digest-rxvt-unicode-3.6 69
 MD5 5a26c4b51ccba9e485dcdc057c1576ff files/digest-rxvt-unicode-3.9 69
+MD5 0454b0e411ee7798e273a94fcabdc823 files/digest-rxvt-unicode-4.0 69
+MD5 63548e76ee03f6dc4fee9e2239453ca1 files/rxvt-unicode-4.0-64bit.patch 728
+MD5 8d13934dc747f15f11334bd642c342cd files/rxvt-unicode-3.9-64bit.patch 632
+MD5 27f475fce3946d48a23f36e0279a978c files/rxvt-unicode-2.3-font-fix.diff 431
diff --git a/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-2.8 b/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-2.8
deleted file mode 100644
index c09551e1993c..000000000000
--- a/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca1cc199f52cf4c722470d8752dbc7f5 rxvt-unicode-2.8.tar.bz2 761506
diff --git a/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-2.9 b/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-2.9
deleted file mode 100644
index f1fa32fe4c31..000000000000
--- a/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-2.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0e5d58d652d9cb5492530d826db3d940 rxvt-unicode-2.9.tar.bz2 775846
diff --git a/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-3.1 b/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-3.1
deleted file mode 100644
index d3e784279025..000000000000
--- a/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 72695ff1beb8d95e6b72c645b1079461 rxvt-unicode-3.1.tar.bz2 775743
diff --git a/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-3.2 b/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-3.2
deleted file mode 100644
index bce6649402ae..000000000000
--- a/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad5427cfabde8a43bd06213c63f776ed rxvt-unicode-3.2.tar.bz2 776200
diff --git a/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-4.0 b/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-4.0
new file mode 100644
index 000000000000..e50a8dd9be3d
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/digest-rxvt-unicode-4.0
@@ -0,0 +1 @@
+MD5 d2a9505ab50f79e7f65bbdfe675cdd58 rxvt-unicode-4.0.tar.bz2 830300
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-4.0-64bit.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-4.0-64bit.patch
new file mode 100644
index 000000000000..cd3e77dd6e7d
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-4.0-64bit.patch
@@ -0,0 +1,14 @@
+diff -aur rxvt-unicode-4.0-orig/src/screen.C rxvt-unicode-4.0/src/screen.C
+--- rxvt-unicode-4.0-orig/src/screen.C	2004-09-08 01:54:01.000000000 -0400
++++ rxvt-unicode-4.0/src/screen.C	2004-09-28 17:51:38.010741648 -0400
+@@ -3531,7 +3531,9 @@
+   else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
+     {
+       XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
+-                       (8 * sizeof (Time)), PropModeReplace,
++      /* This patch allows selecting text w/ the mouse on 64bit systems.
++                       (8 * sizeof (Time)), PropModeReplace, */
++		       (32), PropModeReplace,
+                        (unsigned char *)&selection_time, 1);
+       ev.property = rq.property;
+     }
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-2.8.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-2.8.ebuild
deleted file mode 100644
index 720476ba34bd..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-2.8.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-2.8.ebuild,v 1.6 2004/09/02 16:47:28 pvdabeel Exp $
-
-IUSE="xgetdefault"
-
-DESCRIPTION="rxvt clone with XFT and Unicode support"
-HOMEPAGE="http://www.sourceforge.net/projects/rxvt-unicode/"
-SRC_URI="http://rxvt-unicode-dist.plan9.de/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~amd64 ppc"
-
-DEPEND="virtual/libc
-	virtual/x11"
-
-src_compile() {
-
-	local term
-	if [ -n "${RXVT_TERM}" ] ; then
-		term="${RXVT_TERM}"
-	else
-		term="rxvt"
-	fi
-
-	econf \
-		--enable-everything \
-		--enable-rxvt-scroll \
-		--enable-next-scroll \
-		--enable-xterm-scroll \
-		--enable-transparency \
-		--enable-xpm-background \
-		--enable-utmp \
-		--enable-wtmp \
-		--enable-mousewheel \
-		--enable-slipwheeling \
-		--enable-smart-resize \
-		--enable-ttygid \
-		--enable-256-color \
-		--enable-xim \
-		--enable-shared \
-		--enable-keepscrolling \
-		--enable-xft \
-		--with-term=${term} \
-		--with-term=rxvt \
-		`use_enable xgetdefault` \
-		--disable-menubar || die
-
-	emake || die
-}
-
-src_install() {
-
-	einstall mandir=${D}/usr/share/man/man1 || die
-
-	dodoc README.unicode Changes
-	cd ${S}/doc
-	dodoc README* changes.txt FAQ BUGS TODO etc/*
-}
-
-pkg_postinst() {
-
-	einfo
-	einfo "If you want to change default TERM variable other than rxvt,"
-	einfo "set RXVT_TERM environment variable and then emerge rxvt-unicode."
-	einfo "Especially, if you use rxvt under monochrome X you might need to run"
-	einfo "\t RXVT_TERM=rxvt-basic emerge rxvt-unicode"
-	einfo "otherwise curses based program will not work."
-	ewarn
-	ewarn "${PN} has renamed its binaries to urxvt, urxvtd, and urxvtc!"
-	ewarn
-}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-2.9.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-2.9.ebuild
deleted file mode 100644
index 388188a05117..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-2.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-2.9.ebuild,v 1.5 2004/09/02 16:47:28 pvdabeel Exp $
-
-IUSE="xgetdefault"
-
-DESCRIPTION="rxvt clone with XFT and Unicode support"
-HOMEPAGE="http://www.sourceforge.net/projects/rxvt-unicode/"
-SRC_URI="http://rxvt-unicode-dist.plan9.de/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 sparc ~amd64 ppc"
-
-DEPEND="virtual/libc
-	virtual/x11"
-
-src_compile() {
-
-	local term
-	if [ -n "${RXVT_TERM}" ] ; then
-		term="${RXVT_TERM}"
-	else
-		term="rxvt"
-	fi
-
-	econf \
-		--enable-everything \
-		--enable-rxvt-scroll \
-		--enable-next-scroll \
-		--enable-xterm-scroll \
-		--enable-transparency \
-		--enable-xpm-background \
-		--enable-utmp \
-		--enable-wtmp \
-		--enable-mousewheel \
-		--enable-slipwheeling \
-		--enable-smart-resize \
-		--enable-ttygid \
-		--enable-256-color \
-		--enable-xim \
-		--enable-shared \
-		--enable-keepscrolling \
-		--enable-xft \
-		--with-term=${term} \
-		--with-term=rxvt \
-		`use_enable xgetdefault` \
-		--disable-menubar || die
-
-	emake || die
-}
-
-src_install() {
-
-	einstall mandir=${D}/usr/share/man/man1 || die
-
-	dodoc README.unicode Changes
-	cd ${S}/doc
-	dodoc README* changes.txt FAQ BUGS TODO etc/*
-}
-
-pkg_postinst() {
-
-	einfo
-	einfo "If you want to change default TERM variable other than rxvt,"
-	einfo "set RXVT_TERM environment variable and then emerge rxvt-unicode."
-	einfo "Especially, if you use rxvt under monochrome X you might need to run"
-	einfo "\t RXVT_TERM=rxvt-basic emerge rxvt-unicode"
-	einfo "otherwise curses based program will not work."
-	ewarn
-	ewarn "${PN} has renamed its binaries to urxvt, urxvtd, and urxvtc!"
-	ewarn
-}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-3.2.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-3.2.ebuild
deleted file mode 100644
index f17017a6bbc4..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-3.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-3.2.ebuild,v 1.3 2004/09/02 16:47:28 pvdabeel Exp $
-
-IUSE="xgetdefault"
-
-DESCRIPTION="rxvt clone with XFT and Unicode support"
-HOMEPAGE="http://www.sourceforge.net/projects/rxvt-unicode/"
-SRC_URI="http://rxvt-unicode-dist.plan9.de/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~mips ~amd64 ppc"
-
-DEPEND="virtual/libc
-	virtual/x11
-	app-text/yodl"
-
-src_compile() {
-	local term
-	if [ -n "${RXVT_TERM}" ] ; then
-		term="${RXVT_TERM}"
-	else
-		term="rxvt"
-	fi
-
-	econf \
-		--enable-everything \
-		--enable-rxvt-scroll \
-		--enable-next-scroll \
-		--enable-xterm-scroll \
-		--enable-transparency \
-		--enable-xpm-background \
-		--enable-utmp \
-		--enable-wtmp \
-		--enable-mousewheel \
-		--enable-slipwheeling \
-		--enable-smart-resize \
-		--enable-ttygid \
-		--enable-256-color \
-		--enable-xim \
-		--enable-shared \
-		--enable-keepscrolling \
-		--enable-xft \
-		--with-term=${term} \
-		--with-term=rxvt \
-		`use_enable xgetdefault` \
-		--disable-menubar || die
-
-	emake || die
-}
-
-src_install() {
-
-	einstall mandir=${D}/usr/share/man/man1 || die
-
-	dodoc README.unicode Changes
-	cd ${S}/doc
-	dodoc README* changes.txt FAQ BUGS TODO etc/*
-}
-
-pkg_postinst() {
-
-	einfo
-	einfo "If you want to change default TERM variable other than rxvt,"
-	einfo "set RXVT_TERM environment variable and then emerge rxvt-unicode."
-	einfo "Especially, if you use rxvt under monochrome X you might need to run"
-	einfo "\t RXVT_TERM=rxvt-basic emerge rxvt-unicode"
-	einfo "otherwise curses based program will not work."
-	ewarn
-	ewarn "${PN} has renamed its binaries to urxvt, urxvtd, and urxvtc!"
-	ewarn
-}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-3.6.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-3.6.ebuild
index bafd5b827f06..3b3650a6d060 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-3.6.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-3.6.ebuild,v 1.2 2004/09/02 16:47:28 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-3.6.ebuild,v 1.3 2004/09/28 22:10:47 latexer Exp $
 
 IUSE="xgetdefault"
 
@@ -14,7 +14,7 @@ KEYWORDS="~x86 ~sparc ~mips ~amd64 ppc"
 
 DEPEND="virtual/libc
 	virtual/x11
-	app-text/yodl"
+	dev-lang/perl"
 
 src_compile() {
 	local term
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-3.9.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-3.9.ebuild
index 230b6d9110b7..6cab12b90895 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-3.9.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-3.9.ebuild,v 1.3 2004/09/09 22:14:28 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-3.9.ebuild,v 1.4 2004/09/28 22:10:47 latexer Exp $
 
 inherit 64-bit eutils
 
@@ -16,7 +16,7 @@ KEYWORDS="~x86 ~sparc ~mips ~amd64 ppc"
 
 DEPEND="virtual/libc
 	virtual/x11
-	app-text/yodl"
+	dev-lang/perl"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-3.1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-4.0.ebuild
index c8b0484134be..fe584ee11275 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-3.1.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-4.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-3.1.ebuild,v 1.4 2004/09/02 16:47:28 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-4.0.ebuild,v 1.1 2004/09/28 22:10:47 latexer Exp $
+
+inherit 64-bit eutils
 
 IUSE="xgetdefault"
 
@@ -10,20 +12,23 @@ SRC_URI="http://rxvt-unicode-dist.plan9.de/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~mips ppc"
+KEYWORDS="~x86 ~sparc ~mips ~amd64 ~ppc"
 
 DEPEND="virtual/libc
 	virtual/x11
-	app-text/yodl"
+	dev-lang/perl"
 
-src_compile() {
-	local term
-	if [ -n "${RXVT_TERM}" ] ; then
-		term="${RXVT_TERM}"
-	else
-		term="rxvt"
-	fi
+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
+	64-bit && epatch ${FILESDIR}/${P}-64bit.patch
+}
 
+src_compile() {
 	econf \
 		--enable-everything \
 		--enable-rxvt-scroll \
@@ -31,6 +36,7 @@ src_compile() {
 		--enable-xterm-scroll \
 		--enable-transparency \
 		--enable-xpm-background \
+		--enable-fading \
 		--enable-utmp \
 		--enable-wtmp \
 		--enable-mousewheel \
@@ -42,32 +48,22 @@ src_compile() {
 		--enable-shared \
 		--enable-keepscrolling \
 		--enable-xft \
-		--with-term=${term} \
-		--with-term=rxvt \
 		`use_enable xgetdefault` \
+		--disable-text-blink \
 		--disable-menubar || die
 
 	emake || die
 }
 
 src_install() {
-
-	einstall mandir=${D}/usr/share/man/man1 || die
+	make DESTDIR=${D} install || die
 
 	dodoc README.unicode Changes
 	cd ${S}/doc
-	dodoc README* changes.txt FAQ BUGS TODO etc/*
+	dodoc README* changes.txt BUGS TODO etc/*
 }
 
 pkg_postinst() {
-
-	einfo
-	einfo "If you want to change default TERM variable other than rxvt,"
-	einfo "set RXVT_TERM environment variable and then emerge rxvt-unicode."
-	einfo "Especially, if you use rxvt under monochrome X you might need to run"
-	einfo "\t RXVT_TERM=rxvt-basic emerge rxvt-unicode"
-	einfo "otherwise curses based program will not work."
-	ewarn
-	ewarn "${PN} has renamed its binaries to urxvt, urxvtd, and urxvtc!"
-	ewarn
+	einfo "urxvt now always uses TERM=rxvt-unicode so that the"
+	einfo "upstream-supplied terminfo files can be used."
 }