From f07a9cd5af2f6f55bc8959f58b18bceaa68d1b18 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 10 May 2023 16:24:16 +0200 Subject: [PATCH] dev-libs/popt: Sync with Gentoo It's from Gentoo commit 1d3c6ffb2cdda3399c9f4baffe600d9330ab7f5e. --- .../portage-stable/dev-libs/popt/Manifest | 1 + .../portage-stable/dev-libs/popt/metadata.xml | 15 +++--- .../dev-libs/popt/popt-1.18.ebuild | 13 +++-- .../dev-libs/popt/popt-1.19.ebuild | 52 +++++++++++++++++++ 4 files changed, 71 insertions(+), 10 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.19.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/popt/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/popt/Manifest index 650e16e680..d698ce53ff 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/popt/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/popt/Manifest @@ -1 +1,2 @@ DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5 +DIST popt-1.19.tar.gz 596676 BLAKE2B 8f8965e2d339f0413e8d1da421ea7556526f39f089a822063d6fdc35b781a7c7ea84a91d6af3e25902c1f045f564ef956fc69cd4625e6cc008c9e3ca34923a9d SHA512 5d1b6a15337e4cd5991817c1957f97fc4ed98659870017c08f26f754e34add31d639d55ee77ca31f29bb631c0b53368c1893bd96cf76422d257f7997a11f6466 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/popt/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/popt/metadata.xml index d9361572be..5bbdd7a2e5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/popt/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/popt/metadata.xml @@ -1,11 +1,12 @@ - - base-system@gentoo.org - Gentoo Base System - - - cpe:/a:popt_project:popt - + + base-system@gentoo.org + Gentoo Base System + + + cpe:/a:popt_project:popt + rpm-software-management/popt + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.18.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.18.ebuild index 296a95e62b..f23e5fb1f2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.18.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.18.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit multilib-minimal libtool +inherit flag-o-matic multilib-minimal libtool toolchain-funcs DESCRIPTION="Parse Options - Command line parser" HOMEPAGE="https://github.com/rpm-software-management/popt" @@ -11,7 +11,7 @@ SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz" LICENSE="MIT" 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" IUSE="nls static-libs" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" @@ -25,6 +25,13 @@ src_prepare() { } multilib_src_configure() { + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + local myeconfargs=( $(use_enable static-libs static) $(use_enable nls) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.19.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.19.ebuild new file mode 100644 index 0000000000..41d00ef009 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/popt/popt-1.19.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multilib-minimal libtool toolchain-funcs + +DESCRIPTION="Parse Options - Command line parser" +HOMEPAGE="https://github.com/rpm-software-management/popt" +SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +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" +IUSE="nls static-libs" + +RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( >=sys-devel/gettext-0.19.8 )" + +src_prepare() { + default + + # Unclear what the background to this is, perhaps + # https://git.exherbo.org/arbor.git/commit/?id=5545d22d3493279acf7a55246179f818ef22f5fa + sed -i -e 's:lt-test1:test1:' tests/testit.sh || die + + elibtoolize +} + +multilib_src_configure() { + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + + local myeconfargs=( + --disable-werror + $(use_enable static-libs static) + $(use_enable nls) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + + find "${ED}" -type f -name "*.la" -delete || die +}