From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jun 2020 17:50:24 +0100 Subject: gentoo resync : 21.06.2020 --- sys-libs/libaal/Manifest | 4 -- sys-libs/libaal/files/libaal-1.0.6-glibc26.patch | 89 ------------------------ sys-libs/libaal/libaal-1.0.6.ebuild | 39 ----------- sys-libs/libaal/libaal-1.0.7.ebuild | 42 ----------- 4 files changed, 174 deletions(-) delete mode 100644 sys-libs/libaal/files/libaal-1.0.6-glibc26.patch delete mode 100644 sys-libs/libaal/libaal-1.0.6.ebuild delete mode 100644 sys-libs/libaal/libaal-1.0.7.ebuild (limited to 'sys-libs/libaal') diff --git a/sys-libs/libaal/Manifest b/sys-libs/libaal/Manifest index b94e2c1b67cf..5da9d002c95e 100644 --- a/sys-libs/libaal/Manifest +++ b/sys-libs/libaal/Manifest @@ -1,7 +1,3 @@ -AUX libaal-1.0.6-glibc26.patch 2471 BLAKE2B aac8ae431a32f5f9ee6a5d763b7aa1ab5e80c1531fee7cf75cb2aeb77dbaa66cf3cde5a55f3f5b824fec1e19c1133ff16ae22aedf5a4ec97842caf39a70ce3f0 SHA512 391741ed77da1c43d00df22dac8531fe3ee1f187fd449a82b6f6a9aa0f493ada19745c6ded76dcedae2a9d26df9da93dbb22c4737c0263d06983ebd0c6ac887d -DIST libaal-1.0.6.tar.gz 345894 BLAKE2B 726eb26d80ce5cb198a059e74ded76d7ce97aabd2bd38209194462be9c6ffd5aafbfff3a35fddcae8b6b1c88ad8a378a6328217aed490f156bbb806d4ec687b9 SHA512 9b13096abcb90e75fff607ffd7b11ed8b100f349800b726acb01aca12f54abe784adb9912916fe8ed0751ebf367ecced04ab058e1e8b947f4209a5e6c390f123 DIST libaal-1.0.7.tar.gz 376068 BLAKE2B 2fb7802401721a64b17c0409f3ff668524399efc03b4bda4b4523af2cce204fdb5cf41bb2b2a6af5cbda34ee88cbb4703eec9bb76774d705b1759c91a33b1e34 SHA512 9b39a8cd3f49257ea912bb0e463c0c63ad06914e8a310deb4d4dce544d3ee34f492203c7321f971af71dddc1eb85f207082a4791b19bd4fad3f7dab516513b3d -EBUILD libaal-1.0.6.ebuild 860 BLAKE2B f4e78e8d50d4b012f9100ebf01504b6ef0955c3666f0162e91d7f5c75f10cf064da7886673046b7e36b526b7c33cb9f34f3da8448bea9c45fc4d97f7541da0ad SHA512 9f43cd8fed63b027976c8171f4b86263f78afa5ea2e29eb32941dc96e1dbd490ff2d48936bda4b9860c432bf40ac64226383e1664903f2581ca72c526016e85a EBUILD libaal-1.0.7-r1.ebuild 853 BLAKE2B fcc789a010130a7cdb2f1b25b5744169e08a631b63e689c8932df4b2cbd326c8e5c016ed3b6274f7406f0d2e4dfd30c7fc9fe728909b925945600cafe2f03f24 SHA512 62b249c7b34a9b30654c910fc4fcca2f34edf5a14aa490e9a567b61aeef830873ebe15b98106c2303ad3e60fc49e8db6ade99dfbb3189a58eaac16e24b748c95 -EBUILD libaal-1.0.7.ebuild 857 BLAKE2B ef2da28e5c7bd7165f0ef9d805d8e4fe451552a2458ee3a5ed043b68b23181a57860cce95804caec02c067a537a3a1695957bb697cfab9cb0832fd8ef74daef4 SHA512 95f513966ef1a9a14f7be7fbc27b838f69c3f8b2f43c7a1ad3b3f35c934e854de75413fc5fa04251cd2313139f6ce1c0da89a6d3e03967d570759daf4ed8003a MISC metadata.xml 493 BLAKE2B ccc5d79189bac603eaec22245f68952afbed30677759278dd3078b1af4c15358ee945b7f20c9e5b0210e04e989d5e784d4780a69516e9647aec87a47e5bb39d3 SHA512 ec9eee8ae224303648bd688c0309cc8809cb2dd0d80aa1fe77d7a039a0258aa4288745e9cd191ac2c70de64160cb62c47f43983ef852f171044ad39f5a5120df diff --git a/sys-libs/libaal/files/libaal-1.0.6-glibc26.patch b/sys-libs/libaal/files/libaal-1.0.6-glibc26.patch deleted file mode 100644 index 298d75ae2d74..000000000000 --- a/sys-libs/libaal/files/libaal-1.0.6-glibc26.patch +++ /dev/null @@ -1,89 +0,0 @@ -Stop redefining libc definitions that cause build failures under glibc-2.26. - -[ 46s] In file included from /usr/include/sys/types.h:156:0, -[ 46s] from /usr/include/stdlib.h:279, -[ 46s] from malloc.c:15: -[ 46s] /usr/include/bits/stdint-intn.h:27:19: error: conflicting types for -'int64_t' -[ 46s] typedef __int64_t int64_t; -[ 46s]^~~ -[ 46s] In file included from ../include/aal/libaal.h:17:0, -[ 46s] from malloc.c:6: -[ 46s] ../include/aal/types.h:35:33: note: previous declaration of 'int64_t' -was here -[ 46s] typedef long long int int64_t; - -Author: Jan Engelhardt - ---- - include/aal/types.h | 48 ++---------------------------------------------- - 1 file changed, 2 insertions(+), 46 deletions(-) - -Index: libaal-1.0.6/include/aal/types.h -=================================================================== ---- libaal-1.0.6.orig/include/aal/types.h -+++ libaal-1.0.6/include/aal/types.h -@@ -26,24 +26,7 @@ - #undef ESTRUCT - #define ESTRUCT 50 - --#ifndef __int8_t_defined --#define __int8_t_defined --typedef signed char int8_t; --typedef short int int16_t; --typedef int int32_t; --__extension__ --typedef long long int int64_t; --#endif -- --typedef unsigned char uint8_t; --typedef unsigned short int uint16_t; --#ifndef __uint32_t_defined --#define __uint32_t_defined --typedef unsigned int uint32_t; --__extension__ --typedef unsigned long long int uint64_t; --#endif -- -+#include - #define MAX_UINT8 ((uint8_t)~0) - #define MAX_UINT16 ((uint16_t)~0) - #define MAX_UINT32 ((uint32_t)~0) -@@ -53,36 +36,9 @@ typedef unsigned long long int uint64_t - because we don't want use gcc builtins in minimal mode for achive as small - binary size as possible. */ - --#ifndef ENABLE_MINIMAL - # include --#else --#ifndef _VA_LIST_ --#define _VA_LIST_ --typedef char *va_list; --#endif --#undef va_arg --#undef va_end --#undef va_start -- --#define va_end(ap) \ -- do {} while(0); -- --#define va_start(ap, p) \ -- (ap = (char *)(&(p)+1)) -- --#define va_arg(ap, type) \ -- ((type *)(ap += sizeof(type)))[-1] --#endif -- --/* As libaal may be used without any standard headers, we need to declare NULL -- macro here in order to avoid compilation errors. */ --#undef NULL - --#if defined(__cplusplus) --# define NULL 0 --#else --# define NULL ((void *)0) --#endif -+#include - - /* Simple type for direction denoting */ - enum aal_dir { diff --git a/sys-libs/libaal/libaal-1.0.6.ebuild b/sys-libs/libaal/libaal-1.0.6.ebuild deleted file mode 100644 index 7c3711c17c19..000000000000 --- a/sys-libs/libaal/libaal-1.0.6.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit toolchain-funcs eutils usr-ldscript - -DESCRIPTION="library required by reiser4progs" -HOMEPAGE="https://sourceforge.net/projects/reiser4/" -SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 -sparc x86" -IUSE="static-libs" - -DEPEND="virtual/os-headers" - -src_prepare() { - # remove stupid CFLAG hardcodes - sed -i \ - -e "/GENERIC_CFLAGS/s:-O3::" \ - -e "/^CFLAGS=/s:\"\":\"${CFLAGS}\":" \ - configure || die "sed" - printf '#!/bin/sh\n:\n' > run-ldconfig - epatch "${FILESDIR}"/${PN}-1.0.6-glibc26.patch -} - -src_configure() { - econf \ - --enable-libminimal \ - --enable-memory-manager \ - $(use_enable static-libs static) -} - -src_install() { - default - gen_usr_ldscript -a aal{,-minimal} -} diff --git a/sys-libs/libaal/libaal-1.0.7.ebuild b/sys-libs/libaal/libaal-1.0.7.ebuild deleted file mode 100644 index 0c87ceae6fdc..000000000000 --- a/sys-libs/libaal/libaal-1.0.7.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs usr-ldscript - -DESCRIPTION="library required by reiser4progs" -HOMEPAGE="https://sourceforge.net/projects/reiser4/" -SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86" -IUSE="static-libs" - -DEPEND="virtual/os-headers" - -src_prepare() { - default - - # remove stupid CFLAG hardcodes - sed -i \ - -e "/GENERIC_CFLAGS/s:-O3::" \ - -e "/^CFLAGS=/s:\"\":\"${CFLAGS}\":" \ - configure || die - printf '#!/bin/sh\n:\n' > run-ldconfig || die -} - -src_configure() { - local myeconfargs=( - --enable-libminimal - --enable-memory-manager - $(use_enable static-libs static) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - gen_usr_ldscript -a aal{,-minimal} -} -- cgit v1.2.3