Adding scratchbox-2.0 for testing

(Portage version: 2.2_rc46/cvs/Linux x86_64)

2 files changed, 96 insertions, 0 deletions

diff --git a/dev-embedded/scratchbox/files/scratchbox-2.0-gentoo.patch b/dev-embedded/scratchbox/files/scratchbox-2.0-gentoo.patch
new file mode 100644
index 000000000000..e762c7dd5778
--- /dev/null
+++ b/dev-embedded/scratchbox/files/scratchbox-2.0-gentoo.patch
@@ -0,0 +1,57 @@
+diff --git a/Makefile b/Makefile
+index 23a13b3..c5b26cc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -59,7 +59,6 @@ subdirs = luaif preload utils
+ 
+ -include config.mak
+ 
+-CFLAGS += -O2 -g -Wall -W
+ CFLAGS += -I$(OBJDIR)/include -I$(SRCDIR)/include
+ CFLAGS += -I$(SRCDIR)/luaif/lua-5.1.4/src
+ CFLAGS += -D_GNU_SOURCE=1 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1
+@@ -145,6 +144,9 @@ install-noarch: regular
+ 	else install -d -m 755 $(prefix)/share/man/man1 ; \
+ 	fi
+ 	$(Q)echo "$(PACKAGE_VERSION)" > $(prefix)/share/scratchbox2/version
++	$(Q)install -c -m 755 $(OBJDIR)/utils/sb2-show $(prefix)/bin/sb2-show
++	$(Q)install -c -m 755 $(OBJDIR)/utils/sb2-monitor $(prefix)/bin/sb2-monitor
++	$(Q)install -c -m 755 $(OBJDIR)/utils/sb2-interp-wrapper $(prefix)/bin/sb2-interp-wrapper
+ 	$(Q)install -c -m 755 $(SRCDIR)/utils/sb2 $(prefix)/bin/sb2
+ 	$(Q)install -c -m 755 $(SRCDIR)/utils/sb2-init $(prefix)/bin/sb2-init
+ 	$(Q)install -c -m 755 $(SRCDIR)/utils/sb2-config $(prefix)/bin/sb2-config
+@@ -210,10 +212,10 @@ install-noarch: regular
+ ifeq ($(MACH),x86_64)
+ install: install-multilib
+ else
+-install: do-install
++install: install-singlelib
+ endif
+ 
+-do-install: install-noarch
++install-singlelib: install-noarch
+ 	$(P)INSTALL
+ 	@if [ -d $(prefix)/lib ] ; \
+ 	then echo "$(prefix)/lib present" ; \
+@@ -221,9 +223,6 @@ do-install: install-noarch
+ 	fi
+ 	$(Q)install -d -m 755 $(prefix)/lib/libsb2
+ 	$(Q)install -c -m 755 $(OBJDIR)/preload/libsb2.$(SHLIBEXT) $(prefix)/lib/libsb2/libsb2.so.$(PACKAGE_VERSION)
+-	$(Q)install -c -m 755 $(OBJDIR)/utils/sb2-show $(prefix)/bin/sb2-show
+-	$(Q)install -c -m 755 $(OBJDIR)/utils/sb2-monitor $(prefix)/bin/sb2-monitor
+-	$(Q)install -c -m 755 $(OBJDIR)/utils/sb2-interp-wrapper $(prefix)/bin/sb2-interp-wrapper
+ ifeq ($(OS),Linux)
+ 	$(Q)/sbin/ldconfig -n $(prefix)/lib/libsb2
+ endif
+@@ -232,9 +231,9 @@ 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
++	@$(MAKE) -C obj-64 --include-dir=.. -f ../Makefile SRCDIR=.. do-install-multilib bitness=64
+ 
+-do-install-multilib:
++do-install-multilib: install-noarch
+ 	$(P)INSTALL
+ 	@if [ -d $(multilib_prefix)/lib$(bitness) ] ; \
+ 	then echo "$(prefix)/lib$(bitness) present" ; \
diff --git a/dev-embedded/scratchbox/files/scratchbox-2.0-glibc-2.10.patch b/dev-embedded/scratchbox/files/scratchbox-2.0-glibc-2.10.patch
new file mode 100644
index 000000000000..c5ec6aea4341
--- /dev/null
+++ b/dev-embedded/scratchbox/files/scratchbox-2.0-glibc-2.10.patch
@@ -0,0 +1,39 @@
+diff --git a/preload/interface.master b/preload/interface.master
+index 55a9481..4ba22b2 100644
+--- a/preload/interface.master
++++ b/preload/interface.master
+@@ -406,20 +406,34 @@ WRAP: int rmdir(const char *pathname) : \
+ 
+ #ifdef HAVE_SCANDIR
+ #ifdef HAVE_LINUX_SCANDIR
++#if _POSIX_C_SOURCE == 200809L
++WRAP: int scandir(const char *dir, struct dirent ***namelist, \
++	SCANDIR_TYPE_ARG3, \
++	int(*compar)(const struct dirent **, const struct dirent **)) : \
++	map(dir) hardcode_param(3,filter)
++#else
+ WRAP: int scandir(const char *dir, struct dirent ***namelist, \
+ 	SCANDIR_TYPE_ARG3, int(*compar)(const void *, const void *)) : \
+ 	map(dir) hardcode_param(3,filter)
+ #endif
++#endif
+ #ifdef HAVE_OSX_SCANDIR
+ WRAP: int scandir(const char *dirname, struct dirent ***namelist, int (*select)(struct dirent *), int (*compar)(const void *, const void *)): map(dirname)
+ #endif
+ #endif
+ #ifdef HAVE_SCANDIR64
++#if _POSIX_C_SOURCE == 200809L
++WRAP: int scandir64(const char *dir, struct dirent64 ***namelist, \
++	int(*filter)(const struct dirent64 *), \
++	int(*compar)(const struct dirent64 **, const struct dirent64 **)) : \
++	map(dir)
++#else
+ WRAP: int scandir64(const char *dir, struct dirent64 ***namelist, \
+ 	int(*filter)(const struct dirent64 *), \
+ 	int(*compar)(const void *, const void *)) : \
+ 	map(dir)
+ #endif
++#endif
+ #ifdef HAVE_SETXATTR
+ #ifdef HAVE_LINUX_XATTRS
+ WRAP: int setxattr(const char *path, const char *name, const void *value, \