fixed lua patch for celestia-1.4.1-r1

(Portage version: 2.1.1-r2)
 (Signed Manifest commit)

2 files changed, 12 insertions, 78 deletions

diff --git a/sci-astronomy/celestia/Manifest b/sci-astronomy/celestia/Manifest
index 7202896c06c9..583be77d0549 100644
--- a/sci-astronomy/celestia/Manifest
+++ b/sci-astronomy/celestia/Manifest
@@ -17,10 +17,6 @@ AUX celestia-1.4.1-kde-datadir.patch 1505 RMD160 5acdbeab92d61aeb086e1cc30723daa
 MD5 c55b09c7339307e1d94bc60f46e82365 files/celestia-1.4.1-kde-datadir.patch 1505
 RMD160 5acdbeab92d61aeb086e1cc30723daa1ccda5556 files/celestia-1.4.1-kde-datadir.patch 1505
 SHA256 f37a80bd089cc0918bbf50760207993aeafb50bafd2c331ad6e0ea214b448646 files/celestia-1.4.1-kde-datadir.patch 1505
-AUX celestia-1.4.1-lua.patch 1777 RMD160 64a28941b7b11841575a22dc612fa7befe5850fb SHA1 011f965b2715514f6c4c51bcb4398457259763ad SHA256 4165fb29634b63973364aaab3910d0cfa3b418a718a1975d5cb6a26db1b8f918
-MD5 bd932a22cabe5596da1a5ca255613b9e files/celestia-1.4.1-lua.patch 1777
-RMD160 64a28941b7b11841575a22dc612fa7befe5850fb files/celestia-1.4.1-lua.patch 1777
-SHA256 4165fb29634b63973364aaab3910d0cfa3b418a718a1975d5cb6a26db1b8f918 files/celestia-1.4.1-lua.patch 1777
 AUX celestia-1.4.1-lua51.patch 2411 RMD160 f2a7385f9582ddfa7fc294a776dcd1fea604c580 SHA1 12367dfd5af70d56bfdfb99068e709d89b45dcec SHA256 d311cbd81546221409bea8256c9fc12b1a6da2e504523e39520c28280585b248
 MD5 bf2d3516c6a46ace35d18fc4692aba36 files/celestia-1.4.1-lua51.patch 2411
 RMD160 f2a7385f9582ddfa7fc294a776dcd1fea604c580 files/celestia-1.4.1-lua51.patch 2411
@@ -43,18 +39,18 @@ EBUILD celestia-1.3.2.ebuild 3063 RMD160 3693e0d7a28a52d9445c9d92b3693f4ad190e7d
 MD5 6be90f964bc6ca0195b0623338dfd1f0 celestia-1.3.2.ebuild 3063
 RMD160 3693e0d7a28a52d9445c9d92b3693f4ad190e7d3 celestia-1.3.2.ebuild 3063
 SHA256 9f810428bc0a312a687de0cf42e5053947015fa0bf9a0d93ef90b2a9f112a46b celestia-1.3.2.ebuild 3063
-EBUILD celestia-1.4.1-r1.ebuild 3854 RMD160 5b3feb6d17c877c1f6a61a6d193ed7fc427e5b3d SHA1 e861599bcf1bae41965c0f5abd35aa3c471366ec SHA256 d6ac4506250a67f0122e64000ad9adf876890ac611ab952821656575fe335f20
-MD5 86f63c9afd2119d8596b991a74462ca9 celestia-1.4.1-r1.ebuild 3854
-RMD160 5b3feb6d17c877c1f6a61a6d193ed7fc427e5b3d celestia-1.4.1-r1.ebuild 3854
-SHA256 d6ac4506250a67f0122e64000ad9adf876890ac611ab952821656575fe335f20 celestia-1.4.1-r1.ebuild 3854
+EBUILD celestia-1.4.1-r1.ebuild 3867 RMD160 a9146770be8baafd25189906c18c45ac5c78db10 SHA1 bad204b2545cdc9fbb1abf7ad254a118e318eb51 SHA256 252be1844356bced884b1f83c3ff6add343412a243573cb4f9db5194e285aab7
+MD5 f70b532c0f67f5d0b81494578269a841 celestia-1.4.1-r1.ebuild 3867
+RMD160 a9146770be8baafd25189906c18c45ac5c78db10 celestia-1.4.1-r1.ebuild 3867
+SHA256 252be1844356bced884b1f83c3ff6add343412a243573cb4f9db5194e285aab7 celestia-1.4.1-r1.ebuild 3867
 EBUILD celestia-1.4.1.ebuild 3325 RMD160 c163639d827920811307a577d8a9dd6b549a5bfe SHA1 a3a5596d735afd4d3afdb18307e3dd9a3a163a05 SHA256 79206ce994a215f5a7e88134fd77b1be5fd500e1da33b406af0548082b1655d7
 MD5 e9c88cb97f349dc353289850713ba793 celestia-1.4.1.ebuild 3325
 RMD160 c163639d827920811307a577d8a9dd6b549a5bfe celestia-1.4.1.ebuild 3325
 SHA256 79206ce994a215f5a7e88134fd77b1be5fd500e1da33b406af0548082b1655d7 celestia-1.4.1.ebuild 3325
