old

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

4 files changed, 13 insertions, 124 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index e128905db7a2..06c6651061db 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.189 2014/05/28 20:32:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.190 2014/05/29 04:51:18 ssuominen Exp $
+
+  29 May 2014; Samuli Suominen <ssuominen@gentoo.org> -libffi-3.1-r1.ebuild,
+  -libffi-3.1.ebuild:
+  old
 
 *libffi-3.1-r2 (28 May 2014)
 
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 284e5660fd2d..96f0911c1242 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -6,19 +6,17 @@ AUX libffi-3.1-execstack.patch 218 SHA256 fe316eeb5a602005978df42d709f34cfb7a2e6
 DIST libffi-3.0.13.tar.gz 845747 SHA256 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c SHA512 fc47f5d25197c631754efe05a349edb556d072807ecef19b41f17c1a8f39c95221be64926fbd05b1f8439181df1ddff8fc01462ce3a26005b75159ddc27e6f6a WHIRLPOOL d5b14d48a7b35f7349ec938d0deac62db7022ac4d611ab13bc7a6a2766a47e210fc1663fc8c6d7ee48d421c06b66f558010829ac2c215620c76d0bf7650e1308
 DIST libffi-3.1.tar.gz 937214 SHA256 97feeeadca5e21870fa4433bc953d1b3af3f698d5df8a428f68b73cd60aef6eb SHA512 8994973d75facf5ad928c270e17b1a56e24d1543af75b93731a0048e747df27e4190a736b6dc2dca7d43de1d7e88891220304802c10fcccdcebee9c9ffd3d1b9 WHIRLPOOL 19c08cffd39c998fcd762b1e3767b4fd86915427226833411302bebd2d5bcf93d515e6df4a4cab11327595d3966e46442e457fbe09ae986b58bdfb2bb6adb913
 EBUILD libffi-3.0.13-r1.ebuild 2287 SHA256 1dcdf46337f8e607873440179bf0b044d97d3212426141266c98ba944d71d3a9 SHA512 bde4d9f8155bf3997ede4855358004d9adb4423feabac292fc144dd52c159b551dae2cbddd57d640cdbbb1b37e30aa787538accede3087ad460bc61f25942bcf WHIRLPOOL bd249b6b882aa00beb098931fd5fefed9717ee2bfa94c69bc840ce467d32a8a635765d2f6aef71fd35eacc91614b722cb035a24a754c942ed8cad7472165b152
-EBUILD libffi-3.1-r1.ebuild 2130 SHA256 abd210d6c2079afc8187bf3faf39c173cd5de2a600cdb6f612fb42d8465a4644 SHA512 0a93fa840b6e0481e28494c32880d8f91a8eda115d6d460a6b1adccfa8140bc6425d83b1a6523a068ffee07fd2b24d5fba625be53f4b74f3bc182837eae381d7 WHIRLPOOL fa3b4212d8107ba9ccbe1a4313f6a40016ebd136456d400839ddf0eb18eda791e33bd53999d34b59452338dcd2442f5628508d5cf269967b9ebfb8b6a77665ec
 EBUILD libffi-3.1-r2.ebuild 2204 SHA256 5a1f5380bf9a5f0c1ca36d82c2a97c0dd19b5356ba2c2c834fbd6af85c4526cf SHA512 4b17aa99e0dfa32c23bd8d5149db7bb8b2ef14d04af585b333ff7a28790bbdb2d19ce5b187a88f773d5ae28be31bb9f942c1aa24c303656e8a14b0becd5831dc WHIRLPOOL 3a8fbffa48d3628992ffa040f82ceb01992b2a6b4fb5790f410b958593f9c5437dfe0dbf65135e5b47ae9bc74ad47d835905824353b1e24af8d4604c426d493f
