Moving scratchbox2 ebuild to a separate package directory

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

4 files changed, 6 insertions, 154 deletions

diff --git a/dev-embedded/scratchbox/ChangeLog b/dev-embedded/scratchbox/ChangeLog
index 0f8d4806d26b..257fd4a5fb89 100644
--- a/dev-embedded/scratchbox/ChangeLog
+++ b/dev-embedded/scratchbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/scratchbox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox/ChangeLog,v 1.9 2009/11/15 16:46:49 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox/ChangeLog,v 1.10 2009/11/19 18:39:54 ayoy Exp $
+
+  19 Nov 2009; Dominik Kapusta <ayoy@gentoo.org> -scratchbox-2.0.ebuild,
+  -files/scratchbox-2.0-gentoo.patch,
+  -files/scratchbox-2.0-glibc-2.10.patch:
+  Moving scratchbox2 ebuild to a separate package directory
 
   15 Nov 2009; Dominik Kapusta <ayoy@gentoo.org> scratchbox-2.0.ebuild:
   Fixed LDPATH
diff --git a/dev-embedded/scratchbox/files/scratchbox-2.0-gentoo.patch b/dev-embedded/scratchbox/files/scratchbox-2.0-gentoo.patch
deleted file mode 100644
index e762c7dd5778..000000000000
--- a/dev-embedded/scratchbox/files/scratchbox-2.0-gentoo.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index c5ec6aea4341..000000000000
--- a/dev-embedded/scratchbox/files/scratchbox-2.0-glibc-2.10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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, \
diff --git a/dev-embedded/scratchbox/scratchbox-2.0.ebuild b/dev-embedded/scratchbox/scratchbox-2.0.ebuild
deleted file mode 100644
index 976ffb818524..000000000000
--- a/dev-embedded/scratchbox/scratchbox-2.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/scratchbox/scratchbox-2.0.ebuild,v 1.4 2009/11/15 16:46:49 ayoy Exp $
-
-EAPI="2"
-
-inherit autotools eutils multilib toolchain-funcs
-
-MY_PN="${PN/cratch}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A cross-compilation toolkit designed to make embedded Linux application development easier."
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/sbox2"
-SRC_URI="http://cgit.freedesktop.org/${MY_PN}/snapshot/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-glibc-2.10.patch"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	sed -e "s/^\(CC = \).*/\1$(tc-getCC)/" \
-		-e "s/^\(CXX = \).*/\1$(tc-getCXX)/" \
-		-e "s/^\(LD = \).*/\1$(tc-getLD)/" \
-		-i Makefile || die "sed Makefile failed"
-
-	eautoreconf
-}
-
-src_compile() {
-	emake prefix="${D}/usr" || die "emake failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-
-	# List all the multilib libdirs
-	local libdirs=
-	for libdir in $(get_all_libdirs); do
-			libdirs="${libdirs}:/usr/${libdir}/libsb2"
-	done
-
-	cat <<-EOF > "${T}/55scratchbox2"
-	LDPATH=${libdirs:1}
-	EOF
-	doenvd "${T}/55scratchbox2" || die "doenvd failed"
-
-	dodoc AUTHORS README || die "dodoc failed"
-}