From 7b40c3dabd8d5bbffa5c6b94d15908b4aa567d07 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 24 Mar 2023 16:08:57 +0100 Subject: [PATCH] dev-libs/libassuan: Sync with Gentoo It's from Gentoo commit e18ed62e1f8bd278004327258642d684a6d1f396. --- .../dev-libs/libassuan/Manifest | 2 - .../dev-libs/libassuan/libassuan-2.5.3.ebuild | 48 ------------------- .../dev-libs/libassuan/libassuan-2.5.4.ebuild | 48 ------------------- .../dev-libs/libassuan/libassuan-2.5.5.ebuild | 7 +-- .../dev-libs/libassuan/metadata.xml | 12 ++--- 5 files changed, 10 insertions(+), 107 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/Manifest index 29c8687e0d..6b903682dc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/Manifest @@ -1,3 +1 @@ -DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617 -DIST libassuan-2.5.4.tar.bz2 574039 BLAKE2B 2eec42c47840741a4726fc35c3ed04300e5fbcd37f808b121534aeaa04d0d0f609a30ad48cfbe33a81ee4b2ebbb822b9a48a5c602268f1b802bf5d7d19d72e9c SHA512 764993d5311c24f0c0f970016e903e1a16783a2050c42072dbc1bc4f350f119e53b0be17ed6df25a0086bc9f8c25ee4f3134330577968480997263f95e05594f DIST libassuan-2.5.5.tar.bz2 572263 BLAKE2B 24952e97c757b97c387ab4c2c4bf7b040f2874e9326c129805c7f5326fa14d80e083b0842e336a635531a2c8d4a66d428c816bae6b175f1c4518add1ffa3554d SHA512 70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.3.ebuild deleted file mode 100644 index 345ce33518..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool - -DESCRIPTION="IPC library used by GnuPG and GPGME" -HOMEPAGE="https://www.gnupg.org/related_software/libassuan/index.en.html" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-3 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# Note: On each bump, update dep bounds on each version from configure.ac! -RDEPEND=">=dev-libs/libgpg-error-1.8" -DEPEND="${RDEPEND}" - -src_prepare() { - default - - if [[ ${CHOST} == *-solaris* ]] ; then - elibtoolize - - # fix standards conflict - sed -i \ - -e '/_XOPEN_SOURCE/s/500/600/' \ - -e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \ - -e 's/__EXTENSIONS__/_NO&/' \ - configure || die - fi -} - -src_configure() { - local myeconfargs=( - --disable-static - GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" - $("${S}/configure" --help | grep -o -- '--without-.*-prefix') - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - # ppl need to use libassuan-config for --cflags and --libs - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.4.ebuild deleted file mode 100644 index bdc2724f1d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.4.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool - -DESCRIPTION="IPC library used by GnuPG and GPGME" -HOMEPAGE="https://www.gnupg.org/related_software/libassuan/index.en.html" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-3 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# Note: On each bump, update dep bounds on each version from configure.ac! -RDEPEND=">=dev-libs/libgpg-error-1.17" -DEPEND="${RDEPEND}" - -src_prepare() { - default - - if [[ ${CHOST} == *-solaris* ]] ; then - elibtoolize - - # fix standards conflict - sed -i \ - -e '/_XOPEN_SOURCE/s/500/600/' \ - -e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \ - -e 's/__EXTENSIONS__/_NO&/' \ - configure || die - fi -} - -src_configure() { - local myeconfargs=( - --disable-static - GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" - $("${S}/configure" --help | grep -o -- '--without-.*-prefix') - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - # ppl need to use libassuan-config for --cflags and --libs - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.5.ebuild index 684fa24b72..f428bc5943 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/libassuan-2.5.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,10 +11,11 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-3 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # Note: On each bump, update dep bounds on each version from configure.ac! -RDEPEND=">=dev-libs/libgpg-error-1.17" +# We need >= 1.28 for gpgrt_malloc +RDEPEND=">=dev-libs/libgpg-error-1.28" DEPEND="${RDEPEND}" src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/metadata.xml index 7f2a3782fd..2a5683490a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libassuan/metadata.xml @@ -1,11 +1,11 @@ - - Lars Wendler - polynomial-c@gentoo.org - - + + base-system@gentoo.org + Gentoo Base System + + In an ideal world, Assuan is irrelevant. Assuan's primary use is to allow a client to interact with a non-persistent server. Using Assuan, this is accomplished by forking a subprocess and communicating with it @@ -15,5 +15,5 @@ across several transactions: not only is there a penalty for an increased number of context switches, but also a significant amount of data is MEMCPYed from the client to a file descriptor and from the file descriptor to the server. - +