Fix support for >Guile-1.6.8 and Lua 5.1.

Package-Manager: portage-2.1.2.2

5 files changed, 126 insertions, 17 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 42bdef3fb9ae..04c73bca2a3e 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/elinks
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.73 2007/02/17 23:04:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.74 2007/03/10 15:38:12 spock Exp $
+
+  10 Mar 2007; Michał Januszewski <spock@gentoo.org>
+  +files/elinks-0.11.2-lua-5.1.patch, +files/elinks-0.11.2-lua-5.patch,
+  elinks-0.11.2.ebuild:
+  Fix support for >Guile-1.6.8 and Lua 5.1.
 
   17 Feb 2007; Fabian Groffen <grobian@gentoo.org>
   -files/elinks-osx-configure.diff, elinks-0.10.5.ebuild,
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 33c89ee292b9..fbc18ccd1d03 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX elinks-0.10.1-utf_8_io-default.patch 456 RMD160 69bcd2fe9a85381d53ef7d2c3da32e15d8eae36b SHA1 c9141e89ba62da5277d0df42e73f4eb258e23552 SHA256 3255c36e7107323d7415995c3c5d2458acf7b739848fb9804157b708956a7010
 MD5 d027e68bce77b2262fa23fbc77ba1080 files/elinks-0.10.1-utf_8_io-default.patch 456
 RMD160 69bcd2fe9a85381d53ef7d2c3da32e15d8eae36b files/elinks-0.10.1-utf_8_io-default.patch 456
@@ -22,6 +25,14 @@ AUX elinks-0.11.1-time.patch 371 RMD160 e8e01ce744bb5a4e1aeae1cfe6eb0f437ff2f09d
 MD5 0434a735d5874f19414b51d51d629ac6 files/elinks-0.11.1-time.patch 371
 RMD160 e8e01ce744bb5a4e1aeae1cfe6eb0f437ff2f09d files/elinks-0.11.1-time.patch 371
 SHA256 553c00e685633f043cf158119f9d0e615a45607baa97f486ce7a81892392288b files/elinks-0.11.1-time.patch 371
+AUX elinks-0.11.2-lua-5.1.patch 538 RMD160 7bd83ed15ea14cc41b909c4022eee082a47fb706 SHA1 0183f106db71725ccb0f2b83746373ca9e5f0522 SHA256 d931af4db13b53be32def17417d86ee916511209ce9a54f25d017ee2d24473d4
+MD5 73312c85d9651ba30070765138759f4a files/elinks-0.11.2-lua-5.1.patch 538
+RMD160 7bd83ed15ea14cc41b909c4022eee082a47fb706 files/elinks-0.11.2-lua-5.1.patch 538
+SHA256 d931af4db13b53be32def17417d86ee916511209ce9a54f25d017ee2d24473d4 files/elinks-0.11.2-lua-5.1.patch 538
+AUX elinks-0.11.2-lua-5.patch 2125 RMD160 be94e085a7b231dad1681566c533699b2a6d2745 SHA1 d1af052c0700951c703f26ac39f09d1cbbf43081 SHA256 4e0f7b622111696e52e15745d8ac35249a95def36eb5aa782487c7901125260c
+MD5 84aca7f1d1866fc20dd811ef3f4927f3 files/elinks-0.11.2-lua-5.patch 2125
+RMD160 be94e085a7b231dad1681566c533699b2a6d2745 files/elinks-0.11.2-lua-5.patch 2125
+SHA256 4e0f7b622111696e52e15745d8ac35249a95def36eb5aa782487c7901125260c files/elinks-0.11.2-lua-5.patch 2125
 DIST elinks-0.10.4.conf.bz2 5370 RMD160 5a0935ed8b035cd2f7636516b0e226a8065d1c70 SHA1 7f7b009b1b6cb746e90835d2b612f1aa6b5d3a1e SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209
 DIST elinks-0.10.5.tar.bz2 2357709 RMD160 f1b54cfa1eb4375a20b4b4e1a6edcc589739c3a2 SHA1 f05fcb5194bd5a6b43ed4bc09880de7577cbcce0 SHA256 4366f63ecf9c0fe84beb1757cef4481066943230172b708489c0d7e7baf25b19
 DIST elinks-0.10.6.tar.bz2 2390414 RMD160 504e71ef2f694def5fad9173905f05fbd99828d4 SHA1 a0804bf8e2bcc3ba52e8ee54b5e75595a36fcb09 SHA256 7e20abb24a4e307e969ad7db1578a5dacb9df8e63b57ed7b7cd90971bec928c8
