--- /usr/portage/dev-lang/lua/lua-5.2.3-r1.ebuild	2014-06-12 23:46:47.000000000 +0200
+++ dev-lang/lua/lua-5.2.3-r666.ebuild	2015-01-13 00:33:06.820996028 +0100
@@ -13,10 +13,10 @@
 LICENSE="MIT"
 SLOT="5.2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+deprecated emacs readline static"
+IUSE="+deprecated emacs readline static crosshosted"
 
 RDEPEND="readline? ( sys-libs/readline )
-	app-admin/eselect-lua
+	!crosshosted? ( app-admin/eselect-lua )
 	!dev-lang/lua:0"
 DEPEND="${RDEPEND}
 	sys-devel/libtool"
@@ -29,7 +29,7 @@
 src_prepare() {
 	local PATCH_PV=$(get_version_component_range 1-2)
 
-	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch
+	epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r666.patch
 
 	[ -d "${FILESDIR}/${PV}" ] && \
 		EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
@@ -54,7 +54,10 @@
 	fi
 
 	# upstream does not use libtool, but we do (see bug #336167)
-	cp "${FILESDIR}/configure.in" "${S}"/ || die
+	cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
+	case "${CHOST}" in
+		*-mingw*) echo 'LT_INIT([win32-dll])' >>"${S}/configure.ac" ;;
+	esac
 	eautoreconf
 
 	# custom Makefiles
@@ -87,8 +90,13 @@
 	local myCFLAGS=""
 	use deprecated && myCFLAGS="-DLUA_COMPAT_ALL"
 
+	local exe_suffix=''
+
 	case "${CHOST}" in
-		*-mingw*) : ;;
+		*-mingw*)
+			exe_suffix='.exe'
+			liblibs="${liblibs} -no-undefined"
+			;;
 		*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
 	esac
 
@@ -98,15 +106,24 @@
 			LUA_LIBS="${mylibs}" \
 			LIB_LIBS="${liblibs}" \
 			V=$(get_version_component_range 1-2) \
+			EXE_SUFFIX="${exe_suffix}" \
 			gentoo_all
 }
 
 multilib_src_install() {
+	local exe_suffix=''
+	case "${CHOST}" in
+		*-mingw*) exe_suffix='.exe' ;;
+		*) : ;;
+	esac
+
 	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
+			EXE_SUFFIX="${exe_suffix}" \
 			V=${SLOT} gentoo_install
 
 	# We want packages to find our things...
-	cp "${FILESDIR}/lua.pc" "${WORKDIR}"
+	local PATCH_PV=$(get_version_component_range 1-2)
+	cp "${FILESDIR}/luav.pc" "${WORKDIR}/lua.pc"
 	sed -i \
 		-e "s:^V=.*:V= ${PATCH_PV}:" \
 		-e "s:^R=.*:R= ${PV}:" \