old

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 14 insertions, 202 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 41d372ceb76f..d0a60920ec8b 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.162 2013/02/11 20:59:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.163 2013/02/11 21:00:37 ssuominen Exp $
+
+  11 Feb 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -files/libffi-3.0.9-x32.patch, -libffi-3.0.10.ebuild,
+  -libffi-3.0.12_rc3.ebuild:
+  old
 
 *libffi-3.0.12 (11 Feb 2013)
 
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index c99f4c95faed..13b8cdfc87f2 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -2,25 +2,20 @@
 Hash: SHA256
 
 AUX libffi-3.0.11-x86-pic-check.patch 3716 SHA256 247edfe37709f7a0d193169a31a0a8baa730b0d63606ec56928088aadf498c4f SHA512 addbab5c6a9a4701e43443ae438b2fe6cee6c2b5b09b5d40706ca648c311ef9d0d900b9234cfa7872aacb52bee9f499c9d3f8e27af1d983c2f791185fcb028ea WHIRLPOOL 395e3081d5c5b4da7cbbd60689e64459533eb348d8962b59a507f19d3167543b57e4a1ce82b5a979e4709daf7125bc61ef32d0870578951f30a1365745c8613e
-AUX libffi-3.0.9-x32.patch 2113 SHA256 97a339b12f62b734c7d4d07145e7210c67577552d13cc506f7cc69468daeea71 SHA512 7f014ac96f43335515c4b1c39eae6461a47f34afdafae82cb7dd647852f586a9ec32f7f0cfca90cbb5fbe061bbddad32240c4b92cb345a845c125caea53ab42e WHIRLPOOL 9ee1811d85e07eb0b82e2912ca7852a15353256546621ae5ff121f6940a61f753d83d20d498aa63e86d1972872fb78e48c20e2e90a47b2badd4112050dbfe61d
-DIST libffi-3.0.10.tar.gz 753346 SHA256 f01eb9027e9eb56aeaeef636649877756d475d714ef8b47f627f65bc5f3b492f SHA512 56076fe3c1556970fbbb9c8398101583492471de00d58fa3b87a18c9c01c276fc5bf429e49da0196e840126e8fef59d231734739c673c636f6be7a798b081cf7 WHIRLPOOL 29550a9dc21bbdb694fc78f6020dd70f0ed6067859164be92d9b076e9fdeb59af032fb20bb786376cf920b67f3bb0e10c5f7754aefa5c4a46d17718409d4f7fa
 DIST libffi-3.0.11.tar.gz 794220 SHA256 70bfb01356360089aa97d3e71e3edf05d195599fd822e922e50d46a0055a6283 SHA512 0049388d16207078a3d6dce97c877f1d9647aa9d908a9372a3f67ca064b70d8c8b23ee458be4a15a6344a5d39ea3e6292be728dfbcc73e1efc0b1db03be874f3 WHIRLPOOL c5ee01a6415b2715a4542d0997e3a7f42cbc97e476589d4e093fcff44315cc83f78a02dc04929c96831309966ac196e6ceb134c8b14cfc02313e139a98e6c11a
-DIST libffi-3.0.12-rc3.tar.gz 844514 SHA256 c424bb41ef346166804a5b4270b3136cb1d551fea57606f6577c96ec7c7cac3c SHA512 0484c062dc30dd7addbff657341b0ff34445391ae9fa3f524531ca5ea466bfa7c4a243d141f87a26e68024bbe516dac7df0e3a91ed295b30a914fc5526b288da WHIRLPOOL dd6cc8dbad9e8dee9ac499832078d7a7929cf93478880084c7b99aa37aeeb599d4a54a6722455c1964ee9ac805d33b38b4435467eb544e731db7e778efcc31ae
 DIST libffi-3.0.12.tar.gz 844641 SHA256 2ea0db90c2bbcc907c3aefc3f76e9dfc3b35c7a0fb75a4319f5248e0172c1e9e SHA512 9ebd5f274aaf007a5f888d3eb3a1652f61f7ff46ea23283a94888b229bcc959fd22904a7101989cd238dfbb10c335129cfa3a947c650dad72522f7fcd0d9c79c WHIRLPOOL d1d2247b3727b4f75006db3bcd4b01dbde2817ea774dadbee30bd8cb4578d01176be089ed6e4bf373587f824fef06ae7fbd1d24f775da7d8f91bb9e753d2580b
