[gentoo-commits] proj/lua:master commit in: dev-lang/luajit/

[Vadim A. Misbakh-Soloviov]

commit:     e665936fc299db6862ab8ecc0842260cc605337a
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Mon May 27 19:42:29 2013 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon May 27 19:42:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=e665936f

[dev-lang/luajit] some more ebuild improvements

Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>

---
 dev-lang/luajit/luajit-2.0.1.ebuild | 39 +++++++++++++++++++++----------------
 dev-lang/luajit/luajit-9999.ebuild  | 39 +++++++++++++++++++++----------------
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/dev-lang/luajit/luajit-2.0.1.ebuild b/dev-lang/luajit/luajit-2.0.1.ebuild
index 3859c71..4020f88 100644
--- a/dev-lang/luajit/luajit-2.0.1.ebuild
+++ b/dev-lang/luajit/luajit-2.0.1.ebuild
@@ -23,17 +23,21 @@ PDEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
-# Workaround for CHECKREQS_MEMORY
-pkg_setup() { :; }
-
-pkg_pretend() {
-	CHECKREQS_DISK_BUILD="10M"
-	use optimization && {
+check_req() {
+	if use optimization; then
 		CHECKREQS_MEMORY="200M"
 		ewarn "Optimized (amalgamated) build wants at least 200MB of RAM"
 		ewarn "If you have no such RAM - try to disable 'optimization' flag"
-	}
-	check-reqs_pkg_pretend
+	fi
+	check-reqs_pkg_${1}	
+}
+
+pkg_pretend() {
+	check_req pretend
+}
+
+pkg_setup() {
+	check_req setup	
 }
 
 src_prepare(){
@@ -48,9 +52,11 @@ src_prepare(){
 		-e "s|lib/|$(get_libdir)/|" \
 		-i src/luaconf.h || die "failed to fix prefix in luaconf.h"
 
-	use lua52compat && sed \
-		-e "/LUAJIT_ENABLE_LUA52COMPAT/s|#||" \
-		-i src/Makefile || die
+	if use lua52compat; then
+		sed \
+			-e "/LUAJIT_ENABLE_LUA52COMPAT/s|#||" \
+			-i src/Makefile || die "Lua-5.2 compat fix failed"
+	fi
 
 	# removing strip
 	sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \
@@ -65,6 +71,9 @@ src_prepare(){
 }
 
 src_compile() {
+	local opt;
+	use optimization && opt="amalg";
+
 	if has_version '=sys-devel/gcc-4.7.3' && gcc-specs-pie && has ccache ${FEATURES}; then
 		# It is three ways to avoid compilation breaking
 		# in case, when user use gcc-4.7.3+pie+ccache:
@@ -99,11 +108,7 @@ src_compile() {
 		ewarn "to disable ccache instead."
 	fi
 
-	if use optimization; then
-		emake amalg || die "emake failed!"
-	else
-		emake || die "emake failed!"
-	fi
+	emake "${opt}"
 }
 
 src_install() {
@@ -118,7 +123,7 @@ pkg_postinst() {
 		einfo "You'd probably want to install dev-lua/iluajit to";
 		ewarn "get fully functional interactive shell for LuaJIT";
 	fi
-	if has_version app-editors/emacs || app-editors/xemacs; then
+	if has_version app-editors/emacs || has_version app-editors/xemacs; then
 		einfo "You'd probably want to install app-emacs/lua-mode to";
 		ewarn "get Lua completion in emacs.";
 	fi

diff --git a/dev-lang/luajit/luajit-9999.ebuild b/dev-lang/luajit/luajit-9999.ebuild
index 7a8ce47..90a35e4 100644
--- a/dev-lang/luajit/luajit-9999.ebuild
+++ b/dev-lang/luajit/luajit-9999.ebuild
@@ -21,17 +21,21 @@ PDEPEND="
 	virtual/lua[luajit]
 "
 
-# Workaround for CHECKREQS_MEMORY
-pkg_setup() { :; }
-
-pkg_pretend() {
-	CHECKREQS_DISK_BUILD="10M"
-	use optimization && {
+check_req() {
+	if use optimization; then
 		CHECKREQS_MEMORY="200M"
 		ewarn "Optimized (amalgamated) build wants at least 200MB of RAM"
 		ewarn "If you have no such RAM - try to disable 'optimization' flag"
-	}
-	check-reqs_pkg_pretend
+	fi
+	check-reqs_pkg_${1}
+}
+
+pkg_pretend() {
+	check_req pretend
+}
+
+pkg_setup() {
+	check_req setup
 }
 
 src_prepare(){
@@ -46,9 +50,11 @@ src_prepare(){
 		-e "s|lib/|$(get_libdir)/|" \
 		-i src/luaconf.h || die "failed to fix prefix in luaconf.h"
 
-	use lua52compat && sed \
-		-e "/LUAJIT_ENABLE_LUA52COMPAT/s|#||" \
-		-i src/Makefile || die
+	if use lua52compat; then
+		sed \
+			-e "/LUAJIT_ENABLE_LUA52COMPAT/s|#||" \
+			-i src/Makefile || die "Lua-5.2 compat fix failed"
+	fi
 
 	# removing strip
 	sed -e '/$(Q)$(TARGET_STRIP)/d' -i src/Makefile \
@@ -61,6 +67,9 @@ src_prepare(){
 }
 
 src_compile() {
+	local opt;
+	use optimization && opt="amalg";
+
 	if has_version '=sys-devel/gcc-4.7.3' && gcc-specs-pie && has ccache ${FEATURES}; then
 		# It is three ways to avoid compilation breaking
 		# in case, when user use gcc-4.7.3+pie+ccache:
@@ -95,11 +104,7 @@ src_compile() {
 		ewarn "to disable ccache instead."
 	fi
 
-	if use optimization; then
-		emake amalg || die "emake failed!"
-	else
-		emake || die "emake failed!"
-	fi
+	emake "${opt}"
 }
 
 src_install() {
@@ -114,7 +119,7 @@ pkg_postinst() {
 		einfo "You'd probably want to install dev-lua/iluajit to";
 		ewarn "get fully functional interactive shell for LuaJIT";
 	fi
-	if has_version app-editors/emacs || app-editors/xemacs; then
+	if has_version app-editors/emacs || has_version app-editors/xemacs; then
 		einfo "You'd probably want to install app-emacs/lua-mode to";
 		ewarn "get Lua completion in emacs.";
 	fi