As discussed with Rafael: version bump with a twist: cleanup versioning so that it's more reliable. Consider this experimental as it breaks compatibility with about everything, and it might just be dropped if upstream takes a different road.

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

4 files changed, 258 insertions, 8 deletions

diff --git a/dev-lang/luajit/ChangeLog b/dev-lang/luajit/ChangeLog
index dd8d987a43a8..022fccf81897 100644
--- a/dev-lang/luajit/ChangeLog
+++ b/dev-lang/luajit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/luajit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/ChangeLog,v 1.7 2011/05/07 11:06:00 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/ChangeLog,v 1.8 2011/10/30 21:21:57 flameeyes Exp $
+
+*luajit-2.0.0_beta8_p1 (30 Oct 2011)
+
+  30 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +luajit-2.0.0_beta8_p1.ebuild, +files/LuaJIT-2.0.0-beta8-gentoo.patch:
+  As discussed with Rafael: version bump with a twist: cleanup versioning so
+  that it's more reliable. Consider this experimental as it breaks compatibility
+  with about everything, and it might just be dropped if upstream takes a
+  different road.
 
 *luajit-2.0.0_beta7 (07 May 2011)
 
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index 6eb6a1b024c1..78333b9be9fe 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX LuaJIT-2.0.0-beta8-gentoo.patch 6330 RMD160 8913a94dc4fddafa1218b0a2720f58f05ebc9e3e SHA1 dd1bb25267bf356c162fc90056fe4e85775568d8 SHA256 3b0516e66741e302972e3708246cb4dad4d27e679cd4b050b61165c60cbbafaf
 DIST LuaJIT-1.1.6.tar.gz 364447 RMD160 9ad03d5a88bb15548edd2f7263f79cc99be4a7c6 SHA1 cfe7e3f84b3641bba237164d2ad1c3d37f41cada SHA256 c3dee987635540f64ebe834aa6c8ef17e0c0b8248324ee20953f50c98be2dd8a
 DIST LuaJIT-2.0.0-beta7.tar.gz 674740 RMD160 3a76a0f5c09712f1c99556b8978ed9de039f4d4d SHA1 77657de3cf7794437daac29a03870515213d0711 SHA256 ab28c05d7d306c6a678fe3f0549dcecd4373ed4ee7cb9d85444a958e584087d8
+DIST LuaJIT-2.0.0-beta8.tar.gz 720393 RMD160 34af1d6fe72c76f48e9023602bdbdea20e26e6f8 SHA1 4eadd45f6dc75d7b6daefe442925649028654753 SHA256 408aaa6606dc91a37fd58f2b75d47a20f831b1d57d33d1af18721327d745653f
+DIST beta8_hotfix1.patch 4876 RMD160 cb8f197a66e6fb59f6728515f75296438dce38ce SHA1 e540861975f0d44cad57efd8be616a399ac5f111 SHA256 142716faaa0dbb97938aa50179fc2ee4d3e45aab80951adfd7f96dc1fd1d7c43
 EBUILD luajit-1.1.6.ebuild 1413 RMD160 30641905d6b1e5443a3abdc1db42208ba4683b48 SHA1 68ff0d192a1433997792326bc964fc29a2435228 SHA256 1d2d8804cb9e45f68b66cabc791796285b5b5e85239a8c919e2e8428045a73f9
 EBUILD luajit-2.0.0_beta7.ebuild 1101 RMD160 0880a8a686576032c7364cffa21f04707a1de129 SHA1 801ab8d9342904c046f7dd84862e9955619ca5fc SHA256 3fb1f7224b7b2d242352177ffaf1be6290bafe445350eba17caf517ee5215f49
