Changed darwin patch so it can be applied unconditional. Marked 2.8.5-r2 stable (bug #112213)

(Portage version: 2.0.51.22-r3)

7 files changed, 24 insertions, 16 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index ffb5594dde77..9a3ea0a6cb80 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.14 2005/11/13 03:12:37 hparker Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.15 2005/11/13 10:26:01 grobian Exp $
+
+  13 Nov 2005; Fabian Groffen <grobian@gentoo.org>
+  files/lynx-2.8.5-darwin.patch, lynx-2.8.5-r1.ebuild, lynx-2.8.5-r2.ebuild:
+  Changed darwin patch so it can be applied unconditional.  Marked 2.8.5-r2
+  stable (bug #112213)
 
   13 Nov 2005; Homer Parker <hparker@gentoo.org> lynx-2.8.5-r2.ebuild:
   Stable on amd64 fixing bug 112213
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 9558cd109040..98b11b51fe7c 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,7 +1,7 @@
-MD5 acaa86fdf4e340e1180ce324110007cd metadata.xml 224
-MD5 7c76d97be05bb0119c9942853fe86ac4 lynx-2.8.5-r1.ebuild 1840
-MD5 48910f45f318ac65033b2907029fa088 lynx-2.8.5-r2.ebuild 1957
+MD5 c4854ad586a8d7acac0648d7bf6dda37 lynx-2.8.5-r1.ebuild 1819
+MD5 4cb1493813f1a0c14ce0c1d5659deff4 lynx-2.8.5-r2.ebuild 1935
 MD5 b66d4d4aa9af5ca53269f4eb9b275cb2 ChangeLog 7599
-MD5 62a95dce16ec74f3ecb3bc3df818fbbc files/lynx-2.8.5-darwin.patch 652
-MD5 a1e9c5cf250af6de957e1986fc815ac7 files/digest-lynx-2.8.5-r1 140
-MD5 3609542671c4be7e881627bc5ca33c4f files/digest-lynx-2.8.5-r2 135
+MD5 acaa86fdf4e340e1180ce324110007cd metadata.xml 224
+MD5 69f5b66452909cba98afabb58a6e826b files/digest-lynx-2.8.5-r1 140
+MD5 3dde8ca3c7a3d6f5c26ebd480aa298f8 files/digest-lynx-2.8.5-r2 135
+MD5 a041d139e8868dac8d23fd879f31809a files/lynx-2.8.5-darwin.patch 687
diff --git a/www-client/lynx/files/digest-lynx-2.8.5-r1 b/www-client/lynx/files/digest-lynx-2.8.5-r1
index 2db84096d545..676896fdeb86 100644
--- a/www-client/lynx/files/digest-lynx-2.8.5-r1
+++ b/www-client/lynx/files/digest-lynx-2.8.5-r1
@@ -1,2 +1,2 @@
-MD5 ee3fd13a06677b24ee3bc3dbc1fd4795 lynx-2.8.5-CAN-2005-3120.patch.bz2 3584
 MD5 d1e5134e5d175f913c16cb6768bc30eb lynx2.8.5.tar.bz2 2177287
+MD5 ee3fd13a06677b24ee3bc3dbc1fd4795 lynx-2.8.5-CAN-2005-3120.patch.bz2 3584
diff --git a/www-client/lynx/files/digest-lynx-2.8.5-r2 b/www-client/lynx/files/digest-lynx-2.8.5-r2
index bbf03cf88679..80bcb1bc3244 100644
--- a/www-client/lynx/files/digest-lynx-2.8.5-r2
+++ b/www-client/lynx/files/digest-lynx-2.8.5-r2
@@ -1,2 +1,2 @@
-MD5 0dbf511e3680e8c7c179d21db27c8fba lynx-2.8.5-gentoo-0.1.tar.bz2 5017
 MD5 d1e5134e5d175f913c16cb6768bc30eb lynx2.8.5.tar.bz2 2177287
+MD5 0dbf511e3680e8c7c179d21db27c8fba lynx-2.8.5-gentoo-0.1.tar.bz2 5017
diff --git a/www-client/lynx/files/lynx-2.8.5-darwin.patch b/www-client/lynx/files/lynx-2.8.5-darwin.patch
index bd382a7f2c23..f48d466d679e 100644
--- a/www-client/lynx/files/lynx-2.8.5-darwin.patch
+++ b/www-client/lynx/files/lynx-2.8.5-darwin.patch
@@ -1,12 +1,15 @@
 diff -ur lynx2-8-5/WWW/Library/Implementation/HTTCP.c lynx2-8-5-patched/WWW/Library/Implementation/HTTCP.c
 --- lynx2-8-5/WWW/Library/Implementation/HTTCP.c	2004-01-25 09:51:04.000000000 +0800
 +++ lynx2-8-5-patched/WWW/Library/Implementation/HTTCP.c	2005-08-12 12:32:50.000000000 +0800
-@@ -1326,7 +1326,7 @@
+@@ -1326,7 +1326,11 @@
  	    if (phost->h_length != sizeof soc_in->sin_addr) {
  		HTAlwaysAlert(host, gettext("Address length looks invalid"));
  	    }
--	    memcpy((void *)&soc_in->sin_addr, phost->h_addr, phost->h_length);
++#ifndef __APPLE__
+ 	    memcpy((void *)&soc_in->sin_addr, phost->h_addr, phost->h_length);
++#else
 +	    memcpy((void *)&soc_in->sin_addr, phost->h_addr_list[ 0 ], phost->h_length);
++#endif
  #endif /* VMS && CMU_TCP */
  	}
  #endif /* _WINDOWS_NSL */
diff --git a/www-client/lynx/lynx-2.8.5-r1.ebuild b/www-client/lynx/lynx-2.8.5-r1.ebuild
index 66268be3b04a..575e3b85c2c1 100644
--- a/www-client/lynx/lynx-2.8.5-r1.ebuild
+++ b/www-client/lynx/lynx-2.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2005/11/13 01:45:16 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.5-r1.ebuild,v 1.3 2005/11/13 10:26:01 grobian Exp $
 
 inherit eutils flag-o-matic
 
@@ -28,7 +28,7 @@ S=${WORKDIR}/${PN}${PV//./-}
 src_unpack() {
 	unpack ${A}; cd ${S}
 	epatch ${WORKDIR}/${P}-CAN-${SEC_V}.patch
-	use userland_Darwin && epatch ${FILESDIR}/${P}-darwin.patch
+	epatch "${FILESDIR}/${P}"-darwin.patch
 }
 
 src_compile() {
diff --git a/www-client/lynx/lynx-2.8.5-r2.ebuild b/www-client/lynx/lynx-2.8.5-r2.ebuild
index 7fae3cfe683d..ba291e88bf7a 100644
--- a/www-client/lynx/lynx-2.8.5-r2.ebuild
+++ b/www-client/lynx/lynx-2.8.5-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.5 2005/11/13 03:12:37 hparker Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.5-r2.ebuild,v 1.6 2005/11/13 10:26:01 grobian Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://lynx.isc.org/${MY_P}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc-macos ppc64 ~s390 sparc x86"
 IUSE="ssl nls ipv6"
 
 DEPEND="sys-libs/ncurses
@@ -30,7 +30,7 @@ PATCHDIR=${WORKDIR}/gentoo/patches
 src_unpack() {
 	unpack ${A}; cd ${S}
 	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-	use userland_Darwin && epatch ${FILESDIR}/${P}-darwin.patch
+	epatch "${FILESDIR}/${P}"-darwin.patch
 }
 
 src_compile() {