depend adjustment

5 files changed, 11 insertions, 92 deletions

diff --git a/net-www/elinks/ChangeLog b/net-www/elinks/ChangeLog
index d4e10379c587..919c49849c5f 100644
--- a/net-www/elinks/ChangeLog
+++ b/net-www/elinks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/elinks
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/elinks/ChangeLog,v 1.8 2003/06/27 21:36:19 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/elinks/ChangeLog,v 1.9 2003/09/15 14:26:13 seemant Exp $
+
+  15 Sep 2003; Seemant Kulleen <seemant@gentoo.org> elinks-0.4.1.ebuild,
+  elinks-0.4.2.ebuild:
+  changed the lua dependency to be on the 4.0 branch, as elinks can't read the
+  5.0 branch. Thanks to: jmw@operamail.com in bug #27504
 
   27 Jun 2003; Christian Birchinger <joker@gentoo.org> elinks-0.4.2.ebuild:
   Marked stable on x86
diff --git a/net-www/elinks/Manifest b/net-www/elinks/Manifest
index 7a08b88cf639..d3a29e65630d 100644
--- a/net-www/elinks/Manifest
+++ b/net-www/elinks/Manifest
@@ -1,5 +1,3 @@
-MD5 6c604f6e7d887016d032c7990828824c ChangeLog 1206
-MD5 8d65e9a4067f9d18afa2b66b8066f406 elinks-0.4.1.ebuild 2654
-MD5 98db7e43fe2937771b0942a215e4aa59 elinks-0.4.2.ebuild 2774
-MD5 9297ee25a7411630b8d6299afde4b077 files/digest-elinks-0.4.1 123
+MD5 ab295b4b2501fe32200f617ef6b84b7f elinks-0.4.2.ebuild 2773
+MD5 dbcfff12dcd7a6fbcb2d39d441d942a0 ChangeLog 1441
 MD5 197f5b6299b8a88d767c58726add73a9 files/digest-elinks-0.4.2 129
diff --git a/net-www/elinks/elinks-0.4.1.ebuild b/net-www/elinks/elinks-0.4.1.ebuild
deleted file mode 100644
index 7a33c016dc0e..000000000000
--- a/net-www/elinks/elinks-0.4.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/elinks/elinks-0.4.1.ebuild,v 1.7 2003/09/06 01:54:08 msterret Exp $
-
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz"
-SRC_URI="http://elinks.or.cz/download/${P}.tar.bz2
-	mirror://gentoo/${PN}.conf.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~alpha ~sparc"
-
-DEPEND="virtual/glibc
-	>=sys-apps/bzip2-1.0.2*
-	>=dev-libs/expat-1.95.4*
-	>=sys-apps/portage-2.0.45-r3
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	X? ( >=x11-base/xfree-4.2.1* )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	lua? ( >=dev-lang/lua-4.0 )
-	gpm? ( >=sys-libs/ncurses-5.2* >=sys-libs/gpm-1.20.0-r5 )"
-
-RDEPEND="virtual/glibc
-	>=sys-apps/bzip2-1.0.2*
-	>=dev-libs/expat-1.95.4*
-	>=sys-apps/gzip-1.3.3
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	lua? ( >=dev-lang/lua-4.0 )
-	gpm? ( >=sys-libs/ncurses-5.2* >=sys-libs/gpm-1.20.0-r5 )
-	X? ( >=x11-base/xfree-4.2.1* )"
-
-IUSE="gpm zlib ssl ipv6 X nls lua"
-
-src_compile() {
-	if ! use nls; then
-		# Build with only english support
-		echo 'english' > intl/index.txt
-		cd intl && ./gen-intl && cd ${S}
-	fi
-
-	# NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
-	# As GNUTLS is not yet 100% stable and its support in ELinks is not so well
-	# tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
-
-	econf	`use_with gpm` \
-		`use_with zlib` \
-		`use_with ssl openssl` \
-		`use_with X x` \
-		`use_enable ipv6` \
-		`use_with lua` \
-		--enable-leds || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	dobin src/elinks
-	doman elinks*.[0-9]
-
-	insopts -m 644 ; insinto /etc/elinks
-	doins ${WORKDIR}/elinks.conf
-	newins contrib/keybind-full.conf keybind-full.sample
-	newins contrib/keybind.conf keybind.conf.sample
-
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
-	docinto contrib ; dodoc contrib/{README,completion.tcsh,colws.diff,elinks[-.]vim*}
-	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
-	docinto contrib/conv ; dodoc contrib/conv/*.*
-}
-
-pkg_postinst() {
-	einfo "This ebuild provides a default config for Elinks."
-	einfo "Please check /etc/elinks/elinks.conf"
-	echo
-	einfo "You may want to convert your html.cfg and links.cfg of Links or older Elinks versions"
-	einfo "to the new Elinks elinks.conf using /usr/share/doc/${P}/contrib/conv/conf-links2elinks.pl"
-	echo
-	einfo "Please have a look at /etc/elinks/keybind-full.sample and"
-	einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
-}
diff --git a/net-www/elinks/elinks-0.4.2.ebuild b/net-www/elinks/elinks-0.4.2.ebuild
index ed6bc2a716e2..925e9dcd16e2 100644
--- a/net-www/elinks/elinks-0.4.2.ebuild
+++ b/net-www/elinks/elinks-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/elinks/elinks-0.4.2.ebuild,v 1.4 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/elinks/elinks-0.4.2.ebuild,v 1.5 2003/09/15 14:26:13 seemant Exp $
 
 IUSE="gpm zlib ssl ipv6 X nls lua"
 
@@ -20,7 +20,7 @@ DEPEND="virtual/glibc
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	X? ( >=x11-base/xfree-4.2.1* )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
-	lua? ( >=dev-lang/lua-4.0 )
+	lua? ( =dev-lang/lua-4.0* )
 	gpm? ( >=sys-libs/ncurses-5.2* >=sys-libs/gpm-1.20.0-r5 )"
 
 RDEPEND="virtual/glibc
@@ -29,7 +29,7 @@ RDEPEND="virtual/glibc
 	>=sys-apps/gzip-1.3.3
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	zlib? ( >=sys-libs/zlib-1.1.4 )
-	lua? ( >=dev-lang/lua-4.0 )
+	lua? ( =dev-lang/lua-4.0* )
 	gpm? ( >=sys-libs/ncurses-5.2* >=sys-libs/gpm-1.20.0-r5 )
 	X? ( >=x11-base/xfree-4.2.1* )"
 
diff --git a/net-www/elinks/files/digest-elinks-0.4.1 b/net-www/elinks/files/digest-elinks-0.4.1
deleted file mode 100644
index a598816361e0..000000000000
--- a/net-www/elinks/files/digest-elinks-0.4.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 db8a21aeef9a717489e1f819f5a896f5 elinks-0.4.1.tar.bz2 757619
-MD5 860a135cc22f4b015d456a55b4f67408 elinks.conf.bz2 4847