Version bump. Bug #446114. Patch from hasufell.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 243 insertions, 2 deletions

diff --git a/dev-lang/luajit/ChangeLog b/dev-lang/luajit/ChangeLog
index 6201ffb6e7a0..b1c8687d342d 100644
--- a/dev-lang/luajit/ChangeLog
+++ b/dev-lang/luajit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/luajit
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/ChangeLog,v 1.9 2012/05/13 20:37:14 rafaelmartins Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/ChangeLog,v 1.10 2013/02/10 02:45:38 rafaelmartins Exp $
+
+*luajit-2.0.0 (10 Feb 2013)
+
+  10 Feb 2013; Rafael G. Martins <rafaelmartins@gentoo.org>
+  +luajit-2.0.0.ebuild, +files/LuaJIT-2.0.0-gentoo.patch:
+  Version bump. Bug #446114. Patch from hasufell.
 
 *luajit-2.0.0_beta10 (13 May 2012)
 
diff --git a/dev-lang/luajit/files/LuaJIT-2.0.0-gentoo.patch b/dev-lang/luajit/files/LuaJIT-2.0.0-gentoo.patch
new file mode 100644
index 000000000000..c75e7d73d74e
--- /dev/null
+++ b/dev-lang/luajit/files/LuaJIT-2.0.0-gentoo.patch
@@ -0,0 +1,170 @@
+--- etc/luajit.pc
++++ etc/luajit.pc
+@@ -3,13 +3,13 @@
+ minver=0
+ relver=0
+ version=${majver}.${minver}.${relver}
+-abiver=5.1
++abiver=jit-5.1
+ 
+-prefix=/usr/local
++prefix=/usr
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@LIBDIR@
+ libname=luajit-${abiver}
+-includedir=${prefix}/include/luajit-${majver}.${minver}
++includedir=${prefix}/include/luajit-@SHORTVER@
+ 
+ INSTALL_LMOD=${prefix}/share/lua/${abiver}
+ INSTALL_CMOD=${prefix}/lib/lua/${abiver}
+--- Makefile
++++ Makefile
+@@ -17,23 +17,25 @@
+ MINVER=  0
+ RELVER=  0
+ VERSION= $(MAJVER).$(MINVER).$(RELVER)
+-ABIVER=  5.1
++SHORTVER= $(MAJVER).$(MINVER)
++ABIVER=  jit-$(SHORTVER)
++NODOTSHORTVER=  $(MAJVER)$(MINVER)
+ 
+ ##############################################################################
+ #
+ # Change the installation path as needed. This automatically adjusts
+ # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
+ #
+-export PREFIX= /usr/local
++export PREFIX= /usr
+ ##############################################################################
+ 
+ DPREFIX= $(DESTDIR)$(PREFIX)
+ INSTALL_BIN=   $(DPREFIX)/bin
+-INSTALL_LIB=   $(DPREFIX)/lib
++INSTALL_LIB=   $(DPREFIX)/$(LIBDIR)
+ INSTALL_SHARE= $(DPREFIX)/share
+-INSTALL_INC=   $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
++INSTALL_INC=   $(DPREFIX)/include/luajit-$(SHORTVER)
+ 
+-INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
++INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(SHORTVER)
+ INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
+ INSTALL_LMODD= $(INSTALL_SHARE)/lua
+ INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
+@@ -42,14 +44,14 @@
+ INSTALL_MAN= $(INSTALL_SHARE)/man/man1
+ INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
+ 
+-INSTALL_TNAME= luajit-$(VERSION)
++INSTALL_TNAME= luajit-$(SHORTVER)
+ INSTALL_TSYMNAME= luajit
+-INSTALL_ANAME= libluajit-$(ABIVER).a
+-INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
+-INSTALL_SOSHORT= libluajit-$(ABIVER).so
+-INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
+-INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib
+-INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib
++INSTALL_ANAME= libluajit-$(SHORTVER).a
++INSTALL_SONAME= libluajit-$(SHORTVER).so.$(RELVER)
++INSTALL_SOSHORT= libluajit-$(SHORTVER).so
++INSTALL_DYLIBNAME= libluajit-$(NODOTSHORTVER).$(MAJVER).$(MINVER).$(RELVER).dylib
++INSTALL_DYLIBSHORT1= libluajit-$(NODOTSHORTVER).dylib
++INSTALL_DYLIBSHORT2= libluajit-$(NODOTSHORTVER).$(MAJVER).dylib
+ INSTALL_PCNAME= luajit.pc
+ 
+ INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME)
+@@ -58,7 +60,7 @@
+ INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
+ INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
+ INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
+-INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
++INSTALL_PC= $(INSTALL_PKGCONFIG)/luajit-$(SHORTVER).pc
+ 
+ INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
+   $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
+@@ -73,7 +75,7 @@
+ INSTALL_F= install -m 0644
+ UNINSTALL= $(RM)
+ LDCONFIG= ldconfig -n
+-SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|"
++SED_PC= sed -e "s|@SHORTVER@|$(SHORTVER)|" -e "s|@LIBDIR@|$(LIBDIR)|"
+ 
+ FILE_T= luajit
+ FILE_A= libluajit.a
+@@ -113,7 +115,7 @@
+ 	  $(LDCONFIG) $(INSTALL_LIB) && \
+ 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
+ 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
+-	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
++	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)/luajit-$(SHORTVER).1
+ 	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
+ 	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
+ 	  $(RM) $(FILE_PC).tmp
+--- src/luaconf.h
++++ src/luaconf.h
+@@ -26,16 +26,16 @@
+ ** Note to distribution maintainers: do NOT patch the following line!
+ ** Please read ../doc/install.html#distro and pass PREFIX=/usr instead.
+ */
+-#define LUA_ROOT	"/usr/local/"
+-#define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
+-#define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
++#define LUA_ROOT	"/usr/"
++#define LUA_LDIR	LUA_ROOT "share/lua/jit-2.0/"
++#define LUA_CDIR	LUA_ROOT "lib/lua/jit-2.0/"
+ #ifdef LUA_XROOT
+-#define LUA_JDIR	LUA_XROOT "share/luajit-2.0.0/"
++#define LUA_JDIR	LUA_XROOT "share/luajit-2.0/"
+ #define LUA_XPATH \
+-  ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua"
+-#define LUA_XCPATH	LUA_XROOT "lib/lua/5.1/?.so;"
++  ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/jit-2.0/?/init.lua"
++#define LUA_XCPATH	LUA_XROOT "lib/lua/jit-2.0/?.so;"
+ #else
+-#define LUA_JDIR	LUA_ROOT "share/luajit-2.0.0/"
++#define LUA_JDIR	LUA_ROOT "share/luajit-2.0/"
+ #define LUA_XPATH
+ #define LUA_XCPATH
+ #endif
+--- src/Makefile
++++ src/Makefile
+@@ -13,8 +13,9 @@
+ MAJVER=  2
+ MINVER=  0
+ RELVER=  0
+-ABIVER=  5.1
+-NODOTABIVER= 51
++SHORTVER= $(MAJVER).$(MINVER)
++NODOTSHORTVER=  $(MAJVER)$(MINVER)
++LIBDIR ?= lib
+ 
+ ##############################################################################
+ #############################  COMPILER OPTIONS  #############################
+@@ -188,10 +189,10 @@
+ TARGET_AR= $(CROSS)ar rcus
+ TARGET_STRIP= $(CROSS)strip
+ 
+-TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER)
+-TARGET_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).dylib
+-TARGET_DYLIBPATH= $(or $(PREFIX),/usr/local)/lib/$(TARGET_DYLIBNAME)
+-TARGET_DLLNAME= lua$(NODOTABIVER).dll
++TARGET_SONAME= libluajit-$(SHORTVER).so.$(RELVER)
++TARGET_DYLIBNAME= libluajit-$(NODOTSHORTVER).$(MAJVER).$(MINVER).$(RELVER).dylib
++TARGET_DYLIBPATH= $(or $(PREFIX),/usr/local)/$(LIBDIR)/$(TARGET_DYLIBNAME)
++TARGET_DLLNAME= lua$(NODOTSHORTVER).dll
+ TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME)
+ TARGET_DYNXLDOPTS=
+ 
+@@ -549,10 +550,8 @@
+ endif
+ endif
+ 
+-Q= @
+-E= @echo
+-#Q=
+-#E= @:
++Q=
++E= @:
+ 
+ ##############################################################################
+ # Make targets.
diff --git a/dev-lang/luajit/luajit-2.0.0.ebuild b/dev-lang/luajit/luajit-2.0.0.ebuild
new file mode 100644
index 000000000000..625999009fba
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.0.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.0.ebuild,v 1.1 2013/02/10 02:45:38 rafaelmartins Exp $
+
+EAPI=5
+
+inherit eutils multilib pax-utils versionator toolchain-funcs
+
+MY_P="LuaJIT-$(get_version_component_range 1-3)"
+if [[ $(get_version_component_range 4) != "" ]]; then
+	HOTFIX="$(get_version_component_range 3-4)"
+	HOTFIX="${HOTFIX/_p/_hotfix}.patch"
+fi
+
+DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
+HOMEPAGE="http://luajit.org/"
+SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
+	${HOTFIX:+http://luajit.org/download/${HOTFIX}}"
+
+LICENSE="MIT"
+# this should probably be pkgmoved to 2.0 for sake of consistency.
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare(){
+	if [[ -n ${HOTFIX} ]]; then
+		epatch "${DISTDIR}/${HOTFIX}"
+	fi
+
+	epatch "${FILESDIR}"/${MY_P}-gentoo.patch
+}
+
+src_compile() {
+	emake \
+		DESTDIR="${D}" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		STATIC_CC="$(tc-getCC)" \
+		DYNAMIC_CC="$(tc-getCC) -fPIC" \
+		TARGET_LD="$(tc-getCC)" \
+		TARGET_AR="$(tc-getAR) rcus" \
+		TARGET_STRIP="true" \
+		LDCONFIG="true" \
+		LIBDIR="$(get_libdir)"
+}
+
+src_install(){
+	emake install \
+		DESTDIR="${D}" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		STATIC_CC="$(tc-getCC)" \
+		DYNAMIC_CC="$(tc-getCC) -fPIC" \
+		TARGET_LD="$(tc-getCC)" \
+		TARGET_AR="$(tc-getAR) rcus" \
+		TARGET_STRIP="true" \
+		LDCONFIG="true" \
+		LIBDIR="$(get_libdir)"
+
+	pax-mark m "${D}usr/bin/luajit-2.0"
+
+	cd "${S}"/doc
+	dohtml -r *
+}