@@ -43,14 +54,14 @@ EBUILD elinks-0.11.1.ebuild 4518 RMD160 90c7f4c67f9a146bfd5ad8abd64fe20c2ee03e33
 MD5 585acadc00b1d18065dd786e5dbaa915 elinks-0.11.1.ebuild 4518
 RMD160 90c7f4c67f9a146bfd5ad8abd64fe20c2ee03e33 elinks-0.11.1.ebuild 4518
 SHA256 a87f81da4acd53c53417ff40f32976e4f3a23525573263ed1d5affddde83b3c5 elinks-0.11.1.ebuild 4518
-EBUILD elinks-0.11.2.ebuild 4461 RMD160 dbec07fa7a5ddc2bfd9c5c503f3be3918bf2e034 SHA1 146f0fb06dd2088472c506d210069440b4e29b5a SHA256 fe38c70b248ca20bdb0cb20f68b079360402c6ea101f9712d9e034aab9a9d74d
-MD5 b050d5c89db737551fa4a0b4717392e5 elinks-0.11.2.ebuild 4461
-RMD160 dbec07fa7a5ddc2bfd9c5c503f3be3918bf2e034 elinks-0.11.2.ebuild 4461
-SHA256 fe38c70b248ca20bdb0cb20f68b079360402c6ea101f9712d9e034aab9a9d74d elinks-0.11.2.ebuild 4461
-MISC ChangeLog 17438 RMD160 0c7e13feac2d91b2e064105a1b1c16a9a2dfff8d SHA1 e0424149ee301a7617f67e55b0dfc55c51ac395b SHA256 82ffc849eea336bfb6cf17b7c0e6121ff1780b61ecc6d97e9bd9f6df9cf0b327
-MD5 a46495ef9fd5685e2c1e8270ae369abd ChangeLog 17438
-RMD160 0c7e13feac2d91b2e064105a1b1c16a9a2dfff8d ChangeLog 17438
-SHA256 82ffc849eea336bfb6cf17b7c0e6121ff1780b61ecc6d97e9bd9f6df9cf0b327 ChangeLog 17438
+EBUILD elinks-0.11.2.ebuild 4756 RMD160 8f72344937f1e4dc7a7ec5067119170df4c6fcae SHA1 f14900ccde571eb640db3a898d1f07bcc46c36c2 SHA256 50bb75e1422c653978a6ebb7ff49cf1c3cc1da43de46ea0a1b546f6d3a8d6528
+MD5 059340533f97aec2e830b89f7d63aaea elinks-0.11.2.ebuild 4756
+RMD160 8f72344937f1e4dc7a7ec5067119170df4c6fcae elinks-0.11.2.ebuild 4756
+SHA256 50bb75e1422c653978a6ebb7ff49cf1c3cc1da43de46ea0a1b546f6d3a8d6528 elinks-0.11.2.ebuild 4756
+MISC ChangeLog 17631 RMD160 827287dfa38f64c7d7f122a50ec8473982e6aa61 SHA1 e375b7d204dc9f6f6b97f72e2e561d0a7d901611 SHA256 fe68d1f137b10b26c3c0bc8e1e810a9658ed0b92446429cb5742de69700130cf
+MD5 b7690f82739931f64ecb475209de0f5b ChangeLog 17631
+RMD160 827287dfa38f64c7d7f122a50ec8473982e6aa61 ChangeLog 17631
+SHA256 fe68d1f137b10b26c3c0bc8e1e810a9658ed0b92446429cb5742de69700130cf ChangeLog 17631
 MISC metadata.xml 255 RMD160 399f78e98260d4f311124e71c6d294e368a76976 SHA1 61f663af9ea0cb4967a12878352e65b095dcd473 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 RMD160 399f78e98260d4f311124e71c6d294e368a76976 metadata.xml 255
