commit: 6acaa7787fa53d19b19c0f193b24969a5641a315 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Wed Jun 21 21:42:23 2017 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Wed Jun 21 21:51:01 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6acaa778
dev-libs/libffi: drop old versions, bug #622226 Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-libs/libffi/Manifest | 3 - .../files/libffi-3.0.13-emutramp_pax_proc.patch | 37 ------------- dev-libs/libffi/files/libffi-3.1-execstack.patch | 12 ---- .../libffi/files/libffi-3.1-typing_error.patch | 14 ----- dev-libs/libffi/libffi-3.0.13-r1.ebuild | 64 ---------------------- dev-libs/libffi/libffi-3.1-r3.ebuild | 62 --------------------- dev-libs/libffi/libffi-3.2.ebuild | 59 -------------------- 7 files changed, 251 deletions(-) diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest index 98cc0cd0b06..e9774e1aba6 100644 --- a/dev-libs/libffi/Manifest +++ b/dev-libs/libffi/Manifest @@ -1,4 +1 @@ -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 DIST libffi-3.2.1.tar.gz 940837 SHA256 d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 WHIRLPOOL b9d3c86e347029fa9f03fd3813405cc731099812ad6186bd4d2ea646354383803c90912b20e1804a6b7fc12719403b3c0c3b800bdbcab564a2c93fcb4fd722ad -DIST libffi-3.2.tar.gz 940691 SHA256 6b2680fbf6ae9c2381d381248705857de22e05bae191889298f8e6bfb2ded4ef SHA512 fed5f6eec86144608966857f54bd69a5faa43427f27bc9178ebe2c7a1cecf925c20dbd6df07a207ae469842874efcf5b99fb7e09db59cbd92ebfc0a7e1bb62b7 WHIRLPOOL db7491bc5914eb6691aa366677c63af51979453330373251b1043b53163d1b56dbed65ba23c9f5047257e476e0d216045a06faa346790987047854ae1d04361d diff --git a/dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch b/dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch deleted file mode 100644 index c27bd9bf889..00000000000 --- a/dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch +++ /dev/null @@ -1,37 +0,0 @@ -2013-05-22 Magnus Granberg <[email protected]> - - #457194 - * src/closuer.c (emutramp_enabled_check): Check with /proc. - ---- a/src/closures.c 2013-03-17 23:27:11.000000000 +0100 -+++ b/src/closures.c 2013-04-29 23:26:02.279022022 +0200 -@@ -181,10 +181,26 @@ static int emutramp_enabled = -1; - static int - emutramp_enabled_check (void) - { -- if (getenv ("FFI_DISABLE_EMUTRAMP") == NULL) -- return 1; -- else -+ char *buf = NULL; -+ size_t len = 0; -+ FILE *f; -+ int ret; -+ f = fopen ("/proc/self/status", "r"); -+ if (f == NULL) - return 0; -+ ret = 0; -+ -+ while (getline (&buf, &len, f) != -1) -+ if (!strncmp (buf, "PaX:", 4)) -+ { -+ char emutramp; -+ if (sscanf (buf, "%*s %*c%c", &emutramp) == 1) -+ ret = (emutramp == 'E'); -+ break; -+ } -+ free (buf); -+ fclose (f); -+ return ret; - } - - #define is_emutramp_enabled() (emutramp_enabled >= 0 ? emutramp_enabled \ diff --git a/dev-libs/libffi/files/libffi-3.1-execstack.patch b/dev-libs/libffi/files/libffi-3.1-execstack.patch deleted file mode 100644 index b9943aa0a13..00000000000 --- a/dev-libs/libffi/files/libffi-3.1-execstack.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/511634 -https://sourceware.org/ml/libffi-discuss/2014/msg00058.html - ---- src/x86/win32.S -+++ src/x86/win32.S -@@ -1304,3 +1304,6 @@ - - #endif /* !_MSC_VER */ - -+#if defined __ELF__ && defined __linux__ -+ .section .note.GNU-stack,"",@progbits -+#endif diff --git a/dev-libs/libffi/files/libffi-3.1-typing_error.patch b/dev-libs/libffi/files/libffi-3.1-typing_error.patch deleted file mode 100644 index 0e917020e91..00000000000 --- a/dev-libs/libffi/files/libffi-3.1-typing_error.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/511752 -https://sourceware.org/ml/libffi-discuss/2014/msg00059.html - ---- include/ffi.h.in -+++ include/ffi.h.in -@@ -221,7 +221,7 @@ typedef struct { - #endif - } ffi_cif; - --#if HAVE_LONG_DOUBLE_VARIANT -+#if @HAVE_LONG_DOUBLE_VARIANT@ - /* Used to adjust size/alignment of ffi types. */ - void ffi_prep_types (ffi_abi abi); - # endif diff --git a/dev-libs/libffi/libffi-3.0.13-r1.ebuild b/dev-libs/libffi/libffi-3.0.13-r1.ebuild deleted file mode 100644 index aed09f2e6a8..00000000000 --- a/dev-libs/libffi/libffi-3.0.13-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils libtool multilib toolchain-funcs multilib-minimal - -DESCRIPTION="a portable, high level programming interface to various calling conventions" -HOMEPAGE="https://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 ~amd64-linux ~arm-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 https://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 "${FILESDIR}"/${P}-emutramp_pax_proc.patch #457194 - 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 -} - -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.1-r3.ebuild b/dev-libs/libffi/libffi-3.1-r3.ebuild deleted file mode 100644 index 2b71c3a3e82..00000000000 --- a/dev-libs/libffi/libffi-3.1-r3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils libtool multilib multilib-minimal toolchain-funcs - -DESCRIPTION="a portable, high level programming interface to various calling conventions" -HOMEPAGE="https://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 ~amd64-linux ~arm-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 https://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 \ - "${FILESDIR}"/${P}-typing_error.patch - - sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814 - # https://sourceware.org/ml/libffi-discuss/2014/msg00060.html - sed -i -e 's:@toolexeclibdir@:${libdir}:' libffi.pc.in || die #511726 - - 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.2.ebuild b/dev-libs/libffi/libffi-3.2.ebuild deleted file mode 100644 index 67c52e76584..00000000000 --- a/dev-libs/libffi/libffi-3.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils libtool multilib multilib-minimal toolchain-funcs - -DESCRIPTION="a portable, high level programming interface to various calling conventions" -HOMEPAGE="https://sourceware.org/libffi/"; -SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"; - -LICENSE="MIT" -SLOT="0" -# A number of people report python ctypes errors #529044 -#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 https://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 -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814 - - epatch "${FILESDIR}"/${PN}-3.1-darwin-x32.patch - - 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 -}
