Remove vulnerable version (still bug #219762). Marked ~hppa too.

Package-Manager: portage-2.1.6_rc2/cvs/Linux 2.6.25-gentoo-r7-JeR i686

4 files changed, 9 insertions, 40 deletions

diff --git a/x11-terms/wterm/ChangeLog b/x11-terms/wterm/ChangeLog
index 9e663e0937af..277fd85a88de 100644
--- a/x11-terms/wterm/ChangeLog
+++ b/x11-terms/wterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/wterm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/wterm/ChangeLog,v 1.23 2008/11/27 23:09:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/wterm/ChangeLog,v 1.24 2008/11/27 23:15:04 jer Exp $
+
+  27 Nov 2008; Jeroen Roovers <jer@gentoo.org> -wterm-6.2.9-r2.ebuild,
+  wterm-6.2.9-r3.ebuild:
+  Remove vulnerable version (still bug #219762). Marked ~hppa too.
 
   27 Nov 2008; Jeroen Roovers <jer@gentoo.org>
   +files/wterm-6.2.9-strip.patch, wterm-6.2.9-r3.ebuild:
diff --git a/x11-terms/wterm/Manifest b/x11-terms/wterm/Manifest
index c496ebed7d25..27ff22d8b96d 100644
--- a/x11-terms/wterm/Manifest
+++ b/x11-terms/wterm/Manifest
@@ -1,7 +1,6 @@
 AUX wterm-6.2.9-display-security-issue.patch 677 RMD160 e60dd0be8b51c95fbad982bf5e6c7f0ecb64fb1a SHA1 11582cb6351d3ffdaeb7134b3ac6f99063ebe612 SHA256 281a4052c2fd4467e0efe5fb6b8fd68ce0e6c7388bf8c310cd5756a3ef4aeb7e
 AUX wterm-6.2.9-strip.patch 346 RMD160 6e4955a3c9c8e986f04c8d9c88530939adde498f SHA1 baba0a181642f37d97e8168dd459d411f97c8428 SHA256 b44600f383320e0c6fd72b4ef0e686f629c2e9f56eb03b58c52282b0c62a869e
 DIST wterm-6.2.9.tar.gz 316773 RMD160 954c6264998456e90a62e25089fb5adc3924b2a8 SHA1 e3624d44c70f143ec77a6089ce4074357a9c3ae8 SHA256 a389e2c92c6040685b4d74bfb554f07b457c946b72acfae5ff1639096e798839
-EBUILD wterm-6.2.9-r2.ebuild 922 RMD160 e5dfb755f3c3aa48262d2211ed3c20ac7149f177 SHA1 3d0292806ef7ba3c9b61d6ea502aeff5bc8ffc63 SHA256 613068667d3fdcfc9666f0c7d80fc7869e3d27ea3714658364711d58bd0f3493
-EBUILD wterm-6.2.9-r3.ebuild 1094 RMD160 a208e7ae9c24aa00b8b1f633f0f8bdddd8eb814b SHA1 993fe76ec7dc12169fdade994c879b0ec0c17942 SHA256 d021b570c4945853a9aeb919abe3f552a9a5e7a87bc88bb7cbc3d51613c148da
-MISC ChangeLog 3049 RMD160 9e5fc19b5cc6a9a3f243aef264b7cb96f197ca94 SHA1 b7d64b51c3fade2a7cd172a736666b6a4bed9e9d SHA256 011cf736a117ab61cadb1d126d9590a9e88c683048a84ccba7a76faa7c73cdcf
+EBUILD wterm-6.2.9-r3.ebuild 1100 RMD160 c4dc9f29d5b3d406a81ab4e5a1a8354ea32be01a SHA1 c6578d1e5e986583556eb8585930af1fdaabdd22 SHA256 112c433a5a3d7bc611845cb979c6a416cf4941e81d68528d83a6382b701764d6
+MISC ChangeLog 3213 RMD160 802cec32c4391e94805153d4a2e486e7a2662e0f SHA1 817082a6ca27f36b90ebe1aedf6d50c81913ebeb SHA256 dd4918e7d59b96c73f7140865347a64eed8aa8537c9d550634625cc749cc9f53
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
diff --git a/x11-terms/wterm/wterm-6.2.9-r2.ebuild b/x11-terms/wterm/wterm-6.2.9-r2.ebuild
deleted file mode 100644
index 89869d363023..000000000000
--- a/x11-terms/wterm/wterm-6.2.9-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/wterm/wterm-6.2.9-r2.ebuild,v 1.16 2007/07/22 05:55:58 dberkholz Exp $
-
-DESCRIPTION="A fork of rxvt patched for fast transparency and a NeXT scrollbar"
-HOMEPAGE="http://wterm.org"
-SRC_URI="mirror://sourceforge/wterm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE="cjk"
-
-DEPEND="x11-libs/libXpm
-	>=x11-wm/windowmaker-0.80.1"
-
-src_compile() {
-	local myconf
-
-	myconf="--enable-menubar --enable-graphics --with-term=rxvt \
-		--enable-transparency --enable-next-scroll --enable-xpm-background"
-
-	use cjk && myconf="$myconf --enable-kanji"
-
-	econf ${myconf} || die "configure failed"
-	emake || die "parallel make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	insinto /usr/share/pixmaps
-	doins *.xpm *.tiff
-}
diff --git a/x11-terms/wterm/wterm-6.2.9-r3.ebuild b/x11-terms/wterm/wterm-6.2.9-r3.ebuild
index 3eb9263ec0ea..e33c63dfb5e0 100644
--- a/x11-terms/wterm/wterm-6.2.9-r3.ebuild
+++ b/x11-terms/wterm/wterm-6.2.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/wterm/wterm-6.2.9-r3.ebuild,v 1.6 2008/11/27 23:09:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/wterm/wterm-6.2.9-r3.ebuild,v 1.7 2008/11/27 23:15:04 jer Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wterm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~hppa ppc sparc x86"
 IUSE="cjk"
 
 DEPEND="x11-libs/libXpm