old

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

6 files changed, 17 insertions, 189 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 5409be0761fd..c1bb39ef3cc3 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,11 @@
 # 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.139 2012/04/06 14:56:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.140 2012/04/06 14:58:23 ssuominen Exp $
+
+  06 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -libffi-3.0.11_rc1.ebuild, -libffi-3.0.11_rc2.ebuild,
+  -files/libffi-3.0.11_rc2-fix-ppc64-compile.patch:
+  old
 
 *libffi-3.0.11_rc3 (06 Apr 2012)
 
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 60393d84216e..4f29d35aaa1f 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,7 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libffi-3.0.11_rc2-fix-ppc64-compile.patch 1554 RMD160 9c5e19fef7a7244cd859a1e66d84255aaa057584 SHA1 28da4693ea448e15b857bf90e090a1f73821909f SHA256 406423415ffa746a85388c5c6dae92ce7353d0b54288b3c2692453cce2404c59
 AUX libffi-3.0.9-arm-oabi.patch 287 RMD160 047879573e5a8d577fe66530c12d8ceae1d2baf5 SHA1 673d4c1b230adf7497853634adec5b7fcf9d6fe3 SHA256 77d3a62aef0bffba8b99a07bc3b461dea6eb68506d7cd57b762fa28f3f44cef9
 AUX libffi-3.0.9-define-generic-symbols-carefully.patch 1913 RMD160 5e2219a610259703986b792aa50cefe122c66a34 SHA1 d61a4f6b35eb2fa5bbe7907befd08121f96211bf SHA256 58c39a0feaf7e6beba13b42cb79fbff5d853d75f4c1014899511b3ff37012c9e
 AUX libffi-3.0.9-interix.patch 2456 RMD160 c7d92621a610ace2730da00f070db8b6b240355b SHA1 85b56c85218fd42d86c3b5ddccad7fb421892589 SHA256 ecf5e44ae756929d0edf9f5c50682e4e23684ff90955ad454fd9cf087c849c8c
@@ -10,25 +9,21 @@ AUX libffi-3.0.9-powerpc64-darwin.patch 531 RMD160 0eff6b065037c5d2ba3e4aa2575f6
 AUX libffi-3.0.9-strncmp.patch 433 RMD160 da46944b5c07db3a931c9f4b6ce022dde5968313 SHA1 99032e2ada8631375d2cc195c9a53c2c918aedef SHA256 27c04f9c5527606d3689f24d4fdd1eb8a689fac5d922965b7704ce6f24bc633c
 AUX libffi-3.0.9-x32.patch 2113 RMD160 584c8f564089435d16dc8c73e14e34fc7c68deff SHA1 48c25c3012242cb0d04bfc9b2f68eef81670ff89 SHA256 97a339b12f62b734c7d4d07145e7210c67577552d13cc506f7cc69468daeea71
 DIST libffi-3.0.10.tar.gz 753346 RMD160 4a53046e966e5d875ecb1017f5ff1950cdf5253c SHA1 97abf70e6a6d315d9259d58ac463663051d471e1 SHA256 f01eb9027e9eb56aeaeef636649877756d475d714ef8b47f627f65bc5f3b492f
-DIST libffi-3.0.11-rc1.tar.gz 733823 RMD160 de6742919afcea8b6e81ac08bd4a44699f37e713 SHA1 9d5c5c7b6d551fad776d336a01ab450e63895575 SHA256 cb567a4fa64b8e80e0327df595254f1655bf699409caedce9eaef2879e280eff
-DIST libffi-3.0.11-rc2.tar.gz 801889 RMD160 2470c6a98ae58ee9cb7999b2526d7f2d20de6709 SHA1 70ffdc5206392af05a4416a4d2d0b1c32fc86827 SHA256 2c9109bfe75b58eae2276e4c16c6afa859dc42725db49fe01194d92b7194b1cf
 DIST libffi-3.0.11-rc3.tar.gz 784858 RMD160 113854c5d987f3c9e901d8b83c1bf9058993dd93 SHA1 cc5d0b84cab875bff2b09168605bdaa76c087f52 SHA256 95ab980ac492666388695fca3bb728490b2d15a27f6e3f95b4f4fdb3668f62d3
 DIST libffi-3.0.9.tar.gz 731719 RMD160 11ff9aeb62f4fbe1fecf09e6f9814a72bfedb37a SHA1 56e41f87780e09d06d279690e53d4ea2c371ea88 SHA256 589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452
 EBUILD libffi-3.0.10.ebuild 1610 RMD160 eec3a3bb4f14b0edf89373beddc8467920989aa2 SHA1 47bee64c4dbc56d155e8662c41194ecf525c0711 SHA256 ecf87c474177f4c3c2bad9c7890ecfc01e4d4f9b0c4fb75e637bb86f2ccf7839
