From d32022e7301aef2b3f52f6b7a3de81c6e03ffcaf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 21 Nov 2022 01:03:25 +0000 Subject: gentoo auto-resync : 21:11:2022 - 01:03:25 --- sys-apps/Manifest.gz | Bin 49296 -> 49295 bytes sys-apps/gptfdisk/Manifest | 1 - sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild | 60 ----- sys-apps/lm-sensors/Manifest | 3 +- sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild | 225 ----------------- sys-apps/lm-sensors/metadata.xml | 2 +- sys-apps/opentmpfiles/Manifest | 9 +- sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild | 44 ---- sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild | 47 ---- sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild | 53 ---- sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild | 47 ---- sys-apps/opentmpfiles/opentmpfiles-0.2-r1.ebuild | 59 +++++ sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild | 54 ---- sys-apps/portage/Manifest | 3 +- ...rtage-3.0.39-implicit-func-decls-no-fatal.patch | 34 +++ sys-apps/portage/portage-3.0.39-r1.ebuild | 274 +++++++++++++++++++++ sys-apps/portage/portage-3.0.39.ebuild | 273 -------------------- 17 files changed, 372 insertions(+), 816 deletions(-) delete mode 100644 sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild delete mode 100644 sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild delete mode 100644 sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild delete mode 100644 sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild delete mode 100644 sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild delete mode 100644 sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild create mode 100644 sys-apps/opentmpfiles/opentmpfiles-0.2-r1.ebuild delete mode 100644 sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild create mode 100644 sys-apps/portage/files/portage-3.0.39-implicit-func-decls-no-fatal.patch create mode 100644 sys-apps/portage/portage-3.0.39-r1.ebuild delete mode 100644 sys-apps/portage/portage-3.0.39.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 989ab92626eb..6fdc949d93d8 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest index 4bed2e8175c9..691120fee94d 100644 --- a/sys-apps/gptfdisk/Manifest +++ b/sys-apps/gptfdisk/Manifest @@ -1,6 +1,5 @@ AUX gptfdisk-1.0.9-libuuid.patch 899 BLAKE2B 534038452a7184945486b8435099adf7f1992c4bb8618a0ed5432c7675eb653374b25417b2b21c8fc2ec0b0860303e054fb0dc71f880941712e6230ddb029358 SHA512 590b6e7c5b16762abffe68767f255414a56f7fbd691a47837a93b288bde5210a3ab4addf93725c313134c48e6d6bc69701ad3742455f48de793412616be51df3 AUX gptfdisk-1.0.9-popt_segv.patch 671 BLAKE2B 1d46905caca1b7a403d1d200f5f0afa89953b86997f834df16002780d4371027bc34988c58b9a67e6b10a8978d4c99e93b2e711cbe00f5c49f3a868f708efc29 SHA512 b559c479dd2d62208b41a4ba3c6e68cf3e3b099d999bb8c2bbe251d77f217ccde28a44de0ca26c86004a6cecc17cf8360a120f3f1dd884ab4616c061110fde60 DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2 -EBUILD gptfdisk-1.0.9-r1.ebuild 1287 BLAKE2B 9a46d6625eb48a72b7e4882d8ff08d5a8525f7cd9884e2b5ecaa43c13e4295a9570894d857b1b2dc5cdc3a8128de2d3439a216b0e35c1b8c08e02c297cb07713 SHA512 2083c0cf8325732699c6703545089768934f1221fc5ec93b4996e1c973a9fe6c113aef9665a2b7942d0ecefe4c907dfe3a40c04b6cec720a1ec41235c89df5d3 EBUILD gptfdisk-1.0.9-r2.ebuild 1357 BLAKE2B 8b73d06400b1a397406e08e6db3468371e6d296b69e87cfe46bea1b0e87bb3fd36b5f00d9f0046c6d8e3b06066ea07896b6f7b4514f993d69175b81c4195d232 SHA512 4acca94ff060c2caade027f29d817e76662037d23284c1d830cbbea9d5eb7c54eddc4a3fff9d9c389cc3c8720e47afd577da810577d2fd76fd73ffc172fd451d MISC metadata.xml 324 BLAKE2B 71325b739cb7e216be64dfff099ebf3a3f24d8a714ce59838780b6944a65f7d9abdb9b0afb43c617364071778768a7d90da9ef8c7eb4c3bc0cd6b5dc9e04c773 SHA512 ad7457ef87228bef7db385c72bee2c9cf1f913cf261641582a57e4b72c05e7106ad39092c55e2aae1e4d92f86a0bf6f4537dd7de9fdd6e1dc64677b36df4a273 diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild deleted file mode 100644 index de190d603dca..000000000000 --- a/sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild +++ /dev/null @@ -1,60 +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="GPT partition table manipulator for Linux" -HOMEPAGE="https://www.rodsbooks.com/gdisk/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="ncurses static" - -# libuuid from util-linux is required. -RDEPEND="!static? ( - dev-libs/popt - ncurses? ( sys-libs/ncurses:=[unicode(+)] ) - kernel_linux? ( sys-apps/util-linux ) - )" -DEPEND=" - ${RDEPEND} - static? ( - dev-libs/popt[static-libs(+)] - ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] ) - kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) - ) - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${P}-libuuid.patch" #844073 -) - -src_prepare() { - default - - tc-export CXX PKG_CONFIG - - if ! use ncurses ; then - sed -i \ - -e '/^all:/s: cgdisk::' \ - Makefile || die - fi - - sed \ - -e '/g++/s:=:?=:g' \ - -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \ - -i Makefile || die - - use static && append-ldflags -static -} - -src_install() { - dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts - doman *.8 - dodoc NEWS README -} diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest index 207805daac66..3e266435aa7e 100644 --- a/sys-apps/lm-sensors/Manifest +++ b/sys-apps/lm-sensors/Manifest @@ -11,5 +11,4 @@ AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c2 AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf EBUILD lm-sensors-3.6.0-r1.ebuild 6631 BLAKE2B 47bba130b68983116d360b2bb923d6879a2a399a41fd6d16dd8b6342b94e3667d23cd10344386114f3c7bcc048977349620f60b66cc2efdaed442f5c2fc7a575 SHA512 cbdc395ede60495c0342236875b4f89566c1cbb1172e42c8b0f779de288210833a9ff31b4063d479d310ef974b35a23116838faa1e0bf5e043999d9a19eeef73 -EBUILD lm-sensors-3.6.0.ebuild 6672 BLAKE2B efecba75234ac2175f71f070cd16b3bed7dbae5e74c91ce78c3999de502155286669651dd8ff3149d83d51190bf672e90a477aba5d528b540e1fe6ef2b2aa3f2 SHA512 2f120c58c561c148ab755b85dc3d1e65c731e1fad666cc39ade50e98fff6de3c0c0ab59cdd57bbd262a47a15ef2095f7d4139c996446288d3ddc6e9d61f7cf7d -MISC metadata.xml 826 BLAKE2B f4bbd7a126d042dc595f2f5f980445ee576f61c589ecd61359b0f68935b92a2483890add6f4b3fbe73d7e43a5e60462cde524c25561df0036d43c95dd36bdc2f SHA512 83e3b7b23643aff17671420de8bb32095e2170d4b80abd4bf5cee4f08a7168475f8779a40a6d35d587f8820a7f6d32eb8c9a83015860bc521064ca157e23782a +MISC metadata.xml 830 BLAKE2B 5d01ec1901a03ca35dacd9c9a032a79cf14f938fbecef2be3dd15e3e32da99b3fa429200ba98fe510b1e1148e58433ef04d4113767a337cf495a394e1c1772ff SHA512 ada6ce9ab911fbd9adb6492961dd3448be5b9a9a05b5c8be8ee64d067cf0eb3994cc473b17391b986b8664659cbfa64dae41c85bfeeddc08351ed22f447e4a3c diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild deleted file mode 100644 index 01d6dec1eb38..000000000000 --- a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit linux-info systemd toolchain-funcs multilib-minimal - -DESCRIPTION="Hardware Monitoring user-space utilities" -HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors" - -if [[ "${PV}" =~ .*_p[[:digit:]]{8}.* ]] ; then - COMMIT="2c8cca3d6cd60121b401734c1a24cfec7daed4fc" - SRC_URI="https://github.com/lm-sensors/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" -else - SRC_URI="https://github.com/lm-sensors/lm-sensors/archive/V$(ver_rs 1- -).tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-$(ver_rs 1- -)" -fi - -LICENSE="GPL-2+ LGPL-2.1" - -# SUBSLOT based on SONAME of libsensors.so -SLOT="0/5.0.0" - -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="contrib sensord static-libs" - -COMMON_DEPS=" - sensord? ( - net-analyzer/rrdtool - virtual/logger - )" - -RDEPEND="${COMMON_DEPS} - dev-lang/perl - !\", \"HWMON_MODULES\" or \"BUS_MODULES\"" - elog " variables from \"/etc/conf.d/lm_modules\" to" - elog " \"/etc/modules-load.d/lm_sensors.conf\" and adjust format." - elog "" - elog " For details see https://wiki.gentoo.org/wiki/Systemd#Automatic_module_loading" - elog "" - elog " Important: Don't forget to migrate your module's argument" - elog " (modules__args variable) if your are not already" - elog " using \"/etc/modprobe.d\" (which is recommended)." - - # Show this elog only once - break - fi - done - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # New installation - - elog "" - elog "Please run \`/usr/sbin/sensors-detect' in order to setup" - elog "\"/etc/modules-load.d/lm_sensors.conf\"." - elog "" - elog "You might want to add lm_sensors to your default runlevel to make" - elog "sure the sensors get initialized on the next startup." - elog "" - elog "Be warned, the probing of hardware in your system performed by" - elog "sensors-detect could freeze your system. Also make sure you read" - elog "the documentation before running ${PN} on IBM ThinkPads." - fi -} diff --git a/sys-apps/lm-sensors/metadata.xml b/sys-apps/lm-sensors/metadata.xml index fb33e5ae278d..3ce355fef10c 100644 --- a/sys-apps/lm-sensors/metadata.xml +++ b/sys-apps/lm-sensors/metadata.xml @@ -22,6 +22,6 @@ - groeck/lm-sensors + lm-sensors/lm-sensors diff --git a/sys-apps/opentmpfiles/Manifest b/sys-apps/opentmpfiles/Manifest index 950728c27df4..0ccf119498cb 100644 --- a/sys-apps/opentmpfiles/Manifest +++ b/sys-apps/opentmpfiles/Manifest @@ -1,10 +1,3 @@ -DIST opentmpfiles-0.1.1.tar.gz 5626 BLAKE2B 2b2d21bae0c8280f31ea1ad35cd857a94b3d377b004f299a84d949567baba4a799b6e2f5eafc85b31f6c593b6751fbbc605b87504ad2dadb193910f65727fbea SHA512 9b8bc74c642c42e4591cc98df096f2d74d14acc5e795f49026b37401c795861ffcdf8d505f6e62980bab1cc4ee2b182668bcd5d4f4cea0984b46662643d6a0d5 -DIST opentmpfiles-0.1.2.tar.gz 5614 BLAKE2B d49485535bc3b92ba7e9a2af511969b1793d94187a2600b3196314bef8de235fe7a640bb2b7f78f51727f94c18556fc27e7996ffccef71ff94e006b9f9a63810 SHA512 d86ba71e5fe96d7a8e1999e14b0b99c78e850c42fbfefd203916edca593d0269feaf2252aa01cc35a838906fc2909015430f72cde8370e2d5b1d478a11fe456d -DIST opentmpfiles-0.1.3.tar.gz 5691 BLAKE2B 56d79f0279a46ed3b4e13f94a7f2c7d494df245a17b8533c48cff357c21db56485bd076e375f3b4e2c9a140a65e8ab472a8a1030bbee0853463f734c316f71e8 SHA512 fd0b10ebfeb621466edadede50ec6e8f415861ab3b14b833c75bd71f7296e9c091e59144d39e1f9efd342b6d97776cade5a692c941085e33e9651fd885da7121 DIST opentmpfiles-0.2.tar.gz 5711 BLAKE2B e1ee7820b2d184d18e63e7e9d93227bb301eb82be8c2b6021c7a1092f55a4ca2bb5dfb7494ff00c3b6debace1963f6c89011ff557f665f0a93c907bd759a4c6f SHA512 bc384cc9156ba6c54d3308ddad4d26b1877f020aa8558e82df2ed49ffa65e0fed5a49eaa11b27193bfe2ad11a4d7368f7cdbc225b820b309af3b299327ddb07b -EBUILD opentmpfiles-0.1.1.ebuild 1019 BLAKE2B c0d93987039c42c1427f7067b0e872826c59c984a7f6137d85f9b1330f92d4af24d269f08a9e9142e9fe03eeba7f94d36bee5308a515a4f011934551d6878fde SHA512 2c300a89bfb02c46a8464d87218e976a694b4261ef0171efd09984994c66c53795f6f4a07c6e58f017aef9d71b8538195c1481032f9f088420931f9aad3eda9b -EBUILD opentmpfiles-0.1.2.ebuild 1116 BLAKE2B 8d96cff81c513ccc21b280365ae18170fa0ca5be7560ad5434b1af6c45356f42d11fea10774a09a6c758de91551681afca3d73068ed670dd46d424c63750185b SHA512 1c6a68a202877c8e02d07549b8d6fc15a9db1d0ff3c18d07c0e3eeb1f4632d393d8d4372044aeff611561376e28b2e4bf86a0901651cf383f84ab340e8d0b7fd -EBUILD opentmpfiles-0.1.3-r1.ebuild 1258 BLAKE2B aefc898a4e5839475cd4fc253c6598f2542f5d64566fa02b30e659647f9a93cb07e9f2bcfc4daabcf509a9e63dca726e25c4101874a4a8a51d9888ccf3eee1ff SHA512 eaf74899b6e924a95376b2f944cc75a330100ad358de698d5655acfae0f61c68192e9e82e8696df2afd631f559847f566ddc9afbb830178e525c4af5da6eb442 -EBUILD opentmpfiles-0.1.3.ebuild 1115 BLAKE2B 3dfa3314c2b71c537e6dcbe13e4ee04142a6af9575e710c5247cbc24edbfc82dea6ffc46d07d744cc3cfd66ca658119f6514a804e42186237214418ef497f97b SHA512 f87649de01c82c0557ef628b70d26be4d7c577de3d7a93d5690015092f3ee450ea32637f8a7acfc01fa21ca4546f3ac75476a21e39b041b4e70876fc0f86d0e9 -EBUILD opentmpfiles-0.2.ebuild 1383 BLAKE2B c234440bd0b2256c7049202c15b11618a93e1054f3e2d8e507e7feabfab9b6db35e7ed8c19447816bd10d543953aefdb2e05d486923aaedb923f2c7d6b679cd5 SHA512 f2a4e8623afc2077aa48b7f443afe464ffd08405d26206515b1ccf8e95e5a596a2ef118f13f8f3784871503b7b2a976b7581ac877042afb4689ed1dde3e15cd7 +EBUILD opentmpfiles-0.2-r1.ebuild 1413 BLAKE2B 23b06c29f9b600317007d56faa148667ffde418f521377aa661fa2f28fa0101d69a01c122d29c0943c404e376d778f0ed2c57ee224c4ebb6cc227b2168dfc2d0 SHA512 55f2798b23c9643e49cc39f43b0031861926f44ac012e958772cf4d8cbdef9e2d9df0cd74b2fd63189fd1845d6f4318cb1d06b913f5e5f1932e54def04c1efd1 MISC metadata.xml 446 BLAKE2B 08d2c0005d37e4d78742c2ad30d4306aa8c06864dae20b23a0f84daacf87c7fccd6bd1baa423a5279e41a3d01796f444ba7ab495daec88a6eee5ededdabc7a16 SHA512 8323232b38eebf3b0714153f1d4fdf877b63391b23dff0fa4c00651e2c3300ec0e8125533b1feadaba54ca9aed92b8812562d87b02ea3c5c3fbabcbb79b1af91 diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild deleted file mode 100644 index a6b86fd844a4..000000000000 --- a/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} = 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/openrc/${PN}" -else - SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz -> - ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -fi - -DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files" -HOMEPAGE="https://github.com/openrc/opentmpfiles" - -LICENSE="BSD-2" -SLOT="0" -IUSE="" - -RDEPEND="! +Date: Sun, 20 Nov 2022 23:32:08 +0000 +Subject: [PATCH] install-qa-check.d/90gcc-warnings: don't make implicit func + decls fatal for now + +We need to do this at some point (as Clang 16 and GCC 14 are doing it, and +they indicate runtime problems anyway), but there's too much breakage for now. + +We did find some extra bugs though. The main issue is too much high-profile +stuff breaks rather than the total number of bugs, wrt Portage behaviour +changing being suitable or not. + +Bug: https://bugs.gentoo.org/870412 +Signed-off-by: Sam James +--- a/bin/install-qa-check.d/90gcc-warnings ++++ b/bin/install-qa-check.d/90gcc-warnings +@@ -153,9 +153,10 @@ gcc_warn_check() { + # always_overflow=yes + #fi + +- if [[ ${f} == *'[-Wimplicit-function-declaration]'* ]] ; then +- implicit_func_decl=yes +- fi ++ # Disabled for now because too many failures. bug #870412. ++ #if [[ ${f} == *'[-Wimplicit-function-declaration]'* ]] ; then ++ # implicit_func_decl=yes ++ #fi + + if [[ ${always_overflow} = yes || ${implicit_func_decl} = yes ]] ; then + eerror + diff --git a/sys-apps/portage/portage-3.0.39-r1.ebuild b/sys-apps/portage/portage-3.0.39-r1.ebuild new file mode 100644 index 000000000000..040a60847373 --- /dev/null +++ b/sys-apps/portage/portage-3.0.39-r1.ebuild @@ -0,0 +1,274 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{8..11} ) +PYTHON_REQ_USE='bzip2(+),threads(+)' +TMPFILES_OPTIONAL=1 + +inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix + +DESCRIPTION="The package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" +SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +SLOT="0" +IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-arch/xz-utils + test? ( dev-vcs/git )" +DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + apidoc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-epytext[${PYTHON_USEDEP}] + )" +# Require sandbox-2.2 for bug #288863. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +# app-portage/gemato goes without PYTHON_USEDEP since we're calling +# the executable. +RDEPEND=" + acct-user/portage + app-arch/zstd + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/findutils-4.4 + !build? ( + >=sys-apps/sed-4.0.5 + >=app-shells/bash-5.0:0[readline] + >=app-admin/eselect-1.2 + rsync-verify? ( + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] + >=sec-keys/openpgp-keys-gentoo-release-20180706 + >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + ) + ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_musl? ( >=sys-apps/sandbox-2.2 ) + kernel_linux? ( sys-apps/util-linux ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + ) ) + !> cnf/make.globals || die + fi + + if use native-extensions && ! tc-is-cross-compiler; then + printf "[build_ext]\nportage_ext_modules=true\n" >> \ + setup.cfg || die + fi + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i lib/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if use build || ! use rsync-verify; then + sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ + -e '/^sync-webrsync-verify-signature/s|yes|no|' \ + -i cnf/repos.conf || die "sed failed" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ + -w "/_BINARY/" lib/portage/const.py + + einfo "Prefixing shebangs ..." + > "${T}/shebangs" || die + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + echo "${REPLY}" >> "${T}/shebangs" || die + fi + done < <(find . -type f -executable ! -name etc-update -print0) + + if [[ -s ${T}/shebangs ]]; then + xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" + fi + + einfo "Adjusting make.globals, repos.conf and etc-update ..." + hprefixify cnf/{make.globals,repos.conf} bin/etc-update + + if use prefix-guest ; then + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + fi + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use apidoc && targets+=( apidoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( + install_docbook + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + use apidoc && targets+=( + install_apidoc + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" + ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + if ! use build; then + python_setup + local sitedir=$(python_get_sitedir) + [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" + env -u DISTDIR \ + -u PORTAGE_OVERRIDE_EPREFIX \ + -u PORTAGE_REPOSITORIES \ + -u PORTDIR \ + -u PORTDIR_OVERLAY \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.default_locations || die + + env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die + + env -u FEATURES -u PORTAGE_REPOSITORIES \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die + fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.3.77"; then + elog "The emerge --autounmask option is now disabled by default, except for" + elog "portions of behavior which are controlled by the --autounmask-use and" + elog "--autounmask-license options. For backward compatibility, previous" + elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." + elog "Users can get the old behavior simply by adding --autounmask to the" + elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" + elog "change, see https://bugs.gentoo.org/658648." + fi +} diff --git a/sys-apps/portage/portage-3.0.39.ebuild b/sys-apps/portage/portage-3.0.39.ebuild deleted file mode 100644 index 48ca5c0728ae..000000000000 --- a/sys-apps/portage/portage-3.0.39.ebuild +++ /dev/null @@ -1,273 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{8..11} ) -PYTHON_REQ_USE='bzip2(+),threads(+)' -TMPFILES_OPTIONAL=1 - -inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix - -DESCRIPTION="The package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" -SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -SLOT="0" -IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-arch/xz-utils - test? ( dev-vcs/git )" -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - apidoc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-epytext[${PYTHON_USEDEP}] - )" -# Require sandbox-2.2 for bug #288863. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -# app-portage/gemato goes without PYTHON_USEDEP since we're calling -# the executable. -RDEPEND=" - acct-user/portage - app-arch/zstd - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/findutils-4.4 - !build? ( - >=sys-apps/sed-4.0.5 - >=app-shells/bash-5.0:0[readline] - >=app-admin/eselect-1.2 - rsync-verify? ( - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] - >=sec-keys/openpgp-keys-gentoo-release-20180706 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - ) - ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - kernel_linux? ( sys-apps/util-linux ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - ) ) - !> cnf/make.globals || die - fi - - if use native-extensions && ! tc-is-cross-compiler; then - printf "[build_ext]\nportage_ext_modules=true\n" >> \ - setup.cfg || die - fi - - if ! use ipc ; then - einfo "Disabling ipc..." - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i lib/_emerge/AbstractEbuildProcess.py || \ - die "failed to patch AbstractEbuildProcess.py" - fi - - if use xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - if use build || ! use rsync-verify; then - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ - -e '/^sync-webrsync-verify-signature/s|yes|no|' \ - -i cnf/repos.conf || die "sed failed" - fi - - if [[ -n ${EPREFIX} ]] ; then - einfo "Setting portage.const.EPREFIX ..." - hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \ - -w "/_BINARY/" lib/portage/const.py - - einfo "Prefixing shebangs ..." - > "${T}/shebangs" || die - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then - echo "${REPLY}" >> "${T}/shebangs" || die - fi - done < <(find . -type f -executable ! -name etc-update -print0) - - if [[ -s ${T}/shebangs ]]; then - xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed" - fi - - einfo "Adjusting make.globals, repos.conf and etc-update ..." - hprefixify cnf/{make.globals,repos.conf} bin/etc-update - - if use prefix-guest ; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi - - einfo "Adding FEATURES=force-prefix to make.globals ..." - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - cd "${S}/cnf" || die - if [ -f "make.conf.example.${ARCH}".diff ]; then - patch make.conf.example "make.conf.example.${ARCH}".diff || \ - die "Failed to patch make.conf.example" - else - eerror "" - eerror "Portage does not have an arch-specific configuration for this arch." - eerror "Please notify the arch maintainer about this issue. Using generic." - eerror "" - fi -} - -python_compile_all() { - local targets=() - use doc && targets+=( docbook ) - use apidoc && targets+=( apidoc ) - - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi -} - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -python_install_all() { - distutils-r1_python_install_all - - local targets=() - use doc && targets+=( - install_docbook - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - use apidoc && targets+=( - install_apidoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - dotmpfiles "${FILESDIR}"/portage-{ccache,tmpdir}.conf - - # Due to distutils/python-exec limitations - # these must be installed to /usr/bin. - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - einfo "Moving admin scripts to the correct directory" - dodir /usr/sbin - for target in ${sbin_relocations}; do - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" - done -} - -pkg_preinst() { - if ! use build; then - python_setup - local sitedir=$(python_get_sitedir) - [[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory" - env -u DISTDIR \ - -u PORTAGE_OVERRIDE_EPREFIX \ - -u PORTAGE_REPOSITORIES \ - -u PORTDIR \ - -u PORTDIR_OVERLAY \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.default_locations || die - - env -u BINPKG_COMPRESS -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die - - env -u FEATURES -u PORTAGE_REPOSITORIES \ - PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ - "${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || die - fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.3.77"; then - elog "The emerge --autounmask option is now disabled by default, except for" - elog "portions of behavior which are controlled by the --autounmask-use and" - elog "--autounmask-license options. For backward compatibility, previous" - elog "behavior of --autounmask=y and --autounmask=n is entirely preserved." - elog "Users can get the old behavior simply by adding --autounmask to the" - elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this" - elog "change, see https://bugs.gentoo.org/658648." - fi -} -- cgit v1.2.3