-EBUILD libffi-3.0.10.ebuild 1620 SHA256 c5e2a9ec831ffc2165fe4391510ceb43796fd048e98066742065d9818af4c4cd SHA512 70212f59dcf98e4d8b49ccfb7d5ebd61587aa785bc44c5a5c73cbb71c977c1adb74883ccafb6def20b9fe4f8275118edd277dbf12a6f933a45288e2ef68a8de6 WHIRLPOOL 711aea572e153dd608f21c8fb032bcb1e34c5c68723f49d4192c4fb15bd3d9b3205be2b2b360eeac96743a8b64e1b428a3d944233a012521e22aec15d00874b7
 EBUILD libffi-3.0.11.ebuild 2010 SHA256 9818b9286de122d5da2e2343d23e9f8b7002b95e6db351c33e1d1edebf187f66 SHA512 78a20cf49422822849cd883eef15c9bf941c86a910bb151ac19a05e5dde86e0419f50c1c930c2980cac765be6517183f8dde91627b3b9243980460107ee0b5d0 WHIRLPOOL c2d25acf6311b58a06a81d1f1ba9634ed2361185600af19561d319dcab4a88fe891b9828815f8aecb718fab6582f732b2bf3b7f5cff66e9fb60f4488aab4593f
 EBUILD libffi-3.0.12.ebuild 2010 SHA256 58aa926439ebaa880ad342fbb46731b7fc25a9f12dff91a754c067c8d7b2886f SHA512 eb9d9eaf911728abf7dda70f2f412acbcb3e3b678a54e8be75b0d53e313ceb74491d9909eea455d720ceb0a2561c5342d0fef6b9e39d410159dd3886eb8dd9dd WHIRLPOOL 7ce92c3c08b00c9062d0d110db0494ebd10155c81daf80b979f482407680331f336d75d4d186f7e2c779ea46c6f8581c5d740e6ed7549ccad6a16f5aa7cadd9c
-EBUILD libffi-3.0.12_rc3.ebuild 2027 SHA256 090bf6a59d429228c97ba7e716d900e17f4d69e47cabe0ecd7789c3f861c7252 SHA512 d850410c1c5cc5555c66756512a8f8cb65c5d1e7128ea2548b053f8a30e184ec430348463cd0a50b16c4c6a59d3437d296b66c13ef8fc36936f4bc4b244e7224 WHIRLPOOL a32238e1465698c6b0d93246a33289013b73386a63431800c5b885ca0a26f573fda9bff32423fc1808456763286b0e7ddc0f346c675575d676e8d66d46718ecc
-MISC ChangeLog 21865 SHA256 be61acd16cbac98417d5db3ccdf450cae8da2c47c4bb6386c47d0c235f5c4be6 SHA512 f5e9f935d4646b9803cfb394ea31818252e6ee9664d4a690b1a086e630b4f0fd28685ba8ef5a72fd2e1545fb9bae1a9e8f8c330bc8500d96541c43b390f78fd4 WHIRLPOOL 160a0a4afd937b06a1c2ad68dc3262ad8b150149d5445b663c7166dffaa2e46fb8fa2e26f252a700229c16d1399d5f8294ea3b142dfdb14165dcee5d928fcbe2
+MISC ChangeLog 22011 SHA256 908def4e82b3564036c1887bf5b21729547a9466be269e175a1cb6908dcaff39 SHA512 9f39047774c4308dd9cdfa9d405f763ee7370cc021d9c8f43ecf339be0cd42a08bd25677a516a6790c6734158cd97262f12ea0a7be724772958c301035566401 WHIRLPOOL f10d3ed03249687bae84978da8af35e7d96e5f427e86610652a86fb4c1ebf4a64e874a8ad13a326d4e61e6c46b1d72fb17f55d3e0e4aad9c0804547202300b22
 MISC metadata.xml 1768 SHA256 1bb92578368c006819d0cd5e1a94d32cffca87ddef8d571c29b483bedddc9b6e SHA512 2291c051ce2cb5c31989af68a705c0f8ce8d6ff23f2a66f839463a56a20454a6af276c5afc75687919e14fa614862356618e44c88415ff9884725e6e6db161bc WHIRLPOOL 7da7a437bf11dfcd5b5a8fbb067463ceb588fe83c1db0d15253293a955999d5dc65754918c73840a9a5020f86d1b6f1c9f8d127f4e1519594bc0678742727d45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRGVtYAAoJEEdUh39IaPFNSlIH/0r0ee3efslO5FyoSc75SyX1
