5 files changed, 9 insertions, 27 deletions
diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index ed155b804798..816b61091653 100644
--- a/www-client/lynx/ChangeLog
+++ b/www-client/lynx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/lynx
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.6 2005/10/12 12:22:25 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.7 2005/10/12 12:25:01 seemant Exp $
+
+  12 Oct 2005; Seemant Kulleen <seemant@gentoo.org>
+  -files/lynx-2.8.4.1c-gentoo.patch, -files/lynx-2.8.4.1d-gentoo.patch,
+  -files/lynx-2.8.4a-LYStrings.c-gentoo.patch, lynx-2.8.5.ebuild:
+  remove old crufty patches as well
 
   12 Oct 2005; Seemant Kulleen <seemant@gentoo.org> -lynx-2.8.4.1c.ebuild,
   -lynx-2.8.4.1d.ebuild, -lynx-2.8.4.1d-r1.ebuild:
diff --git a/www-client/lynx/files/lynx-2.8.4.1c-gentoo.patch b/www-client/lynx/files/lynx-2.8.4.1c-gentoo.patch
deleted file mode 100644
index 0d28397d1b0c..000000000000
--- a/www-client/lynx/files/lynx-2.8.4.1c-gentoo.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/LYStrings.c Wed May 29 14:41:43 2002
-+++ src/LYStrings.c~        Wed May 29 14:41:21 2002
-@@ -1,3 +1,4 @@
-+#include <term.h>
- #include <HTUtils.h>
- #include <HTCJK.h>
- #include <UCAux.h>
-
diff --git a/www-client/lynx/files/lynx-2.8.4.1d-gentoo.patch b/www-client/lynx/files/lynx-2.8.4.1d-gentoo.patch
deleted file mode 100644
index 0d28397d1b0c..000000000000
--- a/www-client/lynx/files/lynx-2.8.4.1d-gentoo.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/LYStrings.c Wed May 29 14:41:43 2002
-+++ src/LYStrings.c~        Wed May 29 14:41:21 2002
-@@ -1,3 +1,4 @@
-+#include <term.h>
- #include <HTUtils.h>
- #include <HTCJK.h>
- #include <UCAux.h>
-
diff --git a/www-client/lynx/files/lynx-2.8.4a-LYStrings.c-gentoo.patch b/www-client/lynx/files/lynx-2.8.4a-LYStrings.c-gentoo.patch
deleted file mode 100644
index 563fb881b97a..000000000000
--- a/www-client/lynx/files/lynx-2.8.4a-LYStrings.c-gentoo.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- LYStrings.c Wed May 29 14:41:43 2002
-+++ LYStrings.c~        Wed May 29 14:41:21 2002
-@@ -1,3 +1,4 @@
-+#include <term.h>
- #include <HTUtils.h>
- #include <HTCJK.h>
- #include <UCAux.h>
-
diff --git a/www-client/lynx/lynx-2.8.5.ebuild b/www-client/lynx/lynx-2.8.5.ebuild
index 0e0b644c8ce8..09c8c13f2c8e 100644
--- a/www-client/lynx/lynx-2.8.5.ebuild
+++ b/www-client/lynx/lynx-2.8.5.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.5.ebuild,v 1.4 2005/08/12 16:32:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.5.ebuild,v 1.5 2005/10/12 12:25:01 seemant Exp $
 
 inherit eutils flag-o-matic
 
 #MY_PV=${PV/.1d/rel.1}
+MY_P=${P/-/}
 DESCRIPTION="An excellent console-based web browser with ssl support"
 HOMEPAGE="http://lynx.browser.org/"
-SRC_URI="ftp://lynx.isc.org/${PN}2.8.5/${PN}${PV}.tar.bz2"
+SRC_URI="ftp://lynx.isc.org/${MY_P}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"