2 files changed, 50 insertions, 1 deletions
diff --git a/dev-lua/luasystem/files/luasystem-0.4.2-fix-makefile.patch b/dev-lua/luasystem/files/luasystem-0.4.2-fix-makefile.patch
new file mode 100644
index 000000000000..2d930a29fe78
--- /dev/null
+++ b/dev-lua/luasystem/files/luasystem-0.4.2-fix-makefile.patch
@@ -0,0 +1,49 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -50,7 +50,7 @@
+ # /usr/local/include/lua$(LUA_VERSION)
+ # where lua headers are found for linux builds
+ LUAINC_linux_base?=/usr/include
+-LUAINC_linux?=$(LUAINC_linux_base)/lua/$(LUA_VERSION)
++LUAINC_linux?=$(LUAINC_linux_base)/lua$(LUA_VERSION)
+ LUAPREFIX_linux?=/usr/local
+ CDIR_linux?=lib/lua/$(LUA_VERSION)
+ LDIR_linux?=share/lua/$(LUA_VERSION)
+@@ -144,8 +144,8 @@
+ CC_linux=gcc
+ DEF_linux=
+ CFLAGS_linux= -I$(LUAINC) $(DEF) -Wall -Wshadow -Wextra \
+-	-Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden
+-LDFLAGS_linux=-lrt -O -shared -fpic -o
++	-Wimplicit -fpic -fvisibility=hidden
++LDFLAGS_linux=-lrt -shared -fpic -o
+ LD_linux=gcc
+ 
+ #------
+@@ -208,7 +208,7 @@
+ #
+ CC=$(CC_$(PLAT))
+ DEF=$(DEF_$(PLAT))
+-CFLAGS=$(MYCFLAGS) $(CFLAGS_$(PLAT))
++CFLAGS=$(CFLAGS_$(PLAT)) $(MYCFLAGS)
+ LDFLAGS=$(MYLDFLAGS) $(LDFLAGS_$(PLAT))
+ LD=$(LD_$(PLAT))
+ LUAINC= $(LUAINC_$(PLAT))
+@@ -217,7 +217,7 @@
+ #------
+ # Objects
+ #
+-OBJS=core.$(O) compat.$(O) time.$(O) environment.$(O) random.$(O) term.$(O)
++OBJS=core.$(O) compat.$(O) time.$(O) environment.$(O) random.$(O) term.$(O) bitflags.$(O) wcwidth.$(O)
+ 
+ #------
+ # Targets
+@@ -248,7 +248,7 @@
+ all: $(SOLIB)
+ 
+ $(SOLIB): $(OBJS)
+-	$(LD) $(OBJS) $(LDFLAGS)$@
++	$(LD) $(OBJS) $(LDFLAGS) $@
+ 
+ install: all
+ 	$(INSTALL_DIR) $(INSTALL_TOP_LDIR)
diff --git a/dev-lua/luasystem/luasystem-0.4.2.ebuild b/dev-lua/luasystem/luasystem-0.4.2-r1.ebuild
index 3bfbf46ba5c8..edc7640b031c 100644
--- a/dev-lua/luasystem/luasystem-0.4.2.ebuild
+++ b/dev-lua/luasystem/luasystem-0.4.2-r1.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-0.2.1_p0-fix-makefile.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.4.2-fix-makefile.patch )
 
 src_prepare() {
 	default