@@ -70,3 +81,10 @@ SHA256 0074385608ba5c7e0b6193b003b5218c75d179e3bbdb1d1134328332f71ffc6b files/di
 MD5 347a412177c8b073af1160e65e777faf files/digest-elinks-0.11.2 488
 RMD160 ca4e65389badb922c60d3868caa2fab0ae977804 files/digest-elinks-0.11.2 488
 SHA256 64a75a4378c0194214ae924b00385c215e1463cd0bfd71dd04d56ce00a5f7483 files/digest-elinks-0.11.2 488
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFF8tDzchej4aZK9/cRAqaiAJwJvrjmgx7YoMedNuGT3n+4vWbkxQCeJkyk
+Xyjvh8UBfgklZW+gtnR7SMc=
+=rzIP
+-----END PGP SIGNATURE-----
diff --git a/www-client/elinks/elinks-0.11.2.ebuild b/www-client/elinks/elinks-0.11.2.ebuild
index 449e70b7adcd..7722677dd745 100644
--- a/www-client/elinks/elinks-0.11.2.ebuild
+++ b/www-client/elinks/elinks-0.11.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.2.ebuild,v 1.11 2007/01/27 09:48:28 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.2.ebuild,v 1.12 2007/03/10 15:38:12 spock Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.4"
 
-inherit eutils autotools
+inherit eutils autotools flag-o-matic
 
 MY_P="${P/_/}"
 DESCRIPTION="Advanced and well-established text-mode web browser"
@@ -37,6 +37,15 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	if use guile && has_version ">dev-scheme/guile-1.6.8" &&
+	   ! built_with_use -a dev-scheme/guile deprecated discouraged; then
+		eerror "To install elinks with the 'guile' USE flag, dev-scheme/guile has to"
+		eerror "be built with 'deprecated' and 'discouraged' USE flags."
+		die "dev-scheme/guile not built with deprecated/discouraged"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${PN}-0.10.4.conf-syscharset.diff
@@ -49,9 +58,16 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-0.11.0-gcc4-inline.patch
 	epatch ${FILESDIR}/${PN}-0.11.0-ruby.patch
 	epatch ${FILESDIR}/${PN}-0.11.1-time.patch
+	epatch ${FILESDIR}/${PN}-0.11.2-lua-5.patch
+
+	if use lua && has_version ">=dev-lang/lua-5.1"; then
+		epatch ${FILESDIR}/${PN}-0.11.2-lua-5.1.patch
+	fi
+
 	if use unicode ; then
 		epatch ${FILESDIR}/elinks-0.10.1-utf_8_io-default.patch
 	fi
+
 	sed -i -e 's/-Werror//' configure*
 }
 