-EBUILD libffi-3.0.11_rc1.ebuild 1757 RMD160 136872e1072a10e4cdfe87382631d456c8f1821b SHA1 2395ce0e7d69c4c937da4a3c04fb5257cd53a0b0 SHA256 1c4b91a48fcb241740845ebca5c26fd567f439957a0ec7134532513332c44e70
-EBUILD libffi-3.0.11_rc2.ebuild 1811 RMD160 2226a23db7880e5b6dadefc59512053246a01855 SHA1 6a3c0f5748edadd64b7d9617cbe9a8ae04044114 SHA256 16d0699320959d9ff1dee358efeb8db09ae39dba28f0407eb815afffc6def144
-EBUILD libffi-3.0.11_rc3.ebuild 1883 RMD160 dceeeb5a5d43b558a7d2c27fdfea29c8d52702c6 SHA1 d94a46681ce952084a0fc11636d7147e2d92dc0d SHA256 199f9865cd7abc09408d27c9ab313cf79c45087ada1d4cfde5e640008215ee7d
+EBUILD libffi-3.0.11_rc3.ebuild 1882 RMD160 75509ac9773a64f3bc0fec48ffb65b41d5f1c258 SHA1 8e829fea741ce68758b580d71207583cd0fd9ddd SHA256 4dd1964fab41a900a93135279c909f8b5236a71235ad5699cb80d16627360641
 EBUILD libffi-3.0.9-r2.ebuild 1393 RMD160 213b46f4ff5f74047b741a5547471468050d9cc5 SHA1 0fc05e0fdcd961d427e1c2a66baf67d8b4fe93ab SHA256 2f899ce0b30b4e246abe88243d5ed6fe81c914eff03694974012a6a5c59993a7