-Az5x15l2CfOuL3t3lbxN8/dqqGZ86ak9iWBzeCwjHS7SNdSGFthjcCCoQfO5DE87
-K2dQ3sl9FknYdb0uTW+x/7ImYF4VOtneHXNZGMQiGXJAK2lNX30vTxhdbtntBZhy
-7U9FND7pq10G6/qrGEfyku86XhKrePkCtdRhnOAwsBK9go5KMOczuNDgPRn0gtmo
-LsXFnFb1EsyLyVfjpad+Vxg7d6GUM3DqipLZg6c3knpUDWsG2//Q0kOeKJ5Z4YWO
-zWHORnLh68sjOtFLfizebvA6ZVTfU9Qok4DLfD6JcBuX58rh4oPRYSn+0tD+CS8=
-=hAlW
+iQEcBAEBCAAGBQJRGVuyAAoJEEdUh39IaPFNxmsH/iGth4uZNcwpro8HB3frIYme
+b1lE1RBSLpe+IWD4fJ8HXTrtxWBLx89xmRcw5Y8AfKflsQqR5HWMllFGoAywQ4cs
+j9wOgOCgS1da/TrLvtU5/N8WWKBc9gyaoUfS3swZWOSbe306W5MPvV9twIR5upou
+htLyAAkDTNLHJzrXq97b9e5L0QnrMQ8Jp6hw161jKd7rJQHTBxf9XpWQWUsq1AMZ
+NmcLW0Waa6EAx1wpD76kTk+6A7996r5mPq2/4FHpwYqhkjZUTTTUqtpnsDuxZ+Bk
+oFFxTxazroxAxoYFZrU4FrJDj+ZGL9VlcdSDyypknAqvidNSCMoHILyjPKziWwY=
+=YQMz
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libffi/files/libffi-3.0.9-x32.patch b/dev-libs/libffi/files/libffi-3.0.9-x32.patch
deleted file mode 100644
index 42460ac1bf03..000000000000
--- a/dev-libs/libffi/files/libffi-3.0.9-x32.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From cd0b9991c76903b66ad3c938d6135aedbf4e1ef0 Mon Sep 17 00:00:00 2001
-From: H.J. Lu <hjl.tools@gmail.com>
-Date: Tue, 6 Dec 2011 19:51:28 -0800
-Subject: [PATCH] Fix libffi for x32.
-
-2011-12-06  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* src/x86/ffi64.c (ffi_call): Cast the return value to
-	unsigned long.
-
-	* src/x86/ffitarget.h (ffi_arg): Set to unsigned long long for
-	x32.
-	(ffi_sarg): Set to long for x32.
----
- libffi/ChangeLog.x32       |    8 ++++++++
- libffi/src/x86/ffi64.c     |    2 +-
- libffi/src/x86/ffitarget.h |    5 +++++
- 3 files changed, 14 insertions(+), 1 deletions(-)
- create mode 100644 libffi/ChangeLog.x32
-
-diff --git a/libffi/ChangeLog.x32 b/libffi/ChangeLog.x32
-new file mode 100644
-index 0000000..c733789
---- /dev/null
-+++ b/libffi/ChangeLog.x32
-@@ -0,0 +1,8 @@
-+2011-12-06  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	* src/x86/ffi64.c (ffi_call): Cast the return value to
-+	unsigned long.
-+
-+	* src/x86/ffitarget.h (ffi_arg): Set to unsigned long long for
-+	x32.
-+	(ffi_sarg): Set to long for x32.
-diff --git a/libffi/src/x86/ffi64.c b/libffi/src/x86/ffi64.c
-index bd907d7..4d87ddb 100644
---- a/libffi/src/x86/ffi64.c
-+++ b/libffi/src/x86/ffi64.c
-@@ -426,7 +426,7 @@ ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
-   /* If the return value is passed in memory, add the pointer as the
-      first integer argument.  */
-   if (ret_in_memory)
--    reg_args->gpr[gprcount++] = (long) rvalue;
-+    reg_args->gpr[gprcount++] = (unsigned long) rvalue;
- 
-   avn = cif->nargs;
-   arg_types = cif->arg_types;
-diff --git a/libffi/src/x86/ffitarget.h b/libffi/src/x86/ffitarget.h
-index b85016c..7a7d7a5 100644
---- a/libffi/src/x86/ffitarget.h
-+++ b/libffi/src/x86/ffitarget.h
-@@ -53,9 +53,14 @@ typedef unsigned long long     ffi_arg;
- typedef long long              ffi_sarg;
- #endif
- #else
-+#if defined __x86_64__ && !defined __LP64__
-+typedef unsigned long long     ffi_arg;
-+typedef long long              ffi_sarg;
-+#else
- typedef unsigned long          ffi_arg;
- typedef signed long            ffi_sarg;
- #endif
-+#endif
- 
- typedef enum ffi_abi {
-   FFI_FIRST_ABI = 0,
--- 
-1.7.3.4
-
diff --git a/dev-libs/libffi/libffi-3.0.10.ebuild b/dev-libs/libffi/libffi-3.0.10.ebuild
deleted file mode 100644
index 14772cbc3372..000000000000
--- a/dev-libs/libffi/libffi-3.0.10.ebuild
+++ /dev/null
@@ -1,53 +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.10.ebuild,v 1.9 2012/06/13 19:49:51 ryao Exp $
-
-EAPI=2
-
-MY_P=${P/_}
-
-inherit libtool 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 dev-libs/libffi; 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 libffi in your system. Uninstall it before continuing."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.9-x32.patch
-	epatch_user
-	elibtoolize
-}
-
-src_configure() {
-	use userland_BSD && export HOST="${CHOST}"
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog* README
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-libs/libffi/libffi-3.0.12_rc3.ebuild b/dev-libs/libffi/libffi-3.0.12_rc3.ebuild
deleted file mode 100644
index 5605cfe1d43f..000000000000
--- a/dev-libs/libffi/libffi-3.0.12_rc3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.12_rc3.ebuild,v 1.2 2013/02/10 13:48:36 ssuominen Exp $
-
-EAPI=5
-
-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=""
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug pax_kernel 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 [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! 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() {
-	epatch_user
-	elibtoolize
-}
-
-src_configure() {
-	use userland_BSD && export HOST="${CHOST}"
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable pax_kernel pax_emutramp) \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
-
-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)
-}