commit: d4803c05a6deeda9e91c7834a091b2d2dcdd876e Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Thu Jul 20 06:14:30 2023 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Thu Jul 20 06:14:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4803c05
app-portage/portage-utils-0.96.1: version bump for bug #735134 Closes: https://bugs.gentoo.org/735134 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> app-portage/portage-utils/Manifest | 1 + ...ils-0.95.ebuild => portage-utils-0.96.1.ebuild} | 10 +-- .../portage-utils/portage-utils-0.96.ebuild | 75 ---------------------- 3 files changed, 6 insertions(+), 80 deletions(-) diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index 4ec99a05b347..8fe52687a1b1 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1,2 +1,3 @@ DIST portage-utils-0.95.tar.xz 1806140 BLAKE2B 5a468a7b4006073203ba634a5d70398e254ef5db7e9b71fbcf20bce68942f74acce1d42b5d315931f93e8698c8dd2f38f328fcc6fdaa86addba7dbcc21fce5fa SHA512 2d1f4b986a377249043259d8ada1a35a7dd55179f0ef5c2c18a4180c8f1f7064133ab2677426098e61b1355fa26cb0f8aa3c6ea06d46af4c4ba2df4eb53489a4 +DIST portage-utils-0.96.1.tar.xz 1807156 BLAKE2B 6bf334c0083e5e8b0d6206ff43d4df0e32a9576ddedbe055cb6ef903b5f11d0878512ace7f93ea37207181321ca160a8f721b3095b2bcbfcdbb353ba3f5d4873 SHA512 769e734e0738aa52408fd6c151706085148818a19b2ad1051684e2d54fe9f486f2e3a25e8fb408c83325cfb428644c6c0aa3b6d1bac0d2189680c70d9657bcbf DIST portage-utils-0.96.tar.xz 1806032 BLAKE2B 93ef9658a4b0bae7fb0527462bd9d0d19f396262818380d8ec2022c9fda596265c50adc262bdf296a4dd8c6b891b064316281d21444c8b903db20ca2463879e3 SHA512 cc32f53532c082544cabe505d8b90b947b6ab48742678aa98cbe9ba291625e8449ed0ecd90e01dc00b06c209b34001ad57a060918658e53d3babdc5c76ea7b02 diff --git a/app-portage/portage-utils/portage-utils-0.95.ebuild b/app-portage/portage-utils/portage-utils-0.96.1.ebuild similarity index 84% rename from app-portage/portage-utils/portage-utils-0.95.ebuild rename to app-portage/portage-utils/portage-utils-0.96.1.ebuild index b70c8d6732ac..a40fd823f800 100644 --- a/app-portage/portage-utils/portage-utils-0.95.ebuild +++ b/app-portage/portage-utils/portage-utils-0.96.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"; else SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" @@ -21,6 +21,10 @@ SLOT="0" IUSE="openmp +qmanifest +qtegrity static" RDEPEND=" + openmp? ( || ( + sys-devel/gcc:*[openmp] + sys-libs/libomp + ) ) qmanifest? ( !static? ( app-crypt/gpgme:= @@ -50,10 +54,6 @@ DEPEND="${RDEPEND} )" BDEPEND="virtual/pkgconfig" -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } diff --git a/app-portage/portage-utils/portage-utils-0.96.ebuild b/app-portage/portage-utils/portage-utils-0.96.ebuild deleted file mode 100644 index b70c8d6732ac..000000000000 --- a/app-portage/portage-utils/portage-utils-0.96.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Small and fast Portage helper tools written in C" -HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"; - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 autotools - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"; -else - SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="openmp +qmanifest +qtegrity static" - -RDEPEND=" - qmanifest? ( - !static? ( - app-crypt/gpgme:= - app-crypt/libb2:= - dev-libs/openssl:= - sys-libs/zlib:= - ) - ) - qtegrity? ( - !static? ( - dev-libs/openssl:= - ) - )" -DEPEND="${RDEPEND} - qmanifest? ( - static? ( - app-crypt/gpgme[static-libs] - app-crypt/libb2[static-libs] - dev-libs/openssl[static-libs] - sys-libs/zlib[static-libs] - ) - ) - qtegrity? ( - static? ( - dev-libs/openssl[static-libs] - ) - )" -BDEPEND="virtual/pkgconfig" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - default - [[ ${PV} == *9999 ]] && eautoreconf -} - -src_configure() { - use static && append-ldflags -static - - econf \ - --disable-maintainer-mode \ - --with-eprefix="${EPREFIX}" \ - $(use_enable qmanifest) \ - $(use_enable qtegrity) \ - $(use_enable openmp) -}