@@ -127,12 +143,6 @@ pkg_postinst() {
 	einfo
 	einfo "Please have a look at /etc/elinks/keybind-full.sample and"
 	einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
-	if use guile ; then
-		einfo
-		einfo "Since you have compiled ELinks with Guile support, you will have to"
-		einfo "copy internal-hooks.scm and user-hooks.scm from"
-		einfo "/usr/share/doc/${PF}/contrib/guile/ to ~/.elinks/"
-	fi
 	einfo
 	einfo "You will have to set your TERM variable to 'xterm-256color'"
 	einfo "to be able to use 256 colors in elinks."
diff --git a/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch b/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch
new file mode 100644
index 000000000000..20db8a484598
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch
@@ -0,0 +1,16 @@
+diff -Naurp elinks-0.11.2/src/scripting/lua/core.c elinks-0.11.2-lua/src/scripting/lua/core.c
+--- elinks-0.11.2/src/scripting/lua/core.c	2006-11-19 14:46:37.000000000 +0100
++++ elinks-0.11.2-lua/src/scripting/lua/core.c	2007-03-10 15:34:47.000000000 +0100
+@@ -646,11 +646,7 @@ init_lua(struct module *module)
+ {
+ 	L = lua_open();
+ 
+-	luaopen_base(L);
+-	luaopen_table(L);
+-	luaopen_io(L);
+-	luaopen_string(L);
+-	luaopen_math(L);
++	luaL_openlibs(L);
+ 
+ 	lua_register(L, LUA_ALERT, l_alert);
+ 	lua_register(L, "current_url", l_current_url);
diff --git a/www-client/elinks/files/elinks-0.11.2-lua-5.patch b/www-client/elinks/files/elinks-0.11.2-lua-5.patch
new file mode 100644
index 000000000000..2b4bf611d8be
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.11.2-lua-5.patch
@@ -0,0 +1,60 @@
+diff -Naur elinks-0.11.1.orig/configure.in elinks-0.11.1/configure.in
+--- elinks-0.11.1.orig/configure.in	2006-01-29 14:10:33.000000000 +0100
++++ elinks-0.11.1/configure.in	2006-03-01 17:32:58.000000000 +0100
+@@ -739,7 +739,7 @@
+ 	for luadir in "$withval" "" /usr /usr/local; do
+ 		for suffix in "" 50 51; do
+ 			if test "$cf_result" = no; then
+-				LUA_LIBS="-llua$suffix -llualib$suffix -lm"
++				LUA_LIBS="`pkg-config --libs lua`"
+ 
+ 				if test ! -z "$luadir"; then
+ 					LUA_LIBS="-L$luadir/lib $LUA_LIBS"
+@@ -754,10 +754,10 @@
+ 				AC_TRY_LINK([	#include <lua.h>
+ 						#include <lualib.h>],
+ 					    [	lua_State *L = lua_open();
+-						lua_baselibopen(L);
+-						lua_mathlibopen(L);
+-						lua_strlibopen(L);
+-						lua_tablibopen(L);
++						luaopen_base(L);
++						luaopen_math(L);
++						luaopen_string(L);
++						luaopen_table(L);
+ 						lua_pushboolean(L, 1);
+ 						lua_close(L);],
+ 					    cf_result=yes, cf_result=no)
+diff -Naur elinks-0.11.1.orig/src/scripting/lua/core.c elinks-0.11.1/src/scripting/lua/core.c
+--- elinks-0.11.1.orig/src/scripting/lua/core.c	2006-01-29 14:10:39.000000000 +0100
++++ elinks-0.11.1/src/scripting/lua/core.c	2006-03-01 17:41:43.000000000 +0100
+@@ -633,7 +633,7 @@
+ 	if (file_can_read(file)) {
+ 		int oldtop = lua_gettop(S);
+ 
+-		if (lua_dofile(S, file) != 0)
++		if (luaL_dofile(S, file) != 0)
+ 			sleep(3); /* Let some time to see error messages. */
+ 		lua_settop(S, oldtop);
+ 	}
+@@ -755,7 +755,7 @@
+ 		int oldtop = lua_gettop(L);
+ 
+ 		if (prepare_lua(ses) == 0) {
+-			lua_dostring(L, expr);
++			luaL_dostring(L, expr);
+ 			lua_settop(L, oldtop);
+ 			finish_lua();
+ 		}
+diff -Naur elinks-0.11.1.orig/src/scripting/lua/hooks.c elinks-0.11.1/src/scripting/lua/hooks.c
+--- elinks-0.11.1.orig/src/scripting/lua/hooks.c	2006-01-29 14:10:39.000000000 +0100
++++ elinks-0.11.1/src/scripting/lua/hooks.c	2006-03-01 17:41:07.000000000 +0100
+@@ -200,7 +200,7 @@
+ script_hook_quit(va_list ap, void *data)
+ {
+ 	if (!prepare_lua(NULL)) {
+-		lua_dostring(lua_state, "if quit_hook then quit_hook() end");
++		luaL_dostring(lua_state, "if quit_hook then quit_hook() end");
+ 		finish_lua();
+ 	}
+