-MISC ChangeLog 1316 RMD160 32ae304e35e10bf6402b8d389021eb22f15d7c3e SHA1 17e65955597e1e45a1c74dcdc19260745bc657f9 SHA256 9885cecb007ab944e1fc5d21ee8730b889c1a4c71339606ce38ae2aaf1c1e5bd
+EBUILD luajit-2.0.0_beta8_p1.ebuild 1616 RMD160 d2276cbf46570bfa37094992e427881f0f9a7f43 SHA1 e7ea6e471922a8fb211bfa962796182e6c934cc1 SHA256 75e8e253b1af76209ceafb6cf7c4d991f7fea602c02de90c9c954cc6261c49af
+MISC ChangeLog 1730 RMD160 0b640a299ec36945adf8d43d5b7974804960d411 SHA1 1b219a5aef23af57684defcf781ed6131d98b98a SHA256 8a453f78e995ab2167d6508db63bd77bd60211a1da4fbf1044b5a91a4657f9a9
 MISC metadata.xml 373 RMD160 da4f80697b1bc0321c15f3dff3d7a1a6d5b28d60 SHA1 eb3d53a7c5a37156089a0267dcf9c9f4f146d4ae SHA256 f812cadf802f7bb17ce54888b22e0d8b25fa616ad4f0141aa1b390e6d99a7ead
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59jUgACgkQfXuS5UK5QB1MoAQAoNfXTrk0FFeY46BrDnpMhmtV
-QxEuW8jt/sTVdq1H88DTRINkQD3lpCMU7PoEVH/sxyC64kA9S+UqHS1KIHAnmgHH
-yOCD0eSu5ZJHIvN9lSNXPHVRAuBF8+PG1RvupVW+4R5/wIXs7ckKvz3wmlm7Vo7n
-7g7m0YXYaIKmo6yaDnM=
-=VKaG
+iEYEARECAAYFAk6tv9cACgkQAiZjviIA2XgUgwCg6keG1gust7f7QmEpyxqxDYOI
+xjMAoLQACikNHKHnL5rwppUMljzrkVY6
+=LSAX
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/luajit/files/LuaJIT-2.0.0-beta8-gentoo.patch b/dev-lang/luajit/files/LuaJIT-2.0.0-beta8-gentoo.patch
new file mode 100644
index 000000000000..ebe611fbee0a
--- /dev/null
+++ b/dev-lang/luajit/files/LuaJIT-2.0.0-beta8-gentoo.patch
@@ -0,0 +1,174 @@
+Index: LuaJIT-2.0.0-beta8/etc/luajit.pc
+===================================================================
+--- LuaJIT-2.0.0-beta8.orig/etc/luajit.pc
++++ LuaJIT-2.0.0-beta8/etc/luajit.pc
+@@ -3,13 +3,13 @@ majver=2
+ minver=0
+ relver=0
+ version=${majver}.${minver}.${relver}-beta8
+-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}
+Index: LuaJIT-2.0.0-beta8/Makefile
+===================================================================
+--- LuaJIT-2.0.0-beta8.orig/Makefile
++++ LuaJIT-2.0.0-beta8/Makefile
+@@ -18,37 +18,38 @@ MINVER=  0
+ RELVER=  0
+ PREREL=  -beta8
+ VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
+-ABIVER=  5.1
+-NODOTABIVER=  51
++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_JITLIB= $(INSTALL_SHARE)/luajit-$(VERSION)/jit
++INSTALL_JITLIB= $(INSTALL_SHARE)/luajit-$(SHORTVER)/jit
+ INSTALL_LMOD= $(INSTALL_SHARE)/lua/$(ABIVER)
+ INSTALL_CMOD= $(INSTALL_LIB)/lua/$(ABIVER)
+ 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-$(NODOTABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
+-INSTALL_DYLIBSHORT1= libluajit-$(NODOTABIVER).dylib
+-INSTALL_DYLIBSHORT2= libluajit-$(NODOTABIVER).$(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)
+@@ -57,7 +58,7 @@ INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL
+ 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)
+@@ -68,7 +69,7 @@ SYMLINK= ln -sf
+ INSTALL_X= install -m 0755
+ INSTALL_F= install -m 0644
+ 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
+@@ -107,7 +108,7 @@ install: $(INSTALL_DEP)
+ 	  $(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
+Index: LuaJIT-2.0.0-beta8/src/luaconf.h
+===================================================================
+--- LuaJIT-2.0.0-beta8.orig/src/luaconf.h
++++ LuaJIT-2.0.0-beta8/src/luaconf.h
+@@ -22,16 +22,16 @@
+ #define LUA_CPATH_DEFAULT \
+   ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+ #else
+-#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-beta8/"
++#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-beta8/"
++#define LUA_JDIR	LUA_ROOT "share/luajit-2.0/"
+ #define LUA_XPATH
+ #define LUA_XCPATH
+ #endif
+Index: LuaJIT-2.0.0-beta8/src/Makefile
+===================================================================
+--- LuaJIT-2.0.0-beta8.orig/src/Makefile
++++ LuaJIT-2.0.0-beta8/src/Makefile
+@@ -13,8 +13,8 @@
+ MAJVER=  2
+ MINVER=  0
+ RELVER=  0
+-ABIVER=  5.1
+-NODOTABIVER= 51
++SHORTVER= $(MAJVER).$(MINVER)
++NODOTSHORTVER=  $(MAJVER)$(MINVER)
+ 
+ ##############################################################################
+ #############################  COMPILER OPTIONS  #############################
+@@ -197,9 +197,9 @@ TARGET_LD= $(CROSS)$(CC)
+ TARGET_AR= $(CROSS)ar rcus
+ TARGET_STRIP= $(CROSS)strip
+ 
+-TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER)
+-TARGET_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
+-TARGET_DLLNAME= lua$(NODOTABIVER).dll
++TARGET_SONAME= libluajit-$(SHORTVER).so.$(RELVER)
++TARGET_DYLIBNAME= libluajit-$(NODOTSHORTVER).$(MAJVER).$(MINVER).$(RELVER).dylib
++TARGET_DLLNAME= lua$(NODOTSHORTVER).dll
+ TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME)
+ TARGET_DYNXLDOPTS=
+ 
+@@ -451,10 +451,8 @@ endif
+ endif
+ endif
+ 
+-Q= @
+-E= @echo
+-#Q=
+-#E= @:
++Q=
++E= @:
+ 
+ ##############################################################################
+ # Make targets.
diff --git a/dev-lang/luajit/luajit-2.0.0_beta8_p1.ebuild b/dev-lang/luajit/luajit-2.0.0_beta8_p1.ebuild
new file mode 100644
index 000000000000..29de9104feee
--- /dev/null
+++ b/dev-lang/luajit/luajit-2.0.0_beta8_p1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 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_beta8_p1.ebuild,v 1.1 2011/10/30 21:21:57 flameeyes Exp $
+
+EAPI="4"
+
+inherit eutils multilib pax-utils versionator toolchain-funcs
+
+MY_P="LuaJIT-$(get_version_component_range 1-3)-$(get_version_component_range 4)"
+if [[ $(get_version_component_range 5) != "" ]]; then
+	HOTFIX="$(get_version_component_range 4-5)"
+	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 *
+}