Use in-system lua instead of bundled one (bug #296552).

Package-Manager: portage-2.2_rc58/cvs/Linux x86_64

4 files changed, 96 insertions, 10 deletions

diff --git a/dev-embedded/scratchbox2/ChangeLog b/dev-embedded/scratchbox2/ChangeLog
index 1aea8cc94b9c..345cba365c0c 100644
--- a/dev-embedded/scratchbox2/ChangeLog
+++ b/dev-embedded/scratchbox2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/scratchbox2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox2/ChangeLog,v 1.2 2009/11/22 22:49:53 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox2/ChangeLog,v 1.3 2009/12/12 09:36:19 ayoy Exp $
+
+*scratchbox2-2.0-r1 (12 Dec 2009)
+
+  12 Dec 2009; Dominik Kapusta <ayoy@gentoo.org> -scratchbox2-2.0.ebuild,
+  +scratchbox2-2.0-r1.ebuild, +files/scratchbox2-2.0-use-system-lua.patch:
+  Use in-system lua instead of bundled one (bug #296552).
 
   22 Nov 2009; Dominik Kapusta <ayoy@gentoo.org> scratchbox2-2.0.ebuild:
   Moving slot back to 0
diff --git a/dev-embedded/scratchbox2/Manifest b/dev-embedded/scratchbox2/Manifest
index ee248d92e418..db84402ae2dc 100644
--- a/dev-embedded/scratchbox2/Manifest
+++ b/dev-embedded/scratchbox2/Manifest
@@ -3,14 +3,15 @@ Hash: SHA1
 
 AUX scratchbox2-2.0-gentoo.patch 2328 RMD160 67fc03b7a9207dd0cba92884eff3df5df1bccd07 SHA1 1866ae620485f536ce2d1abc2d2c956ac021f019 SHA256 73e21123006f1a5cc20924f19b107a69e35d118b38c26ef3e5c1499f95bb73c9
 AUX scratchbox2-2.0-glibc-2.10.patch 1452 RMD160 40e1dc98ba5ebe69e748609a97662150f6a4f823 SHA1 07d7e0ffaf676cdbce4e9f4bf670cac1f067f130 SHA256 e01f526beae876d6335dd231a1cd7cc8a28cdbbdd0799e6e66dcab48f4998d9d
+AUX scratchbox2-2.0-use-system-lua.patch 2935 RMD160 0716ad3000ffad83af29c6b80f65491751d37497 SHA1 766fa3df6a1ef864868945ecae0a4449b899a086 SHA256 7c94845f98672d8fef51b7996db886d8888790b88d72732b103dcfa678dd2694
 DIST sbox2-2.0.tar.bz2 371402 RMD160 20399753b66edc1c8b2731a87327ed6b8c5d26c3 SHA1 6d5ac248a071d222ed28c7ea42bad00d3be7efc8 SHA256 bafabe2dcce1be57b494f91bbf4a6fde3f624434fe04a1fcd74acc54a1a5ccc1
-EBUILD scratchbox2-2.0.ebuild 1416 RMD160 856b0342bb3252ec29707307aadb3514d9a5a14f SHA1 6214ef6deebaedaa15b1fedc57eb9e7e5cfe206a SHA256 bf8e7a959ee711b56d532073dd6cd5924d6d986384f8655414878d9c533f4626
-MISC ChangeLog 591 RMD160 3a5cc45de49553f25202f50e3d266eb94974b2fd SHA1 b6644d38631aaa63f1402c9527f92cc2a941e99c SHA256 bb303a947301ddab0bcf98e1162feb1161a35f7c43c3744acfade0f64cd91a19
+EBUILD scratchbox2-2.0-r1.ebuild 1504 RMD160 fbe5b2d7131944359f0e9e5a32d72b8c0d53ad98 SHA1 821b34186ee235008de7be4e9d14cb79416d5e0b SHA256 f6be9cc17295963ab561474f1fc2dcb7827e32781ef7c483d8d0e1eaa87ae362
+MISC ChangeLog 834 RMD160 8dce874b9bee629b7ad08a884dfb86c882bdf895 SHA1 24a90e6bf098973e7e2451df3f1e16dc07c3db5a SHA256 27e1d7aea6b03908d4024f8573ab4d3c94b7346c6fe604e7bbc3f6cfffdbfca4
 MISC metadata.xml 309 RMD160 54e8d81968ef8a15b061624dd684b047a1d31440 SHA1 3604f1bbd422e2e5c8024e8202a3ed87871e4beb SHA256 152493d68fa5bf5872e6ef9ee368506f0d58de5e6e17bb6fab8e2c55c2050fe5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksJwBkACgkQ+CZEqwt+F6aocwCfbP7j0MFgz5bhVVq+qgGT7JE5
-qkEAoJBXKCe86tnjAs1bYrC36il7TjBC
-=XUp3
+iEYEARECAAYFAksjZBwACgkQ+CZEqwt+F6ZAjQCfcthcCr6cHIjZDO/z2W6PGnE5
+c4sAn1aFBOIb2UId90Y0N1M42hdWKFSJ
+=caeH
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch b/dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch
new file mode 100644
index 000000000000..d4c231c74db2
--- /dev/null
+++ b/dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch
@@ -0,0 +1,77 @@
+diff --git a/Makefile b/Makefile
+index c5b26cc..da48ea0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -60,7 +60,7 @@ subdirs = luaif preload utils
+ -include config.mak
+ 
+ CFLAGS += -I$(OBJDIR)/include -I$(SRCDIR)/include
+-CFLAGS += -I$(SRCDIR)/luaif/lua-5.1.4/src
++# CFLAGS += -I$(SRCDIR)/luaif/lua-5.1.4/src
+ CFLAGS += -D_GNU_SOURCE=1 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1
+ CFLAGS += -DSCRATCHBOX_ROOT="$(prefix)"
+ CFLAGS += $(MACH_CFLAG)
+@@ -103,10 +103,7 @@ regular: .configure .version
+ 	@$(MAKE) -f $(SRCDIR)/Makefile --include-dir=$(SRCDIR) SRCDIR=$(SRCDIR) do-all
+ 
+ multilib:
+-	@mkdir -p obj-32
+-	@mkdir -p obj-64
+-	@$(MAKE) MACH_CFLAG=-m32 -C obj-32 --include-dir=.. -f ../Makefile SRCDIR=.. regular
+-	@$(MAKE) MACH_CFLAG=-m64 -C obj-64 --include-dir=.. -f ../Makefile SRCDIR=.. regular
++	@$(MAKE) MACH_CFLAG=-m64 regular
+ 
+ 
+ gcc_bins = addr2line ar as cc c++ c++filt cpp g++ gcc gcov gdb gdbtui gprof ld nm objcopy objdump ranlib rdi-stub readelf run size strings strip
+@@ -230,8 +227,7 @@ endif
+ multilib_prefix=$(prefix)
+ 
+ install-multilib: multilib
+-	@$(MAKE) -C obj-32 --include-dir=.. -f ../Makefile SRCDIR=.. do-install-multilib bitness=32
+-	@$(MAKE) -C obj-64 --include-dir=.. -f ../Makefile SRCDIR=.. do-install-multilib bitness=64
++	@$(MAKE) do-install-multilib bitness=64
+ 
+ do-install-multilib: install-noarch
+ 	$(P)INSTALL
+diff --git a/luaif/Makefile b/luaif/Makefile
+index 28e8885..5e1af6f 100644
+--- a/luaif/Makefile
++++ b/luaif/Makefile
+@@ -5,7 +5,7 @@ objs := $(D)/luaif.o $(D)/sb_log.o $(D)/paths.o $(D)/argvenvp.o
+ $(D)/sb_log.o: preload/exported.h
+ 
+ luaif/libluaif.a: $(objs)
+-luaif/libluaif.a: override CFLAGS := $(CFLAGS) -O2 -g -fPIC -Wall -W -I$(SRCDIR)/$(LUASRC) -I$(OBJDIR)/preload -I$(SRCDIR)/preload
++luaif/libluaif.a: override CFLAGS := $(CFLAGS) -O2 -g -fPIC -Wall -W -I$(OBJDIR)/preload -I$(SRCDIR)/preload
+ luaif/libluaif.a: override LDFLAGS := $(LDFLAGS)
+ luaif/libluaif.a: override LIBS := 
+ 
+@@ -24,5 +24,5 @@ luaif/liblua.a: override CFLAGS := -O2 -g -fPIC -Wall -W $(CFLAGS)
+ luaif/liblua.a: override LDFLAGS := $(LDFLAGS)
+ luaif/liblua.a: override LIBS :=
+ 
+-targets := $(targets) $(D)/libluaif.a $(D)/liblua.a
++targets := $(targets) $(D)/libluaif.a
+ 
+diff --git a/preload/Makefile b/preload/Makefile
+index 9f785ba..5094dbc 100644
+--- a/preload/Makefile
++++ b/preload/Makefile
+@@ -8,7 +8,7 @@ LIBSB2_LDFLAGS = -Wl,-soname=$(LIBSB2_SONAME) \
+ # DO NOT add any libraries that depend on libpthread to
+ # LIBSB2_LIBS or LIBS!! see the comments in luaif.c.
+ 
+-LIBSB2_LIBS =
++LIBSB2_LIBS = -llua
+ SHLIBEXT = so
+ else
+ LIBSB2_LIBS =
+@@ -17,7 +17,7 @@ endif
+ 
+ 
+ $(D)/libsb2.$(SHLIBEXT): $(call O,$(objs))
+-$(D)/libsb2.$(SHLIBEXT): luaif/libluaif.a luaif/liblua.a
++$(D)/libsb2.$(SHLIBEXT): luaif/libluaif.a
+ $(D)/libsb2.$(SHLIBEXT): CFLAGS := $(CFLAGS) -fPIC -Wall -W \
+ 		-I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS)
+ $(D)/libsb2.$(SHLIBEXT): LDFLAGS := $(LDFLAGS) $(LIBSB2_LDFLAGS)
diff --git a/dev-embedded/scratchbox2/scratchbox2-2.0.ebuild b/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild
index aee40f44570b..0003182f49a8 100644
--- a/dev-embedded/scratchbox2/scratchbox2-2.0.ebuild
+++ b/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox2/scratchbox2-2.0.ebuild,v 1.2 2009/11/22 22:49:53 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild,v 1.1 2009/12/12 09:36:19 ayoy Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
+DEPEND=">=dev-lang/lua-5.1.4"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -26,6 +26,8 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	epatch "${FILESDIR}/${P}-glibc-2.10.patch"
 	epatch "${FILESDIR}/${P}-gentoo.patch"
+	# bug 296552
+	epatch "${FILESDIR}/${P}-use-system-lua.patch"
 
 	sed -e "s/^\(CC = \).*/\1$(tc-getCC)/" \
 		-e "s/^\(CXX = \).*/\1$(tc-getCXX)/" \
@@ -40,7 +42,7 @@ src_compile() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	emake prefix="${D}/usr" install || die "emake install failed"
 
 	# List all the multilib libdirs
 	local libdirs=
@@ -53,5 +55,5 @@ src_install() {
 	EOF
 	doenvd "${T}/55scratchbox2" || die "doenvd failed"
 
-	dodoc AUTHORS README || die "dodoc failed"
+	dodoc AUTHORS README TODO || die "dodoc failed"
 }