From 939f2bb5610fdeb0401110252f04eda1f0defd0a Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Thu, 13 Oct 2011 21:48:29 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.2.0_alpha64/cvs/Linux x86_64 --- dev-libs/libffi/ChangeLog | 12 +++- dev-libs/libffi/Manifest | 17 ++++-- .../libffi/files/libffi-3.0.10-interix.patch | 16 ----- dev-libs/libffi/libffi-3.0.11_rc1.ebuild | 58 +++++++++++++++++++ 4 files changed, 78 insertions(+), 25 deletions(-) delete mode 100644 dev-libs/libffi/files/libffi-3.0.10-interix.patch create mode 100644 dev-libs/libffi/libffi-3.0.11_rc1.ebuild diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog index 43b94220b2a6..6e6aef788691 100644 --- a/dev-libs/libffi/ChangeLog +++ b/dev-libs/libffi/ChangeLog @@ -1,10 +1,16 @@ # ChangeLog for dev-libs/libffi # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.127 2011/09/29 10:34:15 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.128 2011/10/13 21:48:29 ssuominen Exp $ + +*libffi-3.0.11_rc1 (13 Oct 2011) + + 13 Oct 2011; Samuli Suominen + +libffi-3.0.11_rc1.ebuild: + Version bump. 06 Sep 2011; Samuli Suominen -libffi-3.0.9.ebuild, - -libffi-3.0.10_rc8.ebuild: - remove old + -libffi-3.0.10_rc8.ebuild, -files/libffi-3.0.10-interix.patch: + old *libffi-3.0.10 (29 Aug 2011) diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest index 43b99c8a2a10..0f6a29909186 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.10-interix.patch 446 RMD160 c56684d896abd79b8d0b10a47b469667bb0f1fc6 SHA1 e9db730499633c73a1034514de156d9e0d965349 SHA256 a73924da5c4d8dbd1a8fa526456dc474fb52ebf9e5924d4ef07cb5b7fb959126 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 @@ -9,15 +8,21 @@ AUX libffi-3.0.9-irix.patch 1516 RMD160 0e7ecd3d857899972733375943bc1268aa92c2d5 AUX libffi-3.0.9-powerpc64-darwin.patch 531 RMD160 0eff6b065037c5d2ba3e4aa2575f6291aa427a7d SHA1 c44fbbf616e0735f4675666e2d74b6bb11302b83 SHA256 8b4cbef53013ac1e0e9a977b7b9295a721fe1897730cac6d282b8953581d3df7 AUX libffi-3.0.9-strncmp.patch 433 RMD160 da46944b5c07db3a931c9f4b6ce022dde5968313 SHA1 99032e2ada8631375d2cc195c9a53c2c918aedef SHA256 27c04f9c5527606d3689f24d4fdd1eb8a689fac5d922965b7704ce6f24bc633c 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.9.tar.gz 731719 RMD160 11ff9aeb62f4fbe1fecf09e6f9814a72bfedb37a SHA1 56e41f87780e09d06d279690e53d4ea2c371ea88 SHA256 589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452 EBUILD libffi-3.0.10.ebuild 1580 RMD160 bb12cc828ed2bf8200cc850b2a7258fd231941cd SHA1 8bfcd22fe776ebf2e05f966a0b0761a71ddbadd2 SHA256 8485c9c7bb5765e37376a20e0da41cacc602e3bb0c49c82e62f123eb86e665a2 +EBUILD libffi-3.0.11_rc1.ebuild 1710 RMD160 ccfc57a76450bab80dc1229539a55dac7f244954 SHA1 23e75f4b03ea556b5f43be597304d0aa56424ff5 SHA256 3e80a710dac3c1d024eaa5cb9f6b4955887ebf58c99a4dcb6215288fae42f694 EBUILD libffi-3.0.9-r2.ebuild 1364 RMD160 f12e39e8b5e5b175ce512f294ec0b208b6c0b306 SHA1 3c21198cbd55358684968871a4a37c552db03488 SHA256 85e679eac4e642f56a19a4ab44195f49d345c94cbd955bfd4220e81f72166714 -MISC ChangeLog 17240 RMD160 a48c760e8ae52cbbfeab3b6a88c90c8624aa2059 SHA1 1d70e2cbf93aaf97ec82839a028dc1a64f12285c SHA256 1dc6c1eb31bbc3ab67815a1a49cf10f183dacebf06746a14418611d730e07dfb +MISC ChangeLog 17405 RMD160 09ad83f97384d5d29a6bb5dee46a721c565d34f9 SHA1 9aa262cfd9827b773db88af6a6ad2ce2ba6bf4d7 SHA256 c3a0651c541c1d36700fe291fb97fa79435b0df67af29b65de4548dd7210958f MISC metadata.xml 1663 RMD160 d2ead0beb5a34033489150623558bbe4e0083516 SHA1 8a54e9af62c01a17431ee8359edbe1d35099d3c3 SHA256 f03f0b55cdf4405ead462ba1c1b8ff2f1b6821c22c3f23d484490f8c875f6073 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (SunOS) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6ESa0ACgkQX3X2B8XHTolrtACffJNMRWLW/O0F4qmMOO/qeAWh -DqMAoIyH1IgQ+9BNanv1j9dNdk5XFEwJ -=mkdZ +iQEcBAEBAgAGBQJOl1ywAAoJEEdUh39IaPFNh94H/2eUzcYUBpuacKBiDs5/zz84 +H3anxSj8ONy2Rr3pyiLV5qeakgN8tB9tf6SihRMSzFeauZR6vj0wBlCcskBPOR57 +c6FiLtIxZYye73VLpnvuZTNc/cREfdBXdWNzLH7SmwEKjfqtCYyQ0LPlrmfkhJZC +OY1rTVGfqSqg57xNoNcKhUo7hfEKtK1dW8xLyUDOk22WwiAwMYcymz1RDu23PamX +AyDcrPWFK/fh0f0g14rdrTNpH+SUO1FLs43S3H11WXaQmh7mfUdBz1Fx6do+ka+/ +ayj/25AQzE/0YvxG7eXCIWfIZUtOpDOKvhEN0bgCcfguazZTzjm4z+ub6KjpeTc= +=E58G -----END PGP SIGNATURE----- diff --git a/dev-libs/libffi/files/libffi-3.0.10-interix.patch b/dev-libs/libffi/files/libffi-3.0.10-interix.patch deleted file mode 100644 index 92a7d1dc5d45..000000000000 --- a/dev-libs/libffi/files/libffi-3.0.10-interix.patch +++ /dev/null @@ -1,16 +0,0 @@ -report: - - http://sourceware.org/ml/libffi-discuss/2011/msg00131.html - -diff -ru libffi-3.0.10rc8.orig/src/closures.c libffi-3.0.10rc8/src/closures.c ---- libffi-3.0.10rc8.orig/src/closures.c 2011-05-10 08:45:31 +0200 -+++ libffi-3.0.10rc8/src/closures.c 2011-05-10 09:12:33 +0200 -@@ -172,7 +172,7 @@ - - #endif /* !FFI_MMAP_EXEC_SELINUX */ - --#elif defined (__CYGWIN__) -+#elif defined (__CYGWIN__) || defined(__INTERIX) - - #include - diff --git a/dev-libs/libffi/libffi-3.0.11_rc1.ebuild b/dev-libs/libffi/libffi-3.0.11_rc1.ebuild new file mode 100644 index 000000000000..90d0731fe338 --- /dev/null +++ b/dev-libs/libffi/libffi-3.0.11_rc1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2011 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.1 2011/10/13 21:48:29 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 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() { + 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 + find "${ED}"usr -name '*.la' -exec rm -f {} + +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/libffi.so.5 +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/libffi.so.5 +} -- 2.26.2