diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lzop/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/lzop/Manifest index 082ee581c4..f21b8f488a 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/lzop/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-arch/lzop/Manifest @@ -1,2 +1 @@ -DIST lzop-1.03.tar.gz 370775 BLAKE2B c3932c18e13dee788ad405e8241e2366497fae66a7966131baf1880c10974839df12456f6986d975929f7e6005a5dce9887a8af0a2415ec7700ce5b68cf1e100 SHA512 a7a46793e060690f7da3e9dcae8e19f9c3633b84bc6e4a9a7fbf7791361fc7795e00f1d820978b20df8731c165b37244f11203a2936640688e4ade0cc2f5f3d7 DIST lzop-1.04.tar.gz 393483 BLAKE2B ebeceac9492ce45e6976cd5cde262d9755286e1649802e3e16bfae0abdd74714bf86b076816aa309542cadef5bb65971342208763e1b2761fce2332dc9daa38c SHA512 5829b4495ffefab549aa697a05c536ce593c572c9eee6004460583a0090abcd317c6074c4f981dfee6be61ac8d127f02dd37053b6cb782af64db41586a8bbb6e diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lzop/files/lzop-1.03-gcc6.patch b/sdk_container/src/third_party/portage-stable/app-arch/lzop/files/lzop-1.03-gcc6.patch deleted file mode 100644 index 0826bc1f52..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/lzop/files/lzop-1.03-gcc6.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/miniacc.h -+++ b/src/miniacc.h -@@ -4469,12 +4469,12 @@ - #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) -+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) - #endif - ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) - #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) -+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) - #endif - ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) - #if defined(acc_int16e_t) -@@ -4703,7 +4703,7 @@ - #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) -- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) -+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) - #endif - #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) - # pragma option pop diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lzop/files/lzop-1.03-x32.patch b/sdk_container/src/third_party/portage-stable/app-arch/lzop/files/lzop-1.03-x32.patch deleted file mode 100644 index e261f18123..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/lzop/files/lzop-1.03-x32.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/575450 - -Fix get of FLAGS register in x32 ABI, - -x32 ABI requires to have 64-bit variable to store FLAGS register -instead of size_t that is 32-bit variable, this fix operand -type mismatch when try to pop previous pushf value. - -Upstream-status: Submitted - -Signed-off-by: Aníbal Limón - -Index: lzop-1.03/src/miniacc.h -=================================================================== ---- lzop-1.03.orig/src/miniacc.h -+++ lzop-1.03/src/miniacc.h -@@ -754,6 +754,9 @@ - #elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) - # define ACC_ARCH_AMD64 1 - # define ACC_INFO_ARCH "amd64" -+# if defined(__ILP32__) -+# define ACC_ARCH_AMD64_X32 1 -+# endif - #elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB)) - # define ACC_ARCH_ARM 1 - # define ACC_ARCH_ARM_THUMB 1 -@@ -6787,7 +6790,11 @@ ACCLIB_PUBLIC_NOINLINE(void, acc_debug_n - ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_query) (void) - { - #if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC) -+# if defined(ACC_ARCH_AMD64_X32) -+ unsigned long long r; -+# else - size_t r; -+# endif - __asm__ __volatile__("pushf\n pop %0\n" : "=a" (r) : : __ACC_ASM_CLOBBER); - return (int)(r >> 18) & 1; - #elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lzop/lzop-1.03.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/lzop/lzop-1.03.ebuild deleted file mode 100644 index ad00dfc605..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-arch/lzop/lzop-1.03.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Utility for fast (even real-time) compression/decompression" -HOMEPAGE="http://www.lzop.org/" -SRC_URI="http://www.lzop.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -RDEPEND=">=dev-libs/lzo-2" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-x32.patch #575450 - "${FILESDIR}"/${P}-gcc6.patch #594472 -) - -HTML_DOCS=( doc/lzop.html ) - -src_test() { - einfo "compressing config.status to test" - src/lzop config.status || die 'compression failed' - ls -la config.status{,.lzo} - src/lzop -t config.status.lzo || die 'lzo test failed' - src/lzop -dc config.status.lzo | diff config.status - || die 'decompression generated differences from original' -} - -src_install() { - default - dodoc doc/lzop.{txt,ps} -} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lzop/lzop-1.04.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/lzop/lzop-1.04.ebuild index d34d3ce610..61d2ad39de 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/lzop/lzop-1.04.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/lzop/lzop-1.04.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" DESCRIPTION="Utility for fast (even real-time) compression/decompression" -HOMEPAGE="http://www.lzop.org/" -SRC_URI="http://www.lzop.org/download/${P}.tar.gz" +HOMEPAGE="https://www.lzop.org/" +SRC_URI="https://www.lzop.org/download/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="" RDEPEND=">=dev-libs/lzo-2" diff --git a/sdk_container/src/third_party/portage-stable/app-arch/lzop/metadata.xml b/sdk_container/src/third_party/portage-stable/app-arch/lzop/metadata.xml index 0319eec4c8..076793e3f5 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/lzop/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-arch/lzop/metadata.xml @@ -1,5 +1,5 @@ - + mgorny@gentoo.org