From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9A2B715808B for ; Wed, 6 Apr 2022 23:34:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9011E0B23; Wed, 6 Apr 2022 23:34:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2DC1BE0AFE for ; Wed, 6 Apr 2022 23:34:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 44B1D3412B6 for ; Wed, 6 Apr 2022 23:34:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC6BF38C for ; Wed, 6 Apr 2022 23:34:15 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1649287944.c32ca8b2104a3644ab693de9e835fea300a084a8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/xz-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild app-arch/xz-utils/xz-utils-9999.ebuild X-VCS-Directories: app-arch/xz-utils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c32ca8b2104a3644ab693de9e835fea300a084a8 X-VCS-Branch: master Date: Wed, 6 Apr 2022 23:34:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cb41d2d9-fb23-4307-a4e0-091670a96c72 X-Archives-Hash: eff2671cbb005b7f1292c42afb88146a commit: c32ca8b2104a3644ab693de9e835fea300a084a8 Author: Sam James gentoo org> AuthorDate: Wed Apr 6 22:56:16 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Apr 6 23:32:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c32ca8b2 app-arch/xz-utils: modernise ebuilds Notably drop obsolete dev-vcs/cvs BDEPEND in 9999. It's been using git for a while. Signed-off-by: Sam James gentoo.org> app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild | 39 ++++++++++++++++++++---------- app-arch/xz-utils/xz-utils-9999.ebuild | 39 ++++++++++++++++++++---------- 2 files changed, 52 insertions(+), 26 deletions(-) diff --git a/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild index 7a24ca8fbd0d..c67793d89db9 100644 --- a/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild +++ b/app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild @@ -8,20 +8,22 @@ EAPI=7 inherit libtool multilib multilib-minimal preserve-libs usr-ldscript -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.tukaani.org/xz.git" inherit git-r3 autotools - SRC_URI="" - BDEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068 + + # bug #272880 and bug #286068 + BDEPEND="sys-devel/gettext >=sys-devel/libtool-2" else MY_P="${PN/-utils}-${PV/_}" SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz" - [[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \ - 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" + if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then + 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" + fi S="${WORKDIR}/${MY_P}" fi -DESCRIPTION="utils for managing LZMA compressed files" +DESCRIPTION="Utils for managing LZMA compressed files" HOMEPAGE="https://tukaani.org/xz/" # See top-level COPYING file as it outlines the various pieces and their licenses. @@ -39,11 +41,13 @@ RESTRICT="!extra-filters? ( test )" src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + + if [[ ${PV} == 9999 ]] ; then eautopoint eautoreconf else - elibtoolize # to allow building shared libs on Solaris/x64 + # Allow building shared libs on Solaris/x64 + elibtoolize fi } @@ -53,24 +57,32 @@ multilib_src_configure() { $(use_enable nls) $(use_enable static-libs static) ) - multilib_is_native_abi || - myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} ) - if ! use extra-filters; then + + if ! multilib_is_native_abi ; then + myconf+=( + --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} + ) + fi + + if ! use extra-filters ; then myconf+=( # LZMA1 + LZMA2 for standard .lzma & .xz files --enable-encoders=lzma1,lzma2 --enable-decoders=lzma1,lzma2 + # those are used by default, depending on preset --enable-match-finders=hc3,hc4,bt4 + # CRC64 is used by default, though some (old?) files use CRC32 --enable-checks=crc32,crc64 ) fi if [[ ${CHOST} == *-solaris* ]] ; then - # undo Solaris-based defaults pointing to /usr/xpg5/bin + export gl_cv_posix_shell="${EPREFIX}"/bin/sh + + # Undo Solaris-based defaults pointing to /usr/xpg5/bin myconf+=( --disable-path-for-script ) - export gl_cv_posix_shell=${EPREFIX}/bin/sh fi ECONF_SOURCE="${S}" econf "${myconf[@]}" @@ -78,6 +90,7 @@ multilib_src_configure() { multilib_src_install() { default + gen_usr_ldscript -a lzma } diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild index 0b2c2d879fb8..c67793d89db9 100644 --- a/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/app-arch/xz-utils/xz-utils-9999.ebuild @@ -8,20 +8,22 @@ EAPI=7 inherit libtool multilib multilib-minimal preserve-libs usr-ldscript -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.tukaani.org/xz.git" inherit git-r3 autotools - SRC_URI="" - BDEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068 + + # bug #272880 and bug #286068 + BDEPEND="sys-devel/gettext >=sys-devel/libtool-2" else MY_P="${PN/-utils}-${PV/_}" SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz" - [[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \ - 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" + if [[ ${PV} != *_alpha* ]] && [[ ${PV} != *_beta* ]] ; then + 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" + fi S="${WORKDIR}/${MY_P}" fi -DESCRIPTION="utils for managing LZMA compressed files" +DESCRIPTION="Utils for managing LZMA compressed files" HOMEPAGE="https://tukaani.org/xz/" # See top-level COPYING file as it outlines the various pieces and their licenses. @@ -39,11 +41,13 @@ RESTRICT="!extra-filters? ( test )" src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + + if [[ ${PV} == 9999 ]] ; then eautopoint eautoreconf else - elibtoolize # to allow building shared libs on Solaris/x64 + # Allow building shared libs on Solaris/x64 + elibtoolize fi } @@ -53,24 +57,32 @@ multilib_src_configure() { $(use_enable nls) $(use_enable static-libs static) ) - multilib_is_native_abi || - myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} ) - if ! use extra-filters; then + + if ! multilib_is_native_abi ; then + myconf+=( + --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} + ) + fi + + if ! use extra-filters ; then myconf+=( # LZMA1 + LZMA2 for standard .lzma & .xz files --enable-encoders=lzma1,lzma2 --enable-decoders=lzma1,lzma2 + # those are used by default, depending on preset --enable-match-finders=hc3,hc4,bt4 + # CRC64 is used by default, though some (old?) files use CRC32 --enable-checks=crc32,crc64 ) fi if [[ ${CHOST} == *-solaris* ]] ; then - # undo Solaris-based defaults pointing to /usr/xpg5/bin + export gl_cv_posix_shell="${EPREFIX}"/bin/sh + + # Undo Solaris-based defaults pointing to /usr/xpg5/bin myconf+=( --disable-path-for-script ) - export gl_cv_posix_shell=${EPREFIX}/bin/sh fi ECONF_SOURCE="${S}" econf "${myconf[@]}" @@ -78,6 +90,7 @@ multilib_src_configure() { multilib_src_install() { default + gen_usr_ldscript -a lzma }