From da87cdcf372e686d4dd7b09a78c9f30d836050e5 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 29 Aug 2022 10:57:28 +0200 Subject: app-portage/portage-utils: bump-fix + cleanup 0.94.3: fix qmanifest/qtegrity being available again (regression in 0.94.2) 0.93.3: cleanup old Signed-off-by: Fabian Groffen --- app-portage/portage-utils/Manifest | 3 +- .../portage-utils/portage-utils-0.93.3.ebuild | 67 ------------------- .../portage-utils/portage-utils-0.94.2.ebuild | 75 ---------------------- .../portage-utils/portage-utils-0.94.3.ebuild | 75 ++++++++++++++++++++++ 4 files changed, 76 insertions(+), 144 deletions(-) delete mode 100644 app-portage/portage-utils/portage-utils-0.93.3.ebuild delete mode 100644 app-portage/portage-utils/portage-utils-0.94.2.ebuild create mode 100644 app-portage/portage-utils/portage-utils-0.94.3.ebuild (limited to 'app-portage') diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index 3847937d7dcb..6350de83d263 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1,3 +1,2 @@ -DIST portage-utils-0.93.3.tar.xz 1796828 BLAKE2B cfad7ab27ff2d92f631f4e31012e8903c5fa6113485f727338812059379cdd4a9552d80dc3aef6bb91264c361c0554fe9054a12347e274c4c5c3db66fd36008b SHA512 c1245aa78d236263cd266fc8565312c2ac30cb992037a7b0f26da04ecf2dfeebc85bff653784e186cf2c7d7468e4772fb0bd93bcdb3a37d46e493d000933e5a1 DIST portage-utils-0.94.1.tar.xz 1871688 BLAKE2B bec5ddd514b397c157c3b1bff70d61730f15804a6751f56eb69c4030a35fc6a6b11fa1e2bde94332772660f02bf9428623210733ae9e2f1290f29aa3b31a1813 SHA512 29fdb4093997eb95703d407da6b00305c949f0a00ae3aa5cfb2c47b66bddc59e034fae114663b40b611f906332066b648018aa4e5bc1b935e61a64f4b4bf1088 -DIST portage-utils-0.94.2.tar.xz 1804152 BLAKE2B 416e72851744cfe595ff11dc3c39b4b7a2ed243fa59e1b94ba1e94072e8c63382a29256f918af229f4bee0543509108cc7a3f1222a7810e0a9e47a89726cd8e1 SHA512 d4fc9d9cbb9ecca3269c1e4bc192e623e1f671be072bac57b6be0a885fa99344f313644d17533f3c062591d2709d36d88f0370479fb488fd4636b42724b8f15f +DIST portage-utils-0.94.3.tar.xz 1804720 BLAKE2B b0239a26d878db6dd73c9ee54f586526f8812921775126ef74afbe089186fdc5ca7197847e204c6ecbf9d79b6e2a6173cb0c39d4a26653ed0db2d7f9b10e88c5 SHA512 bf8fcccc26bb985bf7664f6ab0227a5251c3f918199de0c4e4c95b7107eb72eee367d1d524b5d9608b3c7eea9b1fae789456390cbb0d375297b807bb98644e01 diff --git a/app-portage/portage-utils/portage-utils-0.93.3.ebuild b/app-portage/portage-utils/portage-utils-0.93.3.ebuild deleted file mode 100644 index 294c81e74145..000000000000 --- a/app-portage/portage-utils/portage-utils-0.93.3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Small and fast Portage helper tools written in C" -HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils" - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls static openmp +qmanifest +qtegrity" - -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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -RDEPEND=" - qmanifest? ( - openmp? ( - || ( - >=sys-devel/gcc-4.2:*[openmp] - sys-devel/clang-runtime:*[openmp] - ) - ) - static? ( - app-crypt/libb2:=[static-libs] - dev-libs/openssl:0=[static-libs] - sys-libs/zlib:=[static-libs] - app-crypt/gpgme:=[static-libs] - ) - !static? ( - app-crypt/libb2:= - dev-libs/openssl:0= - sys-libs/zlib:= - app-crypt/gpgme:= - ) - ) - qtegrity? ( - openmp? ( - || ( - >=sys-devel/gcc-4.2:*[openmp] - sys-devel/clang-runtime:*[openmp] - ) - ) - static? ( - dev-libs/openssl:0=[static-libs] - ) - !static? ( - dev-libs/openssl:0= - ) - ) -" -DEPEND="${RDEPEND}" - -src_configure() { - econf \ - --disable-maintainer-mode \ - --with-eprefix="${EPREFIX}" \ - $(use_enable qmanifest) \ - $(use_enable qtegrity) \ - $(use_enable openmp) \ - $(use_enable static) -} diff --git a/app-portage/portage-utils/portage-utils-0.94.2.ebuild b/app-portage/portage-utils/portage-utils-0.94.2.ebuild deleted file mode 100644 index b07e43f8a485..000000000000 --- a/app-portage/portage-utils/portage-utils-0.94.2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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) -} diff --git a/app-portage/portage-utils/portage-utils-0.94.3.ebuild b/app-portage/portage-utils/portage-utils-0.94.3.ebuild new file mode 100644 index 000000000000..b07e43f8a485 --- /dev/null +++ b/app-portage/portage-utils/portage-utils-0.94.3.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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) +} -- cgit v1.2.3-65-gdbad