-EBUILD libffi-3.1.ebuild 2076 SHA256 1aea0b48ab15e2308d6be2aa0b6b8a6a91eaef18ddc389d340fbc7917a82bbe0 SHA512 411f34b01dd006726b5f4a16d0f0760729f6f5f533231986576f6672e6fe1bac4aceaafbca1d04a9bc2b67d3bedd677d9add36aded87237874fb884b2fed7d7d WHIRLPOOL e651a392293fa88b6685fd33fe83f679666cc2cf544f9541588c3b4408d870d5f22172d977af7ac5ad08c24008770ed0500d2b8a5375325ee33397b5d61191cc
-MISC ChangeLog 25513 SHA256 dd2c744a8197083cddbb32541391f01091618a33b488d49ce7820b06e6ae6b4a SHA512 cba06c981f5a000b8dd362c223082a4b49735ebf7d13ff6d8aa6cdd3dc2c67a1171137843bb3f3325497644e12abbd33a34ac3213dd26bda366014ce295e100d WHIRLPOOL e959520d6cb5d2a85a140c9677b90ca602c8624d5cb4dc90f3b3d35c5748842bf05375ad57264c7005bbec1f24cbed5c224f4c0752ca552767eb5a9f88372169
+MISC ChangeLog 25619 SHA256 53ce6948bfdfe6920bd74e91022209f0693583be3611cdcdd29573ea0482fc26 SHA512 9d21b2d1f50818931bdef1bd3f84156f39270993724eeb5e17046424080f9d4198541c57b1a206118c24a133c8db9a010eaf37df8bebedf68f7b4fc4d4a00ca2 WHIRLPOOL b0b277965831d742e61db2dc24447f0c89345f99efe279e4d1ebd0393015e5edccc0e85a6e0309b8021c75c0ff3f1ec3e9677e3f6e237d5bf0fed6f5e9e42983
 MISC metadata.xml 1768 SHA256 1bb92578368c006819d0cd5e1a94d32cffca87ddef8d571c29b483bedddc9b6e SHA512 2291c051ce2cb5c31989af68a705c0f8ce8d6ff23f2a66f839463a56a20454a6af276c5afc75687919e14fa614862356618e44c88415ff9884725e6e6db161bc WHIRLPOOL 7da7a437bf11dfcd5b5a8fbb067463ceb588fe83c1db0d15253293a955999d5dc65754918c73840a9a5020f86d1b6f1c9f8d127f4e1519594bc0678742727d45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJThkdwAAoJEEdUh39IaPFNMvwIAJCbBe1LSCCkUqQlMz3Xpu62
-+pQZSbeMw0W7S9DRIr7pAuQeH1niPSlTJqtE2GEtvZIIwaUf+dlpVBc6gxX5fq+V
-d3ILmvaTOpv5wiJdquoX3bR/XOqrtLaj9h9oYhUMLz43eZomaBfh9+n+OCwe/NWU
-Inyrqdi/kwOwpBNiMqJ9zKFyMS16HwbSCyWS7TyanuYMoGcsviqdkXs90n+XObjq
-jTWGqPtHDhl8WMThaCcz7PZtumwOz1uyzP2NVI1LVlkgkTt+O9xxsZYqKq+ILnN1
-bRARO5BJoaYnHqNzA8A8zADNFY+RucpI64UzLelO/n0JGhpgltdgnYClhx2d4Hc=
-=4WNR
+iQEcBAEBCAAGBQJThrxYAAoJEEdUh39IaPFNfwAH/RFuuaoxWPje54tGSyti4+qH
+yoSUcKXN2BTVwJd2uB8QrnaU9gJuC9wmPygEgGL9sWQq9uGnJ0lpcDOSDDxKewyd
+az+yrMjXqkLg36eewC/6VJ50Cd3xkOWOZrUx+9PWAjSXC3foltsSA5wRQ6HSytgP
+N+OonEL8q+f0gM0aTfZ5pbaSDvD99DifdNkN53xPn7p9bMQKgZQD38+cfLuX0Mic
+4Ah87dE1t1PHvWdtT6jqarLmivwPMlPlu0C+GELwA9de0xtIuX7yrydMheEslugI
+zU57yfqCmsiKyw+COQcvygJnwDJ26zo1ZGv8uCwc69OhB4Jqck2PEmyiEQpcEbs=
+=6rcI
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libffi/libffi-3.1-r1.ebuild b/dev-libs/libffi/libffi-3.1-r1.ebuild
deleted file mode 100644
index 0d9ff1060326..000000000000
--- a/dev-libs/libffi/libffi-3.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.1-r1.ebuild,v 1.1 2014/05/28 13:29:34 ssuominen Exp $
-
-EAPI=5
-inherit eutils libtool multilib multilib-minimal 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}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 ~arm-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="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-DEPEND="test? ( dev-util/dejagnu )"
-
-DOCS="ChangeLog* README"
-
-ECONF_SOURCE=${S}
-
-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 "${FILESDIR}"/${P}-execstack.patch #511634
-	sed -i 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
-	epatch_user
-	elibtoolize
-}
-
-multilib_src_configure() {
-	use userland_BSD && export HOST="${CHOST}"
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable pax_kernel pax_emutramp) \
-		$(use_enable debug)
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-}
diff --git a/dev-libs/libffi/libffi-3.1.ebuild b/dev-libs/libffi/libffi-3.1.ebuild
deleted file mode 100644
index 28f18f2c2219..000000000000
--- a/dev-libs/libffi/libffi-3.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.1.ebuild,v 1.2 2014/05/27 17:12:55 ssuominen Exp $
-
-EAPI=5
-inherit eutils libtool multilib multilib-minimal 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}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 ~arm-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="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-DEPEND="test? ( dev-util/dejagnu )"
-
-DOCS="ChangeLog* README"
-
-ECONF_SOURCE=${S}
-
-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() {
-	sed -i 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
-	epatch_user
-	elibtoolize
-}
-
-multilib_src_configure() {
-	use userland_BSD && export HOST="${CHOST}"
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable pax_kernel pax_emutramp) \
-		$(use_enable debug)
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-}