-MISC ChangeLog 18840 RMD160 ce45e5bb3be6572804d8e144e465476de3bc3f90 SHA1 94e3cf733d71682a5444123bdfc35ef1138db76c SHA256 06fbf86c4a9914e82a06883e2727cba33243f8be1a68657429fd22f669f9826e
+MISC ChangeLog 19009 RMD160 4130f3bd7467113d07c602b9f77730a795000b2f SHA1 3cb3b99dc06f23f1c8af50ce6a4e0f3ad099b28d SHA256 41d53b408d65864f30eab310d0cd4dbc6a01d19b5a239973815414dae469e790
 MISC metadata.xml 1663 RMD160 d2ead0beb5a34033489150623558bbe4e0083516 SHA1 8a54e9af62c01a17431ee8359edbe1d35099d3c3 SHA256 f03f0b55cdf4405ead462ba1c1b8ff2f1b6821c22c3f23d484490f8c875f6073
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPfwQOAAoJEEdUh39IaPFNKUgH/RrZCUH7hS1QkjB5NLpbOtlw
-BU280DW3a7T09ifqRJo5IYugG9nsFSlYnvGYQ9ecBDv9z6zMQtf/bE3l0kZ2W1SS
-nOJ4HqULh6MskZZhfU0+PrA8QfR5MYu26oQ9RVTmLvtoUulNmZ4oj9OtbArNYFsn
-Do4NL1In8XwwlL3H60fN5tW9PvW5WYgDvVLw7t6PQG3zMth3rNhgwwyMuA70OU0B
-XocFN/D9KGWSbK4tMPf9Ha4gK2XXoyXt6XrjkkIW2omHTTgnUmZcPMuKsHuN7xqL
-etfvvcRvrrX0gCjEBLwwP6EC+aw1BBwLQ8XSDEBYIw6jt/R9DOKRIUB0Xy47tuQ=
-=csyt
+iQEcBAEBAgAGBQJPfwRzAAoJEEdUh39IaPFNIJQH/2Ye4/IEbG0eygRYqDEUGgkt
+QibXWKgPdhELOmwdUCSnkbaXOhx5cY8iBSHXhaw3M+4wab3VzMFV7j0Tzp+3bOVQ
+7THPL5qjy2S0vL9sHqxhjhgXgGBLDhpEyjcdJFTZZqUUqowDXY1gem5ek+vJ+B2d
+tv6TGsA7HjARQAT+VRh/Qf1TmcyMf+TuRrYN5nFSGjz/IULcNhxfQFmj+xU6CiUv
+rKcCgS2gJJiA2CkSh121TRSX+SAA74caSdAll9bBfZuAUZPaVPnhYQ1YlOZex1hD
+Cm4Q4lXYhyPfkbburOUJchknTaKqep8ATdMJKxl/u205mf7s84y1gDxtDHYhx9U=
+=SJQe
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libffi/files/libffi-3.0.11_rc2-fix-ppc64-compile.patch b/dev-libs/libffi/files/libffi-3.0.11_rc2-fix-ppc64-compile.patch
deleted file mode 100644
index 6f02fec6754e..000000000000
--- a/dev-libs/libffi/files/libffi-3.0.11_rc2-fix-ppc64-compile.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-http://sourceware.org/ml/libffi-discuss/2012/msg00100.html
-
---- src/powerpc/ffi.c
-+++ src/powerpc/ffi.c
-@@ -146,6 +146,7 @@
-   gpr_base.u = stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS;
-   intarg_count = 0;
- #ifndef __NO_FPRS__
-+  double double_tmp;
-   fpr_base.d = gpr_base.d - NUM_FPR_ARG_REGISTERS;
-   fparg_count = 0;
-   copy_space.c = ((flags & FLAG_FP_ARGUMENTS) ? fpr_base.c : gpr_base.c);
-@@ -155,9 +156,9 @@
-   next_arg.u = stack + 2;
- 
-   /* Check that everything starts aligned properly.  */
--  FFI_ASSERT (((unsigned) (char *) stack & 0xF) == 0);
--  FFI_ASSERT (((unsigned) copy_space.c & 0xF) == 0);
--  FFI_ASSERT (((unsigned) stacktop.c & 0xF) == 0);
-+  FFI_ASSERT (((unsigned long) (char *) stack & 0xF) == 0);
-+  FFI_ASSERT (((unsigned long) copy_space.c & 0xF) == 0);
-+  FFI_ASSERT (((unsigned long) stacktop.c & 0xF) == 0);
-   FFI_ASSERT ((bytes & 0xF) == 0);
-   FFI_ASSERT (copy_space.c >= next_arg.c);
- 
-@@ -211,8 +212,6 @@
- 
- 	case FFI_TYPE_DOUBLE:
- 	  /* With FFI_LINUX_SOFT_FLOAT doubles are handled like UINT64.  */
--	  if (ecif->cif->abi == FFI_LINUX_SOFT_FLOAT)
--	    goto soft_double_prep;
- 	  double_tmp = **p_argv.d;
- 
- 	  if (fparg_count >= NUM_FPR_ARG_REGISTERS)
-@@ -925,7 +924,7 @@
-    */
-   unsigned int smst_buffer[2];
-   extended_cif ecif;
--  unsigned int rsize;
-+  unsigned int rsize = 0;
- 
-   ecif.cif = cif;
-   ecif.avalue = avalue;
-@@ -1132,7 +1131,7 @@
- 
- 	  if (nf < 8)
- 	    {
--	      temp = pfr->d;
-+	      double temp = pfr->d;
- 	      pfr->f = (float) temp;
- 	      avalue[i] = pfr;
- 	      nf++;
diff --git a/dev-libs/libffi/libffi-3.0.11_rc1.ebuild b/dev-libs/libffi/libffi-3.0.11_rc1.ebuild
deleted file mode 100644
index d33e617231e1..000000000000
--- a/dev-libs/libffi/libffi-3.0.11_rc1.ebuild
+++ /dev/null
@@ -1,59 +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_rc1.ebuild,v 1.3 2012/02/16 22:50:00 vapier Exp $
-
-EAPI=4
-
-MY_P=${P/_/-}
-
-inherit libtool multilib toolchain-funcs eutils
-
-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}
-
-pkg_setup() {
-	# Detect and document broken installation of sys-devel/gcc in the build.log wrt #354903
-	if ! has_version ${CATEGORY}/${PN}; then
-		local base="${T}/conftest"
-		echo 'int main() { }' > "${base}.c"
-		$(tc-getCC) -o "${base}" "${base}.c" -lffi >&/dev/null && \
-			ewarn "Found a copy of second ${PN} in your system. Uninstall it before continuing."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.9-x32.patch
-	elibtoolize
-}
-
-src_configure() {
-	use userland_BSD && export HOST="${CHOST}"
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog* README
-	rm -f "${ED}"usr/lib*/${PN}.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.11_rc2.ebuild b/dev-libs/libffi/libffi-3.0.11_rc2.ebuild
deleted file mode 100644
index a8da863d00c8..000000000000
--- a/dev-libs/libffi/libffi-3.0.11_rc2.ebuild
+++ /dev/null
@@ -1,61 +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_rc2.ebuild,v 1.3 2012/03/13 18:38:10 ssuominen Exp $
-
-EAPI=4
-
-MY_P=${P/_/-}
-
-inherit libtool multilib toolchain-funcs eutils
-
-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}
-
-pkg_setup() {
-	# Detect and document broken installation of sys-devel/gcc in the build.log wrt #354903
-	if ! has_version ${CATEGORY}/${PN}; then
-		local base="${T}/conftest"
-		echo 'int main() { }' > "${base}.c"
-		$(tc-getCC) -o "${base}" "${base}.c" -lffi >&/dev/null && \
-			ewarn "Found a copy of second ${PN} in your system. Uninstall it before continuing."
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.9-x32.patch \
-		"${FILESDIR}"/${P}-fix-ppc64-compile.patch
-	elibtoolize
-}
-
-src_configure() {
-	use userland_BSD && export HOST="${CHOST}"
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog* README
-	rm -f "${ED}"usr/lib*/${PN}.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.11_rc3.ebuild b/dev-libs/libffi/libffi-3.0.11_rc3.ebuild
index d69714e7cbea..2c964256dcf1 100644
--- a/dev-libs/libffi/libffi-3.0.11_rc3.ebuild
+++ b/dev-libs/libffi/libffi-3.0.11_rc3.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2012/04/06 14:56:42 ssuominen Exp $
+# $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
 
@@ -33,7 +33,7 @@ pkg_setup() {
 		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." 
+			die "The system is in inconsistent state with unknown libffi installed."
 		fi
 	fi
 }