-MISC ChangeLog 9401 RMD160 3bd9d54aecc03c42dd69b990a4da259748f7f825 SHA1 1b87964da46a7e0598f83dd9952faaa642ae7c5e SHA256 d52a18e6309fdbe801c0f39af4aa367e13f5a38bef962a8c20f91b1e41aedfb2
-MD5 d9ad127a4f4e62e6bc7c157a63029cf0 ChangeLog 9401
-RMD160 3bd9d54aecc03c42dd69b990a4da259748f7f825 ChangeLog 9401
-SHA256 d52a18e6309fdbe801c0f39af4aa367e13f5a38bef962a8c20f91b1e41aedfb2 ChangeLog 9401
+MISC ChangeLog 9569 RMD160 fde4b365b1ada0ee8d22f35baa8e8830e1c30acc SHA1 ed81143fb5b9b4a794a234f2724466f253a66a8b SHA256 27311e6d6fa5b4041420b0453996d45fe09c302dd64084f73b381efa0ee2c0c7
+MD5 73fe90c3d0fb179af67354f1261b27d0 ChangeLog 9569
+RMD160 fde4b365b1ada0ee8d22f35baa8e8830e1c30acc ChangeLog 9569
+SHA256 27311e6d6fa5b4041420b0453996d45fe09c302dd64084f73b381efa0ee2c0c7 ChangeLog 9569
 MISC metadata.xml 705 RMD160 e20a8f5e0de56e9fa102864cab202a0af6b5172c SHA1 712d9a3efc45acc1873bb2ac49cb00e7d6bf59bf SHA256 bd067e5762b23475ca10fd83e68015c504345c929c45174f50fd8ccd48ad12eb
 MD5 4f929f451f87254297e07e7c46707c1c metadata.xml 705
 RMD160 e20a8f5e0de56e9fa102864cab202a0af6b5172c metadata.xml 705
@@ -69,9 +65,9 @@ MD5 34161bf1fac09b84a3ffe3d187aa811d files/digest-celestia-1.4.1-r1 250
 RMD160 b55d9c21cfda86365a1be8dcf84705ca0381ac9a files/digest-celestia-1.4.1-r1 250
 SHA256 d638e17dad65f179f89102c209ecffc06c9383a96420f7a9c31a9cabba357fdf files/digest-celestia-1.4.1-r1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFxMRyAiZjviIA2XgRAhxnAKD02n8D2o9z8f5Vr4dnaWJ+jDHx7gCfYQdJ
-2Sw+kf6siLVkRtCBx/uXj7k=
-=hDR6
+iD8DBQFFyFYKWc/Ciu+QQGkRAoGxAJ4jhYf+5teSkNFyGjvfMirNsjekpwCfdJXw
+PIs0cEpYiM0AMXdS1qjWAVw=
+=6C0D
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/celestia/files/celestia-1.4.1-lua.patch b/sci-astronomy/celestia/files/celestia-1.4.1-lua.patch
deleted file mode 100644
index ed31b8ee0d0c..000000000000
--- a/sci-astronomy/celestia/files/celestia-1.4.1-lua.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/celestia/celx.cpp.orig	2006-09-19 11:08:10.000000000 +0100
-+++ src/celestia/celx.cpp	2006-09-19 11:07:03.000000000 +0100
-@@ -32,9 +32,7 @@
- 
- #include "celx.h"
- #include "celestiacore.h"
--extern "C" {
--#include "lualib.h"
--}
-+#include "lua.hpp"
- 
- using namespace std;
- 
-@@ -532,6 +530,8 @@
- 
-     status = lua_resume(co, narg);
-     if (status == 0)
-+            return 0;
-+    else if (status == LUA_YIELD)
-     {
-         int nres = lua_gettop(co);
- #if 0
-@@ -543,7 +543,7 @@
-     }
-     else
-     {
--        lua_xmove(co, L, 1);  // move error message
-+        lua_xmove(co, L, -1); // move error message
-         return -1;            // error flag
-     }
- }
-@@ -598,7 +598,7 @@
-         int stackTop = lua_gettop(costate);
-         if (strcmp(c_p, "y") == 0)
-         {
--            lua_iolibopen(costate);
-+            luaL_openlibs(costate);
-             ioMode = IOAllowed;
-         }
-         else
-@@ -713,7 +713,8 @@
-         // no other errors, and execution terminates normally.  There
-         // should be a better way to figure out whether the script ended
-         // normally . . .
--        if (strcmp(errorMessage, "cannot resume dead coroutine") != 0)
-+        if (errorMessage
-+            && strcmp(errorMessage, "cannot resume dead coroutine") != 0)
-         {
-             cout << "Error: " << errorMessage << '\n';
-             CelestiaCore* appCore = getAppCore(co);
-@@ -4577,10 +4578,7 @@
-     initMaps();
- 
-     // Import the base and math libraries
--    lua_baselibopen(state);
--    lua_mathlibopen(state);
--    lua_tablibopen(state);
--    lua_strlibopen(state);
-+    luaL_openlibs(state);
- 
-     // Add an easy to use wait function, so that script writers can
-     // live in ignorance of coroutines.  There will probably be a significant