Remove old.

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

4 files changed, 6 insertions, 99 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index d1bc06e36472..d112c855ae0d 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,10 @@
 # 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.132 2009/10/25 21:40:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.133 2009/10/25 21:46:37 jer Exp $
+
+  25 Oct 2009; Jeroen Roovers <jer@gentoo.org> -rxvt-unicode-9.02-r1.ebuild,
+  -files/rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch:
+  Remove old.
 
   25 Oct 2009; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Become maintainer.
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 86f138c1e7d3..de1efbe0d934 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,17 +1,14 @@
-AUX rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch 988 RMD160 d95d34836266f97bc4bdd18376a3a4f2b01d7e7c SHA1 de0ef44bdf799c7a41469f1082f7981348379faa SHA256 7ae0f24b7b7db3e8a4d8133a8c2e5daf185f69ab0bfb5a82d11d10e6fee7a9f1
 AUX rxvt-unicode-9.05_no-MOTIF-WM-INFO.patch 1411 RMD160 ee947f7243cc5969079f2799e7f93edccc7b699c SHA1 319016954c2c6a1b9d4a847c5c88debf3533da0b SHA256 b5c428d3a1150eca95aa4b2c67756ad12fefb7bbc6aa69e308ad011c4f8ad440
 AUX rxvt-unicode-9.06-glibc-2.10.patch 1380 RMD160 b333caf5b3a6441499051461bbbfa353ac8d3cf0 SHA1 0d6a3c382db068e17a25480eaf67e1a1392a90f3 SHA256 750ec3a79e5d56717cedebd6ab9aa8df9d7785c806c5d54dcf02d2c62a7798b0
 AUX rxvt-unicode-9.06-no-urgency-if-focused.diff 482 RMD160 7d0a0257209beb58751e996e822a10d372a01d7e SHA1 7da560653290f6fd653be2dda396b19961f31c06 SHA256 f518571ae6c63110cc8b49f423c1cb864399335017ca17469df5e78a2f2aabc4
 AUX rxvt-unicode-9.06-popups-hangs.patch 643 RMD160 f35a7c7044602a855c59f80919eb24723bd6f015 SHA1 c3cb2cc796243cba4916d3bfa8bf3e6ee2ef0831 SHA256 ed232e0cca9ea642ba061c1008e724fd61d3821eb1a464ba42aa404d778c5e60
 AUX rxvt-unicode_no-urgency-if-focused.diff 314 RMD160 844495b221e0c7efba52172ce230a5102ef6cdf4 SHA1 9e55a4248c949a6c7d383a89e183b508b388102f SHA256 e21f57673e64a03ed6385c8c78b23054dc196a07578f3e262b5aa87fabc9bf25
-DIST rxvt-unicode-9.02.tar.bz2 862299 RMD160 72caf4a06ea3b32d1bbab3a5cd1fee4189571867 SHA1 f58a851ab4bf2da60a926a4885749302e73a92ed SHA256 234b9a3e3f88c4984b1e909f8028638fc3b61d801d8afaa9cd08154b1a480a31
 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
-EBUILD rxvt-unicode-9.02-r1.ebuild 1610 RMD160 b91b03ef38c033cf25400276c7f71aa33b6aa573 SHA1 d9366cd345df68b85c854d8cc971961cc899dd12 SHA256 df461ea77a1fc9b0463bcce1116eadf73564325de494a33d1458c479ccfebe23
 EBUILD rxvt-unicode-9.05-r2.ebuild 2343 RMD160 325bbd4740605a30c32eec2507d7f6ca5e97efd3 SHA1 7d397f088966c6dcef43df3ac1df3398c6da0070 SHA256 10c938829afdd9c228bf7f40bd6d997daa748fe60dddb8a84d3f191bc5d8945c
 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.ebuild 2809 RMD160 c11fba5c410024c7ffa259bfb728137d7aa4bcce SHA1 bf2727ab1724fa781b492498cbf989bfe08f742b SHA256 3236259241d5355e5e74363a84dc8f27b967e44a1d009ce1799ac9d731ff5647
-MISC ChangeLog 20439 RMD160 a9b3c706246c662e3d4c61745cdc8ed99eab5015 SHA1 e328647ce9ddea250f58a44dd2a3cb5f1194eec8 SHA256 d86149e07b142c11e7d75781da559f234ea45f2f82612090e0973102ded807d1
+MISC ChangeLog 20587 RMD160 f203798ba6cdb12dde4376da28721043b3db1863 SHA1 0a213c98446fc2033c7e0c9caeba85c237a88241 SHA256 933ffe3172d9adae56b668b6ceb1d9cd37dc7a158ef37de25b9268d6e5773675
 MISC metadata.xml 562 RMD160 847a5526e4f89397974fb55c6b521ef6a4e195a6 SHA1 6a2a69ea5461ab5832f7b8452d9dccbce1d526e4 SHA256 f4a2c379c3cbab060bc50e1b248f987c06bcb7ea46a17698d4eedb91efdc1f03
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch
deleted file mode 100644
index 6bcfb5cf6111..000000000000
--- a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN rxvt-unicode-9.02.orig/src/init.C rxvt-unicode-9.02/src/init.C
---- rxvt-unicode-9.02.orig/src/init.C	2008-05-04 20:16:26.000000000 +0200
-+++ rxvt-unicode-9.02/src/init.C	2008-05-04 20:24:14.000000000 +0200
-@@ -372,15 +372,16 @@
-    * Open display, get options/resources and create the window
-    */
- 
--  if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
--    rs[Rs_display_name] = ":0";
-+  rs[Rs_display_name] = getenv ("DISPLAY");
- 
-   get_options (r_argc, r_argv);
- 
--  if (!(display = displays.get (rs[Rs_display_name])))
-+  if (!rs[Rs_display_name] || !(display = displays.get (rs[Rs_display_name])))
-     {
-       free (r_argv);
--      rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
-+      rxvt_fatal ("can't open display %s, aborting.\n", 
-+                  (rs[Rs_display_name] ? rs[Rs_display_name] : 
-+                   "as no -display option given and DISPLAY not set"));
-     }
- 
-   // using a local pointer decreases code size a lot
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.02-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.02-r1.ebuild
deleted file mode 100644
index f3006d162c12..000000000000
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.02-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.02-r1.ebuild,v 1.6 2008/05/05 20:19:41 maekke 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 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="truetype perl iso14755"
-
-# see bug #115992 for modular x deps
-RDEPEND="x11-libs/libX11
-	x11-libs/libXft
-	media-libs/libafterimage
-	x11-libs/libXrender
-	perl? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	local tdir=/usr/share/terminfo
-
-	# Fix CVE-2008-1142
-	epatch "${FILESDIR}/${P}-CVE-2008-1142-DISPLAY.patch"
-
-	sed -i -e \
-		"s~@TIC@ \(\$(srcdir)/etc/rxvt\)~@TIC@ -o ${D}/${tdir} \1~" \
-		doc/Makefile.in
-}
-
-src_compile() {
-	myconf=''
-
-	use iso14755 || myconf='--disable-iso14755'
-
-	econf \
-		--enable-everything \
-		$(use_enable truetype xft) \
-		$(use_enable perl) \
-		--disable-text-blink \
-		${myconf} \
-		|| 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."
-}