Fix compilation with lua-5.2, bug #434238 by Dennis Schridde.

Package-Manager: portage-2.1.11.19/cvs/Linux x86_64

5 files changed, 153 insertions, 10 deletions

diff --git a/app-admin/lsyncd/ChangeLog b/app-admin/lsyncd/ChangeLog
index 8e2655a15dd4..4c22b44e1fae 100644
--- a/app-admin/lsyncd/ChangeLog
+++ b/app-admin/lsyncd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/lsyncd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/ChangeLog,v 1.22 2012/08/06 19:48:39 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/ChangeLog,v 1.23 2012/09/23 08:37:11 pacho Exp $
+
+  23 Sep 2012; Pacho Ramos <pacho@gentoo.org> +files/lsyncd-2.0.7-lua51.patch,
+  +files/lsyncd-2.0.7-lua52.patch, lsyncd-2.0.7.ebuild:
+  Fix compilation with lua-5.2, bug #434238 by Dennis Schridde.
 
 *lsyncd-2.0.7 (06 Aug 2012)
 
@@ -95,4 +99,3 @@
   18 Jun 2009; Ioannis Aslanidis <deathwing00@gentoo.org> +metadata.xml,
   +lsyncd-1.26.ebuild:
   Initial version.
-
diff --git a/app-admin/lsyncd/Manifest b/app-admin/lsyncd/Manifest
index d1683a25f2f8..bfe71b1d1af8 100644
--- a/app-admin/lsyncd/Manifest
+++ b/app-admin/lsyncd/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX lsyncd-2.0.4-examplesdir.patch 1754 SHA256 9e8a9cce7f8728d8c9a63515577b2062aa77ac435a5399f8e78fae1de92978fa SHA512 ec250b7db6d4075492f0e2beb98c914b1d99a14e37103ebf549dbc68ce8a1e030b6005df6a89f4cd315f431d5437d85dfc941781562fc64e926d215322340205 WHIRLPOOL 90dd368e3a334ed75ff8b6ffaa9d249e28a469542d559404ac9b24028494e80fb7bc0b4b537e8d4532a41a1fa2eac5adb11dc8ccce839c6d87f7d7bf1f4f8595
+AUX lsyncd-2.0.7-lua51.patch 1066 SHA256 89a4c3b7076b4d6caf2937317f6df97f84ee5852fb5f8c82beac2f92b05dc902 SHA512 83a65a6bb33887e91c8ccc314f30d317c9e78b9ed404ff61c3863f224b7fd8a15d22192cbd6900fd05835be1088dfb3b54a6e4e90bd8b45386bd2f1457869e7c WHIRLPOOL a02d76bf995f5341ac9a7630a69727d11f3b57da4dc92f53a89681b43aa8da06912754a4d6e8139bc7265afb967f656df69745eac7f6ec9234bc5032eeb3d4c7
+AUX lsyncd-2.0.7-lua52.patch 2022 SHA256 cbb49cd0ffb91c2bf8d92bc18164735ca6530b405a21978cce9b4bb755aef23f SHA512 32f8e9c26109bf0cc5ed90c393a51785d2144313e7cff43fda9ec56821c71af97e13c80c040317e397b7819afee821f457a91e6ba42bf232e6d449bcb8215d39 WHIRLPOOL b2cd68a326b8c3c615762bb42bb173a0279c1b332a08460b257db84403b9055525fa1eb9c3e1720240567fefa2493bccd6023332013974da3afafd38505cf869
 DIST lsyncd-2.0.5.tar.gz 135038 SHA256 3d76f26623a97de700764090abcc0d1e7ded50f386402567222dfd01a612121e SHA512 df3bde08ff98ce3de3d1350ade56f1abbe786ced30eb94fd6cc7745c036bc99af8b01ee3bc0c8cd7225251f10e7ae2a7480832a07a6439fde1f9ca95fb57ec1a WHIRLPOOL 60e5907dd4dae04417c51e0e3c9bf00b021c1c26a2a46da701f8c674c1ebae7feb4dc19898d8b999eaa9010cba1ff408ac569959c073f9730e0251125673a1e3
 DIST lsyncd-2.0.7.tar.gz 141498 SHA256 3c76a6e8acfceea742154afd21f74b220277e54b1ffdb71ee1dc2eb104b0bbde SHA512 4ba99853b7962f40bd6a7cd2b51eebf33b37a9536511d39f5650da04465c67080cc89568537981165c357c76841221c1fcc83b42ee0d8ab4713619f8c008af40 WHIRLPOOL 549fa8603510b197174609308ee2b4ccf8d5cfba2bd20c4450ca770d477f16d0fa0aa7e5bd50440d1b94dcb97ffd38a7ef40f8a7bd1b002b4955a42c7b1edf4f
 EBUILD lsyncd-2.0.5.ebuild 659 SHA256 3a47f3d02228baf9c46800661b5b693ee88eb7bc655b38db3c6c27e2d7929427 SHA512 45cf51233967bc7e0ddb65df6d1412767806064e0fd3f93567370f7975a081987702a134ce562baee2b8c644a68786fdfedb4e5a75835f439d250ef4630d85b7 WHIRLPOOL 1f92d4e47afb4f0eeff9d7d6260cd8d07d5443fd690042a2c3758ec1688418fe36e9475ff5e2e6cab1e8cf0d4359803fec7c96decc3a63e2c73743af670e73c5
-EBUILD lsyncd-2.0.7.ebuild 604 SHA256 2680a3e7d569c8e40351ee2acd22ee24d253d0fd9e88bcca663a466ea392626b SHA512 84eef90ce9ae743f3f11faf59d8768f318e09f63c3f2c0bd6aef7940260086d3ac2112f5616a34fd312263a3bb2bda19dedc40d68432a38f946f2b0511067767 WHIRLPOOL 0d0fc649722ddc874b8cefb4b4957b6b4a12fab3428791f9d4c3fcb48391c0a107cb7e9b168be7ef9d452123331982884215ade7eda3d3258e4230c339d3758c
-MISC ChangeLog 3273 SHA256 75818b9937432ca9d26d2eb32c1f5744fbb0124d512aa233f4eac3b3f44d2b28 SHA512 b9819d2d7cdeb457e179beac1f33a164b21b97c0de2cf76b8f199e9c1cbc09645c8cafd0f300b16b18f5439ca4589972dcb67bb2de12e74ddde4d185f745fc68 WHIRLPOOL 0b11b2a82373a1c93552d6ae16c44fcb1b59ee1c11623da09f9d172f56ca42b461bc4bf7e0facb89590c70d90c1205dbe7fda6cfaf00d55705b93e322b8874f6
+EBUILD lsyncd-2.0.7.ebuild 662 SHA256 a78651a07f518223cdadfc87f9d2e4ee17c03b51921ff9af77cef9ca1723b3d1 SHA512 9f1c1ba8198b0bf292ccce8f9e23d0cfa6995746f1ac553710173a4c0778b0ce7e0c3b304f3213b2a506ca05f0d60531ad27dba05ae1f3adadf603f014ee47ed WHIRLPOOL 8da610e3523d29e06ee0c32aa6a6c93404618bf3cc4a312bc8801223724feadb39907c2f0e73bac02fa5805b7c018bf7fcfc82be0c043ef4e1450bb4623196ff
+MISC ChangeLog 3469 SHA256 8be45330487c398aaa2e038a6271f755aa1b3d5edb57743aa8f0f50743f21833 SHA512 3ac8b4ccd4af36cc025d8a84bc687e47d7758fb0a725e075015a67e8c91f3e1e38de74703c87c556f0e07225c6f77b83dc13075c801746d313968666696591a5 WHIRLPOOL 4404f06044615d69d6058daa2269531f9afa0c927391d9b38699c2d23feb75366de908b8bd0ab6008e62719b278a87e18508440ee8341663dc737dd6366d280e
 MISC metadata.xml 290 SHA256 da43e45194e25de5e16624aae17a8cc3c19393b0c7232b77bbb7d337b8f63402 SHA512 f85655179d916a2665bc782abd667d28aae30c071cc69c9743d00ec20a6460c57f5a2dba09e3555d68bc95dd9367fc16bc5f6cd948da6013701dce985977d6f6 WHIRLPOOL 089d84232d4983fed959a03f0eea4f15d8c66ce6d0bf1e37a93c602a57ab8ba5f94e5bc745b37fcccf41f937fa79af1bbb844ea0201a4cef61784ff49bec6729
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBeyjwACgkQCaWpQKGI+9SUggCdEnygC0NUJGL0O0IarktAl6No
+yD8AnjptKqQvxsVqOlwEeu0DvcBVL3Am
+=myFp
+-----END PGP SIGNATURE-----
diff --git a/app-admin/lsyncd/files/lsyncd-2.0.7-lua51.patch b/app-admin/lsyncd/files/lsyncd-2.0.7-lua51.patch
new file mode 100644
index 000000000000..954f7af14307
--- /dev/null
+++ b/app-admin/lsyncd/files/lsyncd-2.0.7-lua51.patch
@@ -0,0 +1,45 @@
+From 595370fdc4d106d093184893c037ec00e9abcae9 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 18 Sep 2012 15:57:41 +0200
+Subject: [PATCH] Lua 5.1 compatibility fallbacks
+
+---
+ inotify.c |    4 ++++
+ lsyncd.c  |    6 ++++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/inotify.c b/inotify.c
+index ac6f7d9..518c329 100644
+--- a/inotify.c
++++ b/inotify.c
+@@ -39,6 +39,10 @@
+ #include <lualib.h>
+ #include <lauxlib.h>
+ 
++#if LUA_VERSION_NUM < 502
++#   define luaL_newlib(L,l) luaL_register(L,NULL,l)
++#endif
++
+ /*-----------------------------------------------------------------------------
+  * Event types.
+  */
+diff --git a/lsyncd.c b/lsyncd.c
+index f7c61c2..74629bd 100644
+--- a/lsyncd.c
++++ b/lsyncd.c
+@@ -53,6 +53,12 @@
+ extern const char defaults_out[];
+ extern size_t defaults_size;
+ 
++#if LUA_VERSION_NUM < 502
++/* lua_rawlen: Not entirely correct, but should work anyway */
++#	define lua_rawlen lua_objlen
++#	define luaL_newlib(L,l) luaL_register(L,NULL,l)
++#endif
++
+ /**
+  * Makes sure there is one monitor.
+  */
+-- 
+1.7.10
+
diff --git a/app-admin/lsyncd/files/lsyncd-2.0.7-lua52.patch b/app-admin/lsyncd/files/lsyncd-2.0.7-lua52.patch
new file mode 100644
index 000000000000..8d605a782090
--- /dev/null
+++ b/app-admin/lsyncd/files/lsyncd-2.0.7-lua52.patch
@@ -0,0 +1,81 @@
+From 9e24c121e502ebd8e88821044d78fda187537861 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 18 Sep 2012 15:20:25 +0200
+Subject: [PATCH] Fix compilation with Lua 5.2 (issue #146)
+
+---
+ inotify.c |    4 ++--
+ lsyncd.c  |   10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/inotify.c b/inotify.c
+index 432e530..ac6f7d9 100644
+--- a/inotify.c
++++ b/inotify.c
+@@ -129,7 +129,7 @@
+ /**
+  * Cores inotify functions.
+  */
+-static const luaL_reg linotfylib[] = {
++static const luaL_Reg linotfylib[] = {
+ 		{"addwatch",   l_addwatch   },
+ 		{"rmwatch",    l_rmwatch    },
+ 		{NULL, NULL}
+@@ -352,7 +352,7 @@
+ register_inotify(lua_State *L)
+ {
+ 	lua_pushstring(L, "inotify");
+-	luaL_register(L, "inotify", linotfylib);
++	luaL_newlib(L, linotfylib);
+ }
+ 
+ /**
+diff --git a/lsyncd.c b/lsyncd.c
+index fbb5d33..f7c61c2 100644
+--- a/lsyncd.c
++++ b/lsyncd.c
+@@ -841,12 +841,12 @@ struct pipemsg {
+ 		if (lua_istable(L, i)) {
+ 			int tlen;
+ 			int it;
+-			lua_checkstack(L, lua_gettop(L) + lua_objlen(L, i) + 1);
++			lua_checkstack(L, lua_gettop(L) + lua_rawlen(L, i) + 1);
+ 			// move table to top of stack
+ 			lua_pushvalue(L, i);
+ 			lua_remove(L, i);
+ 			argc--;
+-			tlen = lua_objlen(L, -1);
++			tlen = lua_rawlen(L, -1);
+ 			for (it = 1; it <= tlen; it++) {
+ 				lua_pushinteger(L, it);
+ 				lua_gettable(L, -2);
+@@ -1263,7 +1263,7 @@ struct pipemsg {
+ 	return 0;
+ }
+ 
+-static const luaL_reg lsyncdlib[] = {
++static const luaL_Reg lsyncdlib[] = {
+ 		{"configure",     l_configure     },
+ 		{"exec",          l_exec          },
+ 		{"log",           l_log           },
+@@ -1368,7 +1368,7 @@ struct pipemsg {
+ void
+ register_lsyncd(lua_State *L)
+ {
+-	luaL_register(L, "lsyncd", lsyncdlib);
++	luaL_newlib(L, lsyncdlib);
+ 	lua_setglobal(L, "lysncd");
+ 
+ 	// creates the metatable for jiffies userdata
+@@ -1676,7 +1676,7 @@ struct pipemsg {
+ 	int argp = 1;
+ 
+ 	// load Lua
+-	L = lua_open();
++	L = luaL_newstate();
+ 	luaL_openlibs(L);
+ 	{
+ 		// checks the lua version
+-- 
+1.7.10
+
diff --git a/app-admin/lsyncd/lsyncd-2.0.7.ebuild b/app-admin/lsyncd/lsyncd-2.0.7.ebuild
index 76efa64921a6..819ac9803e17 100644
--- a/app-admin/lsyncd/lsyncd-2.0.7.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.0.7.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/lsyncd-2.0.7.ebuild,v 1.1 2012/08/06 19:48:39 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/lsyncd-2.0.7.ebuild,v 1.2 2012/09/23 08:37:11 pacho Exp $
 
 EAPI=4
-
-inherit multilib
+inherit eutils
 
 DESCRIPTION="Live Syncing (Mirror) Daemon"
 HOMEPAGE="http://code.google.com/p/lsyncd/"
@@ -15,11 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="dev-lang/lua"
+DEPEND=">=dev-lang/lua-5.1"
 RDEPEND="${DEPEND}
 	net-misc/rsync"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-lua5{1,2}.patch
+}
+
 src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${P}
+	econf --docdir="${EPREFIX}"/usr/share/doc/${P}
 }