old

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

9 files changed, 9 insertions, 350 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 1d7724fc43a1..7d74063d5887 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.141 2012/04/12 04:10:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.142 2012/04/12 04:12:01 ssuominen Exp $
+
+  12 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> -libffi-3.0.9-r2.ebuild,
+  -files/libffi-3.0.9-arm-oabi.patch,
+  -files/libffi-3.0.9-define-generic-symbols-carefully.patch,
+  -files/libffi-3.0.9-interix.patch, -files/libffi-3.0.9-irix.patch,
+  -files/libffi-3.0.9-powerpc64-darwin.patch,
+  -files/libffi-3.0.9-strncmp.patch, -libffi-3.0.11_rc3.ebuild:
+  old
 
 *libffi-3.0.11 (12 Apr 2012)
 
diff --git a/dev-libs/libffi/files/libffi-3.0.9-arm-oabi.patch b/dev-libs/libffi/files/libffi-3.0.9-arm-oabi.patch
deleted file mode 100644
index a454e1c706d8..000000000000
--- a/dev-libs/libffi/files/libffi-3.0.9-arm-oabi.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42289
-
---- src/arm/sysv.S
-+++ src/arm/sysv.S
-@@ -235,7 +235,7 @@ ARM_FUNC_START ffi_closure_SYSV
- 	stmfd	sp!, {ip, lr}
- 	UNWIND .save	{r0, lr}
- 	add	r2, sp, #8
--	.pad #16
-+	UNWIND .pad #16
- 	sub	sp, sp, #16
- 	str	sp, [sp, #8]
- 	add	r1, sp, #8
diff --git a/dev-libs/libffi/files/libffi-3.0.9-define-generic-symbols-carefully.patch b/dev-libs/libffi/files/libffi-3.0.9-define-generic-symbols-carefully.patch
deleted file mode 100644
index 1fd6aace4950..000000000000
--- a/dev-libs/libffi/files/libffi-3.0.9-define-generic-symbols-carefully.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-http://bugs.gentoo.org/347636
-
-Index: libffi/include/ffi.h.in
-===================================================================
---- libffi.orig/include/ffi.h.in
-+++ libffi/include/ffi.h.in
-@@ -57,7 +57,9 @@ extern "C" {
- #endif
- 
- /* Specify which architecture libffi is configured for. */
-+#ifndef @TARGET@
- #define @TARGET@
-+#endif
- 
- /* ---- System configuration information --------------------------------- */
- 
-Index: libffi/src/powerpc/ffitarget.h
-===================================================================
---- libffi.orig/src/powerpc/ffitarget.h
-+++ libffi/src/powerpc/ffitarget.h
-@@ -31,12 +31,18 @@
- /* ---- System specific configurations ----------------------------------- */
- 
- #if defined (POWERPC) && defined (__powerpc64__)	/* linux64 */
-+#ifndef POWERPC64
- #define POWERPC64
-+#endif
- #elif defined (POWERPC_DARWIN) && defined (__ppc64__)	/* Darwin */
-+#ifndef POWERPC64
- #define POWERPC64
-+#endif
- #elif defined (POWERPC_AIX) && defined (__64BIT__)	/* AIX64 */
-+#ifndef POWERPC64
- #define POWERPC64
- #endif
-+#endif
- 
- #ifndef LIBFFI_ASM
- typedef unsigned long          ffi_arg;
-Index: libffi/src/s390/ffitarget.h
-===================================================================
---- libffi.orig/src/s390/ffitarget.h
-+++ libffi/src/s390/ffitarget.h
-@@ -28,8 +28,10 @@
- #define LIBFFI_TARGET_H
- 
- #if defined (__s390x__)
-+#ifndef S390X
- #define S390X
- #endif
-+#endif
- 
- /* ---- System specific configurations ----------------------------------- */
- 
-Index: libffi/src/sparc/ffitarget.h
-===================================================================
---- libffi.orig/src/sparc/ffitarget.h
-+++ libffi/src/sparc/ffitarget.h
-@@ -30,8 +30,10 @@
- /* ---- System specific configurations ----------------------------------- */
- 
- #if defined(__arch64__) || defined(__sparcv9)
-+#ifndef SPARC64
- #define SPARC64
- #endif
-+#endif
- 
- #ifndef LIBFFI_ASM
- typedef unsigned long          ffi_arg;
diff --git a/dev-libs/libffi/files/libffi-3.0.9-interix.patch b/dev-libs/libffi/files/libffi-3.0.9-interix.patch
deleted file mode 100644
index e2a48677bc64..000000000000
--- a/dev-libs/libffi/files/libffi-3.0.9-interix.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/configure b/configure
-index d849c7a..fed97e2 100755
---- a/configure
-+++ b/configure
-@@ -12180,7 +12180,7 @@ case "$host" in
-   i?86-*-freebsd* | i?86-*-openbsd*)
- 	TARGET=X86_FREEBSD; TARGETDIR=x86
- 	;;
--  i?86-win32* | i?86-*-cygwin* | i?86-*-mingw*)
-+  i?86-win32* | i?86-*-cygwin* | i?86-*-mingw* | i?86-*-interix*)
- 	TARGET=X86_WIN32; TARGETDIR=x86
- 	# All mingw/cygwin/win32 builds require this for sharedlib
- 	AM_LTLDFLAGS="-no-undefined"
-diff --git a/configure.ac b/configure.ac
-index 6314a6a..4e178a2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -80,7 +80,7 @@ case "$host" in
-   i?86-*-freebsd* | i?86-*-openbsd*)
- 	TARGET=X86_FREEBSD; TARGETDIR=x86
- 	;;
--  i?86-win32* | i?86-*-cygwin* | i?86-*-mingw*)
-+  i?86-win32* | i?86-*-cygwin* | i?86-*-mingw* | i?86-*-interix*)
- 	TARGET=X86_WIN32; TARGETDIR=x86
- 	# All mingw/cygwin/win32 builds require this for sharedlib
- 	AM_LTLDFLAGS="-no-undefined"
-diff --git a/src/closures.c b/src/closures.c
-index bc087d9..65bf6a9 100644
---- a/src/closures.c
-+++ b/src/closures.c
-@@ -193,11 +193,11 @@ static int dlmalloc_trim(size_t) MAYBE_UNUSED;
- static size_t dlmalloc_usable_size(void*) MAYBE_UNUSED;
- static void dlmalloc_stats(void) MAYBE_UNUSED;
- 
--#if !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__)
-+#if !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__) || defined(__INTERIX)
- /* Use these for mmap and munmap within dlmalloc.c.  */
- static void *dlmmap(void *, size_t, int, int, int, off_t);
- static int dlmunmap(void *, size_t);
--#endif /* !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__) */
-+#endif /* !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__) || defined(__INTERIX) */
- 
- #define mmap dlmmap
- #define munmap dlmunmap
-@@ -207,7 +207,7 @@ static int dlmunmap(void *, size_t);
- #undef mmap
- #undef munmap
- 
--#if !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__)
-+#if !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__) || defined(__INTERIX)
- 
- #if FFI_MMAP_EXEC_SELINUX
- 
-@@ -545,7 +545,7 @@ segment_holding_code (mstate m, char* addr)
- }
- #endif
- 
--#endif /* !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__) */
-+#endif /* !(defined(X86_WIN32) || defined(X86_WIN64)) || defined (__CYGWIN__) || defined(__INTERIX) */
- 
- /* Allocate a chunk of memory with the given size.  Returns a pointer
-    to the writable address, and sets *CODE to the executable
diff --git a/dev-libs/libffi/files/libffi-3.0.9-irix.patch b/dev-libs/libffi/files/libffi-3.0.9-irix.patch
deleted file mode 100644
index 2f759f509478..000000000000
--- a/dev-libs/libffi/files/libffi-3.0.9-irix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=286911
-
---- src/mips/ffitarget.h.orig	2009-06-19 19:52:37.000000000 +0200
-+++ src/mips/ffitarget.h	2009-06-19 19:52:43.000000000 +0200
-@@ -43,7 +43,7 @@
- #  endif
- 
- #if !defined(_MIPS_SIM)
---- something is very wrong --
-+# error -- something is very wrong --
- #else
- #  if (_MIPS_SIM==_ABIN32 && defined(_ABIN32)) || (_MIPS_SIM==_ABI64 && defined(_ABI64))
- #    define FFI_MIPS_N32
-@@ -51,7 +51,7 @@
- #    if (_MIPS_SIM==_ABIO32 && defined(_ABIO32))
- #      define FFI_MIPS_O32
- #    else
---- this is an unsupported platform --
-+#     error -- this is an unsupported platform --
- #    endif
- #  endif
- #endif
---- include/ffi.h.in.orig	2009-06-19 19:52:36.000000000 +0200
-+++ include/ffi.h.in	2009-06-19 19:52:43.000000000 +0200
-@@ -251,6 +251,9 @@
- 
- #if FFI_CLOSURES
- 
-+#ifdef __sgi
-+# pragma pack 8
-+#endif
- typedef struct {
-   char tramp[FFI_TRAMPOLINE_SIZE];
-   ffi_cif   *cif;
-@@ -260,6 +263,9 @@
- } ffi_closure __attribute__((aligned (8)));
- #else
- } ffi_closure;
-+# ifdef __sgi
-+#  pragma pack 0
-+# endif
- #endif
- 
- void *ffi_closure_alloc (size_t size, void **code);
---- src/java_raw_api.c.dist	2009-09-29 11:04:56.517219880 +0100
-+++ src/java_raw_api.c	2009-09-29 11:05:56.836581720 +0100
-@@ -311,7 +311,7 @@
-   ffi_raw_closure *cl = (ffi_raw_closure*)user_data;
- 
-   ffi_java_ptrarray_to_raw (cif, avalue, raw);
--  (*cl->fun) (cif, rvalue, raw, cl->user_data);
-+  (*cl->fun) (cif, rvalue, (ffi_raw*)raw, cl->user_data);
-   ffi_java_raw_to_rvalue (cif, rvalue);
- }
- 
diff --git a/dev-libs/libffi/files/libffi-3.0.9-powerpc64-darwin.patch b/dev-libs/libffi/files/libffi-3.0.9-powerpc64-darwin.patch
deleted file mode 100644
index 514ffb7a0b3f..000000000000
--- a/dev-libs/libffi/files/libffi-3.0.9-powerpc64-darwin.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Add support for powerpc64-* hosts
-
---- configure.ac
-+++ configure.ac
-@@ -154,6 +154,10 @@
- 	TARGET=X86_DARWIN; TARGETDIR=x86
- 	;;
- 
-+  powerpc64-*-darwin*)
-+	TARGET=POWERPC_DARWIN; TARGETDIR=powerpc
-+	;;
-+
-   x86_64-*-cygwin* | x86_64-*-mingw*)
- 	TARGET=X86_WIN64; TARGETDIR=x86
- 	;;
---- configure
-+++ configure
-@@ -12254,6 +12254,10 @@
- 	TARGET=X86_DARWIN; TARGETDIR=x86
- 	;;
- 
-+  powerpc64-*-darwin*)
-+	TARGET=POWERPC_DARWIN; TARGETDIR=powerpc
-+	;;
-+
-   x86_64-*-cygwin* | x86_64-*-mingw*)
- 	TARGET=X86_WIN64; TARGETDIR=x86
- 	;;
diff --git a/dev-libs/libffi/files/libffi-3.0.9-strncmp.patch b/dev-libs/libffi/files/libffi-3.0.9-strncmp.patch
deleted file mode 100644
index a919f2881790..000000000000
--- a/dev-libs/libffi/files/libffi-3.0.9-strncmp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-src/closures.c (selinux_enabled_check): Fix strncmp usage bug.
-
-http://github.com/atgreen/libffi/commit/eaf444eabc4c78703c0f98ac0197b1619c1b1bef
-
---- src/closures.c
-+++ src/closures.c
-@@ -146,7 +146,7 @@
-       p = strchr (p + 1, ' ');
-       if (p == NULL)
-         break;
--      if (strncmp (p + 1, "selinuxfs ", 10) != 0)
-+      if (strncmp (p + 1, "selinuxfs ", 10) == 0)
-         {
-           free (buf);
-           fclose (f);
diff --git a/dev-libs/libffi/libffi-3.0.11_rc3.ebuild b/dev-libs/libffi/libffi-3.0.11_rc3.ebuild
deleted file mode 100644
index 2c964256dcf1..000000000000
--- a/dev-libs/libffi/libffi-3.0.11_rc3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.11_rc3.ebuild,v 1.2 2012/04/06 14:58:23 ssuominen Exp $
-
-EAPI=4
-
-MY_P=${P/_/-}
-
-inherit eutils libtool multilib toolchain-funcs
-
-DESCRIPTION="a portable, high level programming interface to various calling conventions."
-HOMEPAGE="http://sourceware.org/libffi/"
-SRC_URI="ftp://sourceware.org/pub/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug static-libs test"
-
-RDEPEND=""
-DEPEND="test? ( dev-util/dejagnu )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="ChangeLog* README"
-
-pkg_setup() {
-	# Check for orphaned libffi, see http://bugs.gentoo.org/354903 for example
-	if ! has_version ${CATEGORY}/${PN}; then
-		local base="${T}"/conftest
-		echo 'int main() { }' > "${base}".c
-		$(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
-		if [ $? -eq = 0 ]; then
-			eerror "The linker reported linking against -lffi to be working while it shouldn't have."
-			eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
-			die "The system is in inconsistent state with unknown libffi installed."
-		fi
-	fi
-}
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	use userland_BSD && export HOST="${CHOST}"
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/lib*/lib*.la
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/${PN}$(get_libname 5)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/${PN}$(get_libname 5)
-}
diff --git a/dev-libs/libffi/libffi-3.0.9-r2.ebuild b/dev-libs/libffi/libffi-3.0.9-r2.ebuild
deleted file mode 100644
index e516e659ba9c..000000000000
--- a/dev-libs/libffi/libffi-3.0.9-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.9-r2.ebuild,v 1.9 2012/02/16 22:50:00 vapier Exp $
-
-EAPI=2
-inherit eutils libtool
-
-DESCRIPTION="a portable, high level programming interface to various calling conventions."
-HOMEPAGE="http://sourceware.org/libffi/"
-SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug static-libs test"
-
-RDEPEND=""
-DEPEND="test? ( dev-util/dejagnu )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-interix.patch \
-		"${FILESDIR}"/${P}-powerpc64-darwin.patch \
-		"${FILESDIR}"/${P}-irix.patch \
-		"${FILESDIR}"/${P}-arm-oabi.patch \
-		"${FILESDIR}"/${P}-define-generic-symbols-carefully.patch \
-		"${FILESDIR}"/${P}-strncmp.patch \
-		"${FILESDIR}"/${P}-x32.patch
-
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog* README
-	find "${D}" -type f -name '*.la' -exec rm -f '{}' +
-}