[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/binutils-config/
commit: aa2a055a8d6fea50495b1edf62adbb629f8c06f0
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Jun 7 22:29:05 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Jun 7 22:29:05 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=aa2a055a
sys-devel/binutils-config-5.1-r12: drop eutils usage
- don't use epatch, but eapply
- don't rely on eutils for toolchain-funcs inclusion
Signed-off-by: Fabian Groffen gentoo.org>
sys-devel/binutils-config/binutils-config-5.1-r12.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-devel/binutils-config/binutils-config-5.1-r12.ebuild
b/sys-devel/binutils-config/binutils-config-5.1-r12.ebuild
index 38f82d40b5..0fb7ac67f7 100644
--- a/sys-devel/binutils-config/binutils-config-5.1-r12.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.1-r12.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit eutils prefix
+inherit toolchain-funcs prefix
DESCRIPTION="Utility to change the binutils version being used"
HOMEPAGE="https://www.gentoo.org/;
@@ -26,7 +26,7 @@ src_prepare() {
cp "${FILESDIR}"/${PN}-${PV} ./${PN} || die
cp "${FILESDIR}"/ldwrapper.c ./${PN}-ldwrapper-${WRAPPER_REV}.c || die
if use prefix-guest; then
- epatch "${FILESDIR}/${PN}-5-ldwrapper.patch"
+ eapply "${FILESDIR}/${PN}-5-ldwrapper.patch" || die
fi
eprefixify ${PN}
eapply_user
[gentoo-commits] repo/proj/prefix:master commit in: dev-util/dialog/
commit: ac3bfdd295e9eb7e40796a367e75d300565d1571
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Jun 7 22:26:34 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Jun 7 22:26:34 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ac3bfdd2
dev-util/dialog: drop in favour of gx86
Signed-off-by: Fabian Groffen gentoo.org>
dev-util/dialog/Manifest | 1 -
dev-util/dialog/dialog-1.3.20181022.ebuild | 60 --
dev-util/dialog/metadata.xml | 11 --
3 files changed, 72 deletions(-)
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
deleted file mode 100644
index 1eb24922f7..00
--- a/dev-util/dialog/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dialog-1.3-20181022.tgz 531815 BLAKE2B
c6a34010eb991683356338009998964fde60bcae4181d8b07e6d5b9f0d0e9a61d3f0b112fad02c151b1774380e18b87f93f43fdfe35e0fba86914c029eaa274c
SHA512
5d7891086ab6d2f4a815538513b09754a56368bbb0ec3bd107346fd2ed6ae10fa858173447fa609cce28a91e234ed8067d9439efeb973593fff2df1e811a8925
diff --git a/dev-util/dialog/dialog-1.3.20181022.ebuild
b/dev-util/dialog/dialog-1.3.20181022.ebuild
deleted file mode 100644
index 17e088f5e5..00
--- a/dev-util/dialog/dialog-1.3.20181022.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib versionator
-
-DIA_P="${PN}-$(replace_version_separator 2 '-')"
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/;
-SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tgz;
-
-LICENSE="GPL-2"
-SLOT="0/15"
-KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos
~x64-solaris"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND="
- >=sys-libs/ncurses-5.2-r5:=[unicode?]
-"
-DEPEND="
- ${RDEPEND}
- nls? ( dev-build/gettext )
- !minimal? ( sys-devel/libtool )
- !<=sys-freebsd/freebsd-contrib-8.
-"
-S=${WORKDIR}/${DIA_P}
-
-src_prepare() {
- default
- sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
- sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
- # configure searches all over the world for some things...
- sed -i configure \
- -e 's:^test -d "\(/usr\|$prefix\|/usr/local\|/opt\|$HOME\):test
-d "XnoX:' || die
-}
-
-src_configure() {
- # doing this libtool stuff through configure
- # (--with-libtool=/path/to/libtool) strangely breaks the build
- local glibtool="libtool"
- [[ ${CHOST} == *-darwin* ]] && glibtool="glibtool"
- export ac_cv_path_LIBTOOL="$(type -P ${glibtool})"
-
- econf \
- --disable-rpath-hack \
- $(use_enable nls) \
- $(use_with !minimal libtool) \
- --with-libtool-opts=$(usex static-libs '' '-shared') \
- --with-ncurses$(usex unicode w '')
-}
-
-src_install() {
- use minimal && default || emake DESTDIR="${D}" install-full
-
- use examples && dodoc -r samples
-
- dodoc CHANGES README
-
- prune_libtool_files
-}
diff --git a/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml
deleted file mode 100644
index e5fd628b5c..00
--- a/dev-util/dialog/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
-liv...@gentoo.org
-Gentoo LiveCD Project
-
-
-Disable library, install command-line program only
-
-
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: 8c396749be8a540dd25315d5bdc48e764139f819
Author: Fabian Groffen gentoo org>
AuthorDate: Thu May 30 02:15:42 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu May 30 02:15:42 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8c396749
scripts/bootstrap-prefix: bump bootstrap snapshot
This brings in gcc-13.3.0 which helps on macOS Sanoma, but we still
don't get up to success.
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 60f5a24347..051aae6b08 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ bootstrap_tree() {
# retain this comment and the line below to
# keep this snapshot around in the snapshots
# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
- local PV="20240409"
+ local PV="20240529"
# RAP uses the latest gentoo main repo snapshot to bootstrap.
is-rap && LATEST_TREE_YES=1
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: 7032312c7616e5d19a62ada3b0bf594035bc984c
Author: Fabian Groffen gentoo org>
AuthorDate: Tue May 28 03:21:05 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Tue May 28 03:21:05 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7032312c
scripts/bootstrap-prefix: attempt to fix b736fab6 do_emerge_pkgs
Use ROOT, which should be the same between stages, such that we don't
reference tmp/tmp. Thanks huxnu for pointing out.
Bug: https://bugs.gentoo.org/933079
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4d4202945a..60f5a24347 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1785,16 +1785,20 @@ do_emerge_pkgs() {
&& export CFLAGS="${OVERRIDE_CFLAGS}"
[[ -n ${OVERRIDE_CXXFLAGS} ]] \
&& export CXXFLAGS="${OVERRIDE_CXXFLAGS}"
- # In the stage3 bootstrap we always prefer to use tools
that have been built for
- # stage3; to accomplish this we ensure that it is the
first thing evaluated in PATH.
- # Unfortunately, Portage, Python, and Python-exec are
often pulled into the depgraph
- # at some point before we're fully boostrapped. To
ensure that we don't try and execute
- # ${EPREFIX}/usr/bin/emerge before we're ready, always
provide the full path to the
- # bootstrap Python interpreter and emerge script.
+ # In the stage3 bootstrap we always prefer to use tools
that
+ # have been built for stage3; to accomplish this we
ensure
+ # that it is the first thing evaluated in PATH.
+ # Unfortunately, Portage, Python, and Python-exec are
often
+ # pulled into the depgraph at some point before we're
fully
+ # boostrapped. To ensure that we don't try and execute
+ # ${EPREFIX}/usr/bin/emerge before we're ready, always
+ # provide the full path to the bootstrap Python
interpreter
+ # and emerge script.
PORTAGE_SYNC_STALE=0 \
FEATURES="-news ${FEATURES}" \
USE="${myuse[*]}" \
- "${EPREFIX}"/tmp/bin/python
"${EPREFIX}"/tmp/usr/bin/emerge "${eopts[@]}" "${pkg}"
+ "${ROOT}"/tmp/bin/python \
+ "${ROOT}"/tmp/usr/bin/emerge "${eopts[@]}" "${pkg}"
) || return 1
done
}
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: 3e9c4bbd27b03b81c8aafcf9ccabd1c6d0e7078f
Author: Fabian Groffen gentoo org>
AuthorDate: Mon May 27 22:34:31 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Mon May 27 22:36:08 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3e9c4bbd
scripts/bootstrap-prefix: unbreak bootstraps due to silly meson dep
gentoo-functions requires meson nowadays, which cannot be bootstrapped
this early because it requires a Python that the python eclass finds
so work around this by providing a dummy gentoo/functions.sh
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 36
1 file changed, 32 insertions(+), 4 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 92c3ad1869..4d4202945a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1876,10 +1876,29 @@ bootstrap_stage2() {
# see profiles/features/prefix/standalone/profile.bashrc
export BOOTSTRAP_RAP_STAGE2=yes
+ # elt-patches needs gentoo-functions, but gentoo-functions these
+ # days needs meson to install, which requires a properly installed
+ # Python -- at this stage we don't have that
+ # so fake gentoo-functions with some dummies to make elt-patches
+ # and others install
+ if [[ ! -e "${ROOT}"/tmp/lib/gentoo/functions.sh ]] ; then
+ mkdir -p "${ROOT}"/tmp/lib/gentoo
+ cat > "${ROOT}"/tmp/lib/gentoo/functions.sh <<-EOF
+ #!${BASH}
+
+ ewarn() {
+ echo $*
+ }
+
+ eerror() {
+ echo "!!! $*"
+ }
+ EOF
+ fi
+
# Build a basic compiler and portage dependencies in $ROOT/tmp.
pkgs=(
sys-devel/gnuconfig
- sys-apps/gentoo-functions
app-portage/elt-patches
sys-libs/ncurses
sys-libs/readline
@@ -2130,6 +2149,16 @@ bootstrap_stage3() {
read -r -a linker_pkgs <<< "${linker}"
read -r -a compiler_pkgs <<< "${compiler}"
+ # We need gentoo-functions but it meson is still a no-go, because we
+ # don't have a Python. Why would such simple package with a silly
+ # script file need meson is beyond me. So, we have no other way
+ # than to fake it here for the time being like in stage2.
+ if [[ ! -e "${ROOT}"/lib/gentoo/functions.sh ]] ; then
+ mkdir -p "${ROOT}"/lib/gentoo
+ cp "${ROOT}"/tmp/lib/gentoo/functions.sh \
+ "${ROOT}"/lib/gentoo/functions.sh
+ fi
+
if is-rap ; then
# We need ${ROOT}/usr/bin/perl to merge glibc.
if [[ ! -x "${ROOT}"/usr/bin/perl ]]; then
@@ -2166,7 +2195,6 @@ bootstrap_stage3() {
pkgs=(
sys-devel/gnuconfig
sys-apps/baselayout
- sys-apps/gentoo-functions
app-portage/elt-patches
sys-kernel/linux-headers
sys-libs/glibc
@@ -2218,7 +2246,6 @@ bootstrap_stage3() {
else
pkgs=(
sys-devel/gnuconfig
- sys-apps/gentoo-functions
app-portage/elt-patches
app-arch/xz-utils
sys-apps/sed
@@ -2283,7 +2310,7 @@ bootstrap_stage3() {
# now we have a shell right there
unset CONFIG_SHELL
- # Build portage and dependencies.
+ # Build portage dependencies.
pkgs=(
sys-apps/coreutils
sys-apps/findutils
@@ -2306,6 +2333,7 @@ bootstrap_stage3() {
virtual/os-headers
sys-devel/gettext
sys-apps/portage
+ sys-apps/gentoo-functions
)
pre_emerge_pkgs "" "${pkgs[@]}" || return 1
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/
commit: 92c6b019c938960daa3adca2fbbdac2f9c0bf3e5 Author: Fabian Groffen gentoo org> AuthorDate: Tue May 28 14:10:01 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Tue May 28 14:10:46 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c6b019 profiles/prefix/darwin/macos: mask net-dns/c-ares-1.29.0 Fails to compile, unbreak bootstraps by using 1.28.0 Bug: https://bugs.gentoo.org/932809 Signed-off-by: Fabian Groffen gentoo.org> profiles/prefix/darwin/macos/package.mask | 4 1 file changed, 4 insertions(+) diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask index 929018114296..962e14e44ebc 100644 --- a/profiles/prefix/darwin/macos/package.mask +++ b/profiles/prefix/darwin/macos/package.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Fabian Groffen (2024-05-28) +# Fails to compile on any macOS, bug #932809, pending investigation +=net-dns/c-ares-1.29.0 + # Benda Xu (2023-08-20) # Does not play well with linkers under macOS. # Undefined symbols for architecture x86_64:
[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/
commit: e3da80a66251be27fac1adb02b1aec991827fb4d
Author: Fabian Groffen gentoo org>
AuthorDate: Mon May 27 01:24:32 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Mon May 27 01:24:32 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e3da80a6
sys-devel/gcc-13.3.0: fix ld64/xtools detection fix
update for updated checks, fixes compiling on {x64,ppc}-macos
Signed-off-by: Fabian Groffen gentoo.org>
sys-devel/gcc/gcc-13.3.0.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys-devel/gcc/gcc-13.3.0.ebuild b/sys-devel/gcc/gcc-13.3.0.ebuild
index 5004a9daf0..eb8200a374 100644
--- a/sys-devel/gcc/gcc-13.3.0.ebuild
+++ b/sys-devel/gcc/gcc-13.3.0.ebuild
@@ -97,7 +97,8 @@ src_prepare() {
# our ld64 is a slight bit different, so tweak expression to not
# get confused and break the build
- sed -i -e 's/grep ld64/grep :ld64/' gcc/configure || die
+ sed -i -e "s/EGREP 'ld64|dyld'/& | head -n1/" \
+ gcc/configure{.ac,} || die
# rip out specific macos version min
sed -i -e 's/-mmacosx-version-min=11.0//' \
[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/
commit: 3487f88f5f8831f07a5f1ee56b01fadf70f53b96 Author: Fabian Groffen gentoo org> AuthorDate: Sun May 26 15:35:06 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sun May 26 15:35:06 2024 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3487f88f sys-devel/gcc-13.3.0: version bump This should fix compatibility with macOS Sanoma. Compiles and runs on OpenIndiana, macOS Sanoma. Signed-off-by: Fabian Groffen gentoo.org> sys-devel/gcc/Manifest | 5 +- sys-devel/gcc/gcc-13.3.0.ebuild | 174 2 files changed, 177 insertions(+), 2 deletions(-) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index cdd006894a..1b263733fb 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -6,13 +6,14 @@ DIST gcc-12.2-darwin-r0.tar.gz 131069986 BLAKE2B 42de71c9f0802f1a43e675d3fae7341 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 -DIST gcc-13-20240323.tar.xz 84414636 BLAKE2B cd95fc9d83d9e2477597543af5ec4e9ac82029eca6deb8cd8f82b71132e3a54e5a770be201c9e596c48f936a169f60e19979128527f41086a9a12deebbfebb26 SHA512 b25fb0efbe7346f72407ad1102d877f2ed5b40a8bff88018db4541d15cd47a849d7aeb8706be3c2ca6256fc073fe6881c8ba74db220c80b01666195d3be038d4 DIST gcc-13.2-darwin-r0.tar.gz 137958605 BLAKE2B b6777b76baf2dc007c4080c0b7a6d448223747f0cf832e493e3b903b3bdb7f87a0e2e9cf41f9355769b178a72409b1e2866b3e73b1cc33ed0aba837f3a9e66c1 SHA512 a33177bd55d228d1df93e2a029e8af5d215ad8b2ebc84a0c90df629d6f69c5de0ed1ec9dd27bc21a62362522d83bad9a8f34407b89b13321b65f513fa2202dd2 DIST gcc-13.2.0-arm64-darwin.patch 470156 BLAKE2B 5ba9c380d488c1ceda2f4ece68701a51d1de3d82f6aa9c96f33c4f2066e7053356c00158eec524298c16c916ff1d14bb3560eedb90f09bade44970156e86c604 SHA512 4428340c79cad8f4324bb4f5962640805f45e4a2a2be165abb0386e283f863fad9dbff8eefa508ee30ba966691f604fdadfb4d42bc9cc4c29536feaae5c1f55a DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69 -DIST gcc-13.2.0-patches-14.tar.xz 46928 BLAKE2B fce23bc5315f35b04a4976550c4b44578944a1b17e40c7553351eeb8a1ef0f3a2538da5a5e1ae6f37b784ff11bbd8a44b8f6eec542be63e34d984dee69e1cd81 SHA512 d7d52bb2915fd89c06b0134bede8db939cadbb1f2dcddf923bee2c3f9f577ff9e5e986b60420d892539edf82867a0d1bd635807814bc618b06a2b37cdaca893a +DIST gcc-13.2.0-patches-16.tar.xz 44792 BLAKE2B 0b6b584d68e69685638695596b780249ca0119ad362747a82d886fd10f77ceb05d02e033e906a090c67f44b1977f40df6a95206d81a32dd15e2f5413c6c92496 SHA512 324d9e63d16c35d55edde20de049162c01b0d487b4548d06c49f0da04a761ec255bc5e020cc2e7f60d12f5d129768afdcf7c86a59126f71f388ab375c34be6de DIST gcc-13.2.0-patches-7.tar.xz 37064 BLAKE2B 4a8700a8d44bfaa84926f8bfd0da4c5b0c0377f47fc0679456e909f7c9029b9cf1b72c0ba0bc505d9035d5c38e27f7e5b029727eaf2bc7aca417a6be966b2f43 SHA512 f440c97e6782ecb8581d41608e31a648ac426e2d870bc1d171da7794cdeff2fd0546cae0c7214e72fd3a00ead8a5c66f3f633b670b74553a2f3a40378b51f20c DIST gcc-13.2.0.tar.xz 87858592 BLAKE2B 0034b29d3d6cc05821f0c4253ce077805943aff7b370729dd203bda57d89c107edd657eeddc2fb1e69ea15c7b0323b961f46516c7f4af89a3ccf7fea84701be2 SHA512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2 +DIST gcc-13.3.0-arm64-darwin.patch 570896 BLAKE2B 6fcecb4adbf607f06a82b926c4b198a094a136210875320d784f49ac88e940d9b3c110f5b4e43df6751e40cdd90b82d00d461178c520b8692e1be427804b4cad SHA512 6165b6201f4ef94ee254ea40410911f5e5e1a05d80d4da2fce90b3db94000c3d5c5a28c9a4ad1a43387faae68d94fbef8e4d24e1ff049b9c0014c00f6f50757b +DIST gcc-13.3.0.tar.xz 87909952 BLAKE2B 0f3728b026bd8aab0e469dda54facf157a4b753d3405a74b0be6105a6e3a493d26df4007d90ae4e05d86277d41873312638f9589d1757cee80ca84de7f2099e
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/sunos/solaris/
commit: 124c39fd32adfcc558e57e811641aad5da9d7195 Author: Fabian Groffen gentoo org> AuthorDate: Sun May 19 10:51:23 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sun May 19 10:51:23 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124c39fd profiles/solaris/package.mask: mask libarchive-3.7.4 Fails to compile, fixed upstream for next release. Signed-off-by: Fabian Groffen gentoo.org> profiles/prefix/sunos/solaris/package.mask | 6 ++ 1 file changed, 6 insertions(+) diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask index d9757c8bbe3d..1971a00902cf 100644 --- a/profiles/prefix/sunos/solaris/package.mask +++ b/profiles/prefix/sunos/solaris/package.mask @@ -1,6 +1,12 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Fabian Groffen (2024-05-19) +# Fails to compile due to undefined INT_MAX +# https://github.com/libarchive/libarchive/issues/2162 +# https://github.com/libarchive/libarchive/commit/6ff1cd1e487ddf545337b88da3f1f5ca69a2f958 +=app-arch/libarchive-3.7.4 + # Fabian Groffen (2023-06-23) # Fails to link due to missing libintl, already fixed upstream: # https://git.savannah.gnu.org/cgit/tar.git/commit/?id=8632df398b2f548465ebe68b8f494c0d6f8d913d
[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-python/carbon/files/, dev-python/carbon/
commit: 090ed2a4929b22259772d8d9bc0f55d1c5e3ca5a
Author: Fabian Groffen gentoo org>
AuthorDate: Thu May 16 10:45:00 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu May 16 10:45:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=090ed2a4
dev-python/carbon: remove last-rited package
Closes: https://bugs.gentoo.org/929444
Closes: https://bugs.gentoo.org/798312
Closes: https://bugs.gentoo.org/677024
Signed-off-by: Fabian Groffen gentoo.org>
dev-python/carbon/Manifest | 1 -
dev-python/carbon/carbon-1.1.10.ebuild | 61 --
dev-python/carbon/files/carbon.confd | 5 ---
dev-python/carbon/files/carbon.initd2 | 53 -
dev-python/carbon/metadata.xml | 15 -
profiles/package.mask | 6
6 files changed, 141 deletions(-)
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
deleted file mode 100644
index 167ab4cf755d..
--- a/dev-python/carbon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST carbon-1.1.10.tar.gz 77091 BLAKE2B
367beb81a4dcf4c5fff6bf9884c7accb8aea9daa88d6d890bb977c926268b7ae041c9ac8e4b537f07d08d6c970f536ccc87ae6b4caef555883aadeab155fedce
SHA512
a5c8d730e311bb65682c701b79a5e3e02e35eec5c0d923fece3f63d7036ca1f85775100fba9a2090487f2cf75bae7708dae9580deccd8fc586f2820b03e14b4c
diff --git a/dev-python/carbon/carbon-1.1.10.ebuild
b/dev-python/carbon/carbon-1.1.10.ebuild
deleted file mode 100644
index 72cc0318ec8d..
--- a/dev-python/carbon/carbon-1.1.10.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="https://graphiteapp.org/;
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-# whisper appears to have been missed from listing in install_requires in
setup.py
-RDEPEND="
- dev-python/twisted[${PYTHON_USEDEP}]
- dev-python/cachetools[${PYTHON_USEDEP}]
- dev-python/urllib3[${PYTHON_USEDEP}]
- =dev-python/whisper-${PV}*[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
- # Do not install the configuration and data files. We install them
- # somewhere sensible by hand.
- sed -i -e '/data_files=install_files,/d' setup.py || die
- # We want FHS-style paths instead of /opt/graphite
- export GRAPHITE_NO_PREFIX=yes
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /etc/carbon
- doins conf/*
-
- keepdir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
-
- newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
- newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
- newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
-
- newconfd "${FILESDIR}"/carbon.confd carbon-cache
- newconfd "${FILESDIR}"/carbon.confd carbon-relay
- newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
-}
-
-pkg_postinst() {
- einfo 'This ebuild installs carbon into FHS-style paths.'
- einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
- einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
- einfo '(see /etc/carbon/carbon.conf.example).'
- einfo ' '
- einfo 'OpenRC init script supports multiple instances !'
- einfo 'Example to run an instance b of carbon-cache :'
- einfo 'ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
- einfo 'cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
-}
diff --git a/dev-python/carbon/files/carbon.confd
b/dev-python/carbon/files/carbon.confd
deleted file mode 100644
index b1875e134678..
--- a/dev-python/carbon/files/carbon.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Use the given config file
-CARBON_CONFIG="/etc/carbon/carbon.conf"
-
-# Add extra parameters
-CARBON_EXTRA_PARAMETERS=""
diff --git a/dev-python/carbon/files/carbon.initd2
b/dev-python/carbon/files/carbon.initd2
deleted file mode 100644
index ff1509747ef1..
--- a/dev-python/carbon/files/carbon.initd2
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-export GRAPHITE_CONF_DIR=/etc/carbon
-export GRAPHITE_STORAGE_DIR=/var/lib/carbon
-
-INSTANCE=${SVCNAME#*.}
-if [ "${INSTANCE}" = "${SVCNAME}" ]; then
- INSTANCE="a"
-fi
-
-PIDFILE="/var/run/${SVCNAME}.pid"
-PROGRAMNAME=${SVCNAME%%.*}
-
-CARBON_CONFIG=${CARBON_CONFIG:-/etc/carbon/carbon.conf
[gentoo-commits] repo/gentoo:master commit in: dev-python/PySensors/, profiles/
commit: e1472d252eb33b80b521d9156012edd44e4cc69e
Author: Fabian Groffen gentoo org>
AuthorDate: Mon May 13 07:37:07 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Mon May 13 07:37:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1472d25
dev-python/PySensors: remove
Closes: https://bugs.gentoo.org/929495
Signed-off-by: Fabian Groffen gentoo.org>
dev-python/PySensors/Manifest | 1 -
dev-python/PySensors/PySensors-0.0.4-r1.ebuild | 19 ---
dev-python/PySensors/metadata.xml | 15 ---
profiles/package.mask | 5 -
4 files changed, 40 deletions(-)
diff --git a/dev-python/PySensors/Manifest b/dev-python/PySensors/Manifest
deleted file mode 100644
index 60d55530bb28..
--- a/dev-python/PySensors/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PySensors-0.0.4.tar.gz 10599 BLAKE2B
be3a3692a846e5339758eff4f4396dd15bf96b3d20bc40df45436ce58381ac87503bca190fa215121506ecf9ce5175b254d93142ee881c4d5b8ef8e045854659
SHA512
8e6b2beee9bf282f073618c0b45e53330ce82c9fc9c6565a3c6b5f812231421c8c6e15ccc4fc92cda67ed08df5c482577d4a34720c920dbba7604f2b7c3ba21c
diff --git a/dev-python/PySensors/PySensors-0.0.4-r1.ebuild
b/dev-python/PySensors/PySensors-0.0.4-r1.ebuild
deleted file mode 100644
index 954d8809546f..
--- a/dev-python/PySensors/PySensors-0.0.4-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python bindings to libsensors (via ctypes)"
-HOMEPAGE="https://pypi.org/project/PySensors/;
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=sys-apps/lm-sensors-3"
diff --git a/dev-python/PySensors/metadata.xml
b/dev-python/PySensors/metadata.xml
deleted file mode 100644
index 90aa8fd41c4e..
--- a/dev-python/PySensors/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
-grob...@gentoo.org
-Fabian Groffen
-
-
-pyt...@gentoo.org
-Python
-
-
-PySensors
-
-
diff --git a/profiles/package.mask b/profiles/package.mask
index 74bc1ea28a23..ef933ee363b7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -303,11 +303,6 @@ sci-visualization/spectromatic
# Removal on 2024-05-16, bug #929444
dev-python/carbon
-# Fabian Groffen (2024-04-13)
-# Python wrapper around liblmsensors, no reverse dependencies
-# Removal on 2024-05-13, bug #929495
-dev-python/PySensors
-
# Arthur Zamarin (2024-04-12)
# EAPI6. Fails to compile with go versions in tree. Upstream is archived.
# Uses deprecated go eclasses. Maintainer needed, no rev deps.
[gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/
commit: 37de4d46f28853db567ae37632bf99f7c670d1c7
Author: Fabian Groffen gentoo org>
AuthorDate: Sun May 12 19:10:40 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun May 12 19:11:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37de4d46
app-shells/tcsh-6.24.12: fix USE=man #931820
Closes: https://bugs.gentoo.org/931820
Signed-off-by: Fabian Groffen gentoo.org>
app-shells/tcsh/tcsh-6.24.12.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/app-shells/tcsh/tcsh-6.24.12.ebuild
b/app-shells/tcsh/tcsh-6.24.12.ebuild
index 32e21c05882c..dc82102416f2 100644
--- a/app-shells/tcsh/tcsh-6.24.12.ebuild
+++ b/app-shells/tcsh/tcsh-6.24.12.ebuild
@@ -94,9 +94,8 @@ src_install() {
DOCS=( FAQ Fixes Ported README.md WishList Y2K )
einstalldocs
- if use man ; then
- mv tcsh.man{,1}
- doman tcsh.man1
+ if ! use man ; then
+ rm -Rf "${ED}"/usr/share/man
fi
insinto /etc
[gentoo-commits] repo/gentoo:master commit in: app-shells/tcsh/
commit: 52993f00b4fbb5e4fdc72680aa60131934ff9086
Author: Fabian Groffen gentoo org>
AuthorDate: Sun May 12 09:09:36 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun May 12 09:09:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52993f00
app-shells/tcsh-6.24.12: version bump
Signed-off-by: Fabian Groffen gentoo.org>
app-shells/tcsh/Manifest | 3 +--
.../{tcsh-6.24.00.ebuild => tcsh-6.24.12.ebuild} | 24 ++
2 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 7ab925c4f9bd..6c952bcdb34b 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,5 +1,4 @@
-DIST tcsh-6.24.00.tar.gz 949411 BLAKE2B
0751707e233fedc2b8a9360f27e8f4a3e030956e97809b0a52ffe0541b6d15b4f7ff2cbd0832743f702757129366a979ecab745342823d9bbb1863c1d024646d
SHA512
0a50332aadd4309a8b1506a4771ac77c5368c4e1952dd719bd01eca15711743983ff13ec7098dbaf565b4293ac0355ff565344991e0d0c0c9ef75237220e7730
DIST tcsh-6.24.01.tar.gz 949438 BLAKE2B
4f3005e98d02aa12cea41405ab7e56cd840ba207d36a657699041b045f537bfbf1c992a20435ee97ea21b4bb25f0d7af532ccd2ef50de8542ca94f914e3f3ca5
SHA512
47425f9bc5ae3df163fe1c9f8a1b1a6c3893b186843d561fb7020c75561587286036cc679212f17fd0f760735d9e01da414e60a69db0ffcb74276f053ea80479
DIST tcsh-6.24.10.tar.gz 956578 BLAKE2B
bf6e5815390ecffa9dbdc31ac08630ebc3e95394092285cc2f5c5cf0bb48c16ccdd195888feb9e3f5cc689c228eed7a99a2edb566be696bf95851c8176ce3c7b
SHA512
74bd17f4d8bb1fb60a2a6904d87e26b7490f0ec571866e62d6e1d35e9da435c888ab14bfa842d7282e8993d366580439b4cc884b08a22e45dc98a36f813094be
+DIST tcsh-6.24.12.tar.gz 957389 BLAKE2B
f093b540d31343d9ab6188649ec70b4695c9f7bce522ed8dc52c9ce8eb8cf0941adb38a198dbf70a9e5bf995641dd70abe8b683b11132daf0b8668b30cac5c87
SHA512
ed139a20a23a51a41f9e5323cb897c683632e2975d38a07a4801cc3568bd2d138d5139f1552ccf400806654d13801cf38cff040d53d63557266a8164c2ad2267
DIST tcsh-gentoo-patches-r1.10.tar.xz 2344 BLAKE2B
82131a926b99734173c2524cddfad69cdfc4653370699da8ebc135bd198a32b0bb290ff93b7a478dcf02c7353a82a2cc4efb0a2e39539d1a74ea9fea1b3f7e2a
SHA512
d9e01c9b162529501b5eaafe031dfe880818129f4d197a07012e698293841269568a19c595453259d784129271c7f7230b6ce326880b06c4c82bb89b8645a3f4
-DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B
58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6
SHA512
9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
diff --git a/app-shells/tcsh/tcsh-6.24.00.ebuild
b/app-shells/tcsh/tcsh-6.24.12.ebuild
similarity index 82%
rename from app-shells/tcsh/tcsh-6.24.00.ebuild
rename to app-shells/tcsh/tcsh-6.24.12.ebuild
index 81194fb4ebd2..32e21c05882c 100644
--- a/app-shells/tcsh/tcsh-6.24.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.24.12.ebuild
@@ -5,19 +5,19 @@ EAPI=7
inherit flag-o-matic autotools prefix
-CONFVER="1.9"
+CONFVER="1.10"
DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
HOMEPAGE="https://www.tcsh.org/;
SRC_URI="
ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
ftp://ftp.astron.com/pub/tcsh/old/${P}.tar.gz
-
https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2;
+
https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.xz;
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
-IUSE="nls doc"
+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"
+IUSE="nls man"
RESTRICT="test"
# we need gettext because we run autoconf (AM_ICONV)
@@ -26,14 +26,11 @@ RDEPEND="
virtual/libcrypt:=
virtual/libiconv"
DEPEND="${RDEPEND}
- sys-devel/gettext
- doc? ( dev-lang/perl )"
+ sys-devel/gettext"
CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
PATCHES=(
- "${FILESDIR}"/${PN}-6.23.02-dircolors.patch # bug #120792
- "${FILESDIR}"/${PN}-6.21.04-no-nls.patch
"${FILESDIR}"/${PN}-6.21.00-use-ncurses.patch
)
@@ -94,13 +91,14 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install install.man
- DOCS=( FAQ Fixes NewThings Ported README.md WishList Y2K )
- if use doc ; then
- perl tcsh.man2html tcsh.man || die
- HTML_DOCS=( tcsh.html/*.html )
- fi
+ DOCS=( FAQ Fixes Ported README.md WishList Y2K )
einstalldocs
+ if use man ; then
+ mv tcsh.man{,1}
+ doman tcsh.man1
+ fi
+
insinto /etc
doins \
"${CONFDIR}"/csh.cshrc \
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/hg-git/
commit: ecc442dc0bb76835900a0fc227604e84bd5b72e9
Author: Fabian Groffen gentoo org>
AuthorDate: Sun May 12 08:58:24 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun May 12 08:58:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecc442dc
dev-vcs/hg-git-1.1.1: version bump
Signed-off-by: Fabian Groffen gentoo.org>
dev-vcs/hg-git/Manifest| 2 +-
dev-vcs/hg-git/hg-git-0.10.3.ebuild| 27 --
dev-vcs/hg-git/hg-git-1.0.2-r1.ebuild | 5 ++--
.../{hg-git-1.0.2.ebuild => hg-git-1.1.1.ebuild} | 13 +--
4 files changed, 9 insertions(+), 38 deletions(-)
diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest
index 881a484d9500..7ddba70d6162 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,3 +1,3 @@
DIST 1.0.2-hg65.patch 1697 BLAKE2B
a620b6624eaad4ff233e9cda97d160acc11402e668a7837385bbf3d6384b19106084054e45d0f63dbe686267e636c3bd862a45b09f52ff93bb588ed3439dc69a
SHA512
3ac84637f89b97347cd01c243df9af8b37a8c694fab3e560c8e5fd8baed6e0d695c1cd2cb22580378c57afa01aeee25915ac033444e833d0719bc1defdebc305
-DIST hg-git-0.10.3.tar.bz2 146867 BLAKE2B
cad4103cbb517c7126787fcfd5c6a9d20b814048e8277eddd1f398bb4e040cdf61d1a83ffb1a121ca62c9f038124049864c9d792ec500fd15614e7a1e2c70084
SHA512
61122084d89b62faaabfc93a8b3ef346c1c34ac3a4eea927f3f32a50490ce537333fb9e19452c2a02e172c216095d6a9db83f79d1f3ecb8afc7ae4cd554e0abc
DIST hg-git-1.0.2.tar.bz2 171241 BLAKE2B
fd953178daff4e283cdacfacafd64c40efff73d0e4a175faa4e032bf38ccc1ef04bd715c4f38dd5d83ab1b0f52a1f329d2a1fb95c13ea83311c47786c3738600
SHA512
8df398c059131b4a8f4ab68fde743cfd82b19b3a184ea92f53ac69ba74e0b9cb94366d4a22d595ea44667493f050bd31ee3e9d7632cdb16507c57e156cd611e9
+DIST hg-git-1.1.1.tar.bz2 179321 BLAKE2B
8f6083be5c123d079dec0ca5ae150faa2658b1bd0ca235516fe13c99df19a570f3f6721c2760947a14356aa261568ac61e53000b1be6a5ee806dea3ccf3ff65e
SHA512
fc7f880683f423f2d44342f51325bb522749e33bedc418397bb2f42e46d90fd3b7c949d97ccb6e776bbfc8543bb6ecaef191b271fd7e618612bba5596f6849ef
diff --git a/dev-vcs/hg-git/hg-git-0.10.3.ebuild
b/dev-vcs/hg-git/hg-git-0.10.3.ebuild
deleted file mode 100644
index 6e3f520c2622..
--- a/dev-vcs/hg-git/hg-git-0.10.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_rc/a}
-DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="https://hg-git.github.io https://pypi.org/project/hg-git/;
-SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.bz2;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
-IUSE=""
-
-RDEPEND="
- >=dev-vcs/mercurial-4.3[${PYTHON_USEDEP}]
- >=dev-python/dulwich-0.19.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-vcs/hg-git/hg-git-1.0.2-r1.ebuild
b/dev-vcs/hg-git/hg-git-1.0.2-r1.ebuild
index 6cff7305c62b..e53d2bdf3fc4 100644
--- a/dev-vcs/hg-git/hg-git-1.0.2-r1.ebuild
+++ b/dev-vcs/hg-git/hg-git-1.0.2-r1.ebuild
@@ -12,18 +12,17 @@ DESCRIPTION="push to and pull from a Git repository using
Mercurial"
HOMEPAGE="https://hg-git.github.io https://pypi.org/project/hg-git/;
SRC_URI="https://foss.heptapod.net/mercurial/hg-git/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.bz2
https://foss.heptapod.net/mercurial/hg-git/-/commit/9a52223a95e9821b2f2b544ab5a35e06963da3f1.patch
-> ${MY_PV}-hg65.patch"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
-IUSE=""
RDEPEND="
>=dev-vcs/mercurial-5.2[${PYTHON_USEDEP}]
>=dev-python/dulwich-0.19.3[${PYTHON_USEDEP}]
"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
src_prepare() {
default
diff --git a/dev-vcs/hg-git/hg-git-1.0.2.ebuild
b/dev-vcs/hg-git/hg-git-1.1.1.ebuild
similarity index 67%
rename from dev-vcs/hg-git/hg-git-1.0.2.ebuild
rename to dev-vcs/hg-git/hg-git-1.1.1.ebuild
index edc70f375964..3b13b528170f 100644
--- a/dev-vcs/hg-git/hg-git-1.0.2.ebuild
+++ b/dev-vcs/hg-git/hg-git-1.1.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
@@ -12,14 +12,13 @@ DESCRIPTION="push to and pull from a Git repository using
Mercurial"
HOMEPAGE="https://h
[gentoo-commits] repo/gentoo:master commit in: www-apps/baikal/
commit: 9463c23c4563ece2a22a0c25fc89249354149f1b
Author: Fabian Groffen gentoo org>
AuthorDate: Sat May 11 08:04:38 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat May 11 08:05:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9463c23c
www-apps/baikal-0.9.5: version bump #931579
Closes: https://bugs.gentoo.org/931579
Signed-off-by: Fabian Groffen gentoo.org>
www-apps/baikal/Manifest | 3 +-
www-apps/baikal/baikal-0.8.0.ebuild| 62 --
.../{baikal-0.9.1.ebuild => baikal-0.9.5.ebuild} | 9 +---
3 files changed, 2 insertions(+), 72 deletions(-)
diff --git a/www-apps/baikal/Manifest b/www-apps/baikal/Manifest
index 712f35a19773..82d2098ed889 100644
--- a/www-apps/baikal/Manifest
+++ b/www-apps/baikal/Manifest
@@ -1,3 +1,2 @@
-DIST baikal-0.8.0.zip 3282996 BLAKE2B
102f6ce944804faad1032edaa8cac28f37b278a61de58fd3719e60d26bf9213c2e00965dc48476a1e47ae1710178e6cc494fc9da3af63d3f073ef5abed7d7da1
SHA512
8a43e6a88aaa8eded779db940d970afe9fb37606b9547cbf97d209a7ef54128d1c5f100de917b60362bf131b21f9e82613f482453974635a8e64c798513fd5c6
-DIST baikal-0.9.1.zip 2981404 BLAKE2B
65eecd989f8b903bea35e8a4bf1be83eb322aecc13460370712ddc36420215d3facbc2161069b3c9d451ec74d8f2d336aba4c06f528eac35ebb243fb47cde00d
SHA512
28a08eb701bdd5a752675bdb05a233b77310a8b024ec1452b548be231a610dd17d5871664cf689054657fd849742a9debe0ba0de92272c3ac3f2568c49d8af70
DIST baikal-0.9.3.zip 2978666 BLAKE2B
f2726560916979766c95af0ff63cb1cbd5bb677f377ea20e41064c0a88725742193341e6a3246f64930c445f425a7026499ed55f1949ee221da553bfec538755
SHA512
bdcd3848ba7c99f94a1f20c9fee48f24bb9e004a325f482d6b5324eff1f0aa2fddd284ff5f9ae6dd0b67455852aa82e434174358c58d76b6009945bc3395768c
+DIST baikal-0.9.5.zip 2828793 BLAKE2B
bd4c2e5887a78da6e1bd94c73452a1df22a68d626572aca728758bd95553c5f79a99d47418909b339a837efff25a12ef8b3e1c041ba32b888224b04e93201206
SHA512
e544ed39047788bf001c81a44eb69a3db30a871253cb6bf12b54d5d476eaadc63d723192d41b67f2cf908a72d4c722def03d853df68b7fd464a4093e08ed0f19
diff --git a/www-apps/baikal/baikal-0.8.0.ebuild
b/www-apps/baikal/baikal-0.8.0.ebuild
deleted file mode 100644
index bcc8eac313f6..
--- a/www-apps/baikal/baikal-0.8.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit webapp
-
-DESCRIPTION="Lightweight CalDAV+CardDAV server"
-HOMEPAGE="https://sabre.io/baikal/;
-SRC_URI="https://github.com/sabre-io/Baikal/releases/download/${PV}/${P}.zip;
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc64"
-IUSE="+mysql sqlite"
-REQUIRED_USE="|| ( mysql sqlite )"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=dev-lang/php-6[ctype,filter,json(+),pdo,session,xml,xmlreader,xmlwriter,mysql?,sqlite?]
- mysql? ( virtual/mysql )
- sqlite? ( dev-db/sqlite )
- virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
- webapp_src_preinst
-
- dodoc *.md
-
- einfo "Installing web files"
- insinto "${MY_HTDOCSDIR}"
- doins -r html/* html/.htaccess Core vendor
-
- einfo "Setting up container for configuration"
- dodir /etc/${PN}
-
- # setup config in /etc
- # we are not allowed to use straight-forward absolute symlink :(
- local root path htdocsdir=${MY_HTDOCSDIR%/}
- while [[ -n ${htdocsdir} ]] ; do
- root+="../"
- htdocsdir=${htdocsdir%/*}
- # trim duplicate slashes
- while [[ ${htdocsdir} == */ ]] ; do
- htdocsdir=${htdocsdir%/}
- done
- done
- dosym ${root%/}/etc/${PN} "${MY_HTDOCSDIR}"/Specific
- dosym ${root%/}/etc/${PN} "${MY_HTDOCSDIR}"/config
- dosym . "${MY_HTDOCSDIR}"/html
-
- webapp_postinst_txt en "${FILESDIR}/postinstall-v0.7-en.txt"
- webapp_src_install
-
- if has_version www-servers/apache ; then
- fowners -R apache:apache /etc/${PN}
- elif has_version www-servers/nginx ; then
- fowners -R nginx:nginx /etc/${PN}
- else
- einfo "/etc/${PN} must be owned by the webserver user for
baikal"
- fi
-}
diff --git a/www-apps/baikal/baikal-0.9.1.ebuild
b/www-apps/baikal/baikal-0.9.5.ebuild
similarity index 85%
rename from www-apps/baikal/baikal-0.9.1.ebuild
rename to www-apps/baikal/baikal-0.9.5.ebuild
index 7d0172732149..7def5f0dd436 100644
--- a/www-apps/baikal/baikal-0.9.1.ebuild
+++ b/www-apps/baikal/baikal-0.9.5.ebuild
@@ -33,6 +33,7 @@ src_install() {
einfo "Setting up container for configuration"
dodir /etc/${PN}
+ fperms o+x /etc/${PN} # allow webserver to read config
# setup config in /etc
[gentoo-commits] repo/proj/prefix:master commit in: eclass/
commit: 65650e5ab378910577341115bc44944cdcde974c
Author: Fabian Groffen gentoo org>
AuthorDate: Wed May 8 15:34:59 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed May 8 15:34:59 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=65650e5a
eclass/python-utils-r1: sync with gx86
Signed-off-by: Fabian Groffen gentoo.org>
eclass/python-utils-r1.eclass | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 5abe526b45..3482919cd9 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -40,7 +40,7 @@ inherit multiprocessing toolchain-funcs
# All supported Python implementations, most preferred last.
_PYTHON_ALL_IMPLS=(
pypy3
- python3_{10..12}
+ python3_{10..13}
)
readonly _PYTHON_ALL_IMPLS
@@ -80,7 +80,7 @@ _python_verify_patterns() {
local impl pattern
for pattern; do
case ${pattern} in
- -[23]|3.[89]|3.1[012])
+ -[23]|3.[89]|3.1[0-3])
continue
;;
esac
@@ -136,7 +136,7 @@ _python_set_impls() {
# please keep them in sync with _PYTHON_ALL_IMPLS
# and _PYTHON_HISTORICAL_IMPLS
case ${i} in
- pypy3|python3_9|python3_1[0-2])
+ pypy3|python3_9|python3_1[0-3])
;;
jython2_7|pypy|pypy1_[89]|pypy2_0|python2_[5-7]|python3_[1-9])
obsolete+=( "${i}" )
@@ -231,7 +231,7 @@ _python_impl_matches() {
[[ ${impl} == python${pattern/./_} || ${impl}
== pypy3 ]] &&
return 0
;;
- 3.8|3.9|3.1[1-2])
+ 3.8|3.9|3.1[1-3])
[[ ${impl} == python${pattern/./_} ]] && return 0
;;
*)
@@ -900,7 +900,7 @@ python_doheader() {
[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is
null).'
local includedir=$(python_get_includedir)
- local d=${includedir#${EPREFIX}}
+ local d=${includedir#${ESYSROOT}}
(
insopts -m 0644
@@ -1102,7 +1102,7 @@ python_fix_shebang() {
if [[ ! ${error} ]]; then
debug-print "${FUNCNAME}: in file ${f#${D%/}}"
debug-print "${FUNCNAME}: rewriting shebang:
${shebang}"
- sed -i -e "1s@${from}@#!${PYTHON}@" "${f}" ||
die
+ sed -i -e
"1s@${from}@#!${EPREFIX}/usr/bin/${EPYTHON}@" "${f}" || die
any_fixed=1
else
eerror "The file has incompatible shebang:"
@@ -1365,6 +1365,9 @@ epytest() {
# override filterwarnings=error, we do not really want -Werror
# for end users, as it tends to fail on new warnings from deps
-Wdefault
+ # however, do error out if the package failed to load
+ # an appropriate async plugin
+ -Werror::pytest.PytestUnhandledCoroutineWarning
# override color output
"--color=${color}"
# count is more precise when we're dealing with a large number
[gentoo-commits] repo/gentoo:master commit in: app-misc/tpipe/
commit: 575b3ee4224c34d49ce87c5ddf67b2e8631038ff
Author: Fabian Groffen gentoo org>
AuthorDate: Tue May 7 06:44:24 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Tue May 7 06:44:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=575b3ee4
app-misc/tpipe-1.6-r2: marked ~{x64,arm64}-macos
Thanks Jonathan Lovelace for testing and reporting.
Closes: https://bugs.gentoo.org/931223
Signed-off-by: Fabian Groffen gentoo.org>
app-misc/tpipe/tpipe-1.6-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/tpipe/tpipe-1.6-r2.ebuild
b/app-misc/tpipe/tpipe-1.6-r2.ebuild
index 8b37b96a2605..144e1e166857 100644
--- a/app-misc/tpipe/tpipe-1.6-r2.ebuild
+++ b/app-misc/tpipe/tpipe-1.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.eurogaran.com/downloads/tpipe/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc x86 ~arm64-macos ~x64-macos"
PATCHES=(
"${FILESDIR}"/${P}-makefile.patch
[gentoo-commits] repo/gentoo:master commit in: app-misc/carbon-c-relay/
commit: cda57a94fbc5629d449c6e558fb3405c4c558ca0 Author: Fabian Groffen gentoo org> AuthorDate: Sun Apr 28 11:55:47 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Apr 28 11:55:47 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cda57a94 app-misc/carbon-c-relay: fixup metadata.xml Signed-off-by: Fabian Groffen gentoo.org> app-misc/carbon-c-relay/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/carbon-c-relay/metadata.xml b/app-misc/carbon-c-relay/metadata.xml index 2cc5368cb4d1..a156277eb8f0 100644 --- a/app-misc/carbon-c-relay/metadata.xml +++ b/app-misc/carbon-c-relay/metadata.xml @@ -5,7 +5,7 @@ grob...@gentoo.org - build and install sendmetric client utility +build and install sendmetric client utility add support for LZ4 compressed transport add support for Snappy compressed transport use dev-libs/libpcre2 as regex implementation
[gentoo-commits] repo/gentoo:master commit in: app-misc/carbon-c-relay/files/, app-misc/carbon-c-relay/
commit: 3910e4bcf80ac61b65e5ec309af43b5a8bd2170c
Author: Fabian Groffen gentoo org>
AuthorDate: Sun Apr 28 11:26:03 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun Apr 28 11:26:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3910e4bc
app-misc/carbon-c-relay-3.8.1: version bump
Signed-off-by: Fabian Groffen gentoo.org>
app-misc/carbon-c-relay/Manifest | 2 +-
.../carbon-c-relay/carbon-c-relay-3.7.3.ebuild | 58 -
...3.7.4-r1.ebuild => carbon-c-relay-3.8.1.ebuild} | 49 --
.../carbon-c-relay/files/carbon-c-relay.initd-r1 | 74 --
app-misc/carbon-c-relay/metadata.xml | 1 +
5 files changed, 30 insertions(+), 154 deletions(-)
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index c39232681687..6e9549419b53 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,2 +1,2 @@
-DIST carbon-c-relay-3.7.3.tar.gz 575680 BLAKE2B
d2d07c7f1ec356a16bb375bd740ffa018a0d256ef1ce97ae0555001411a05e28173c2009f3980b0d711977068392b5a0baca68f9dda3a677c7c3d245cad70a0e
SHA512
ba3e4b7173abe5e3b018413a8d46d91c3f433e785dcf3d7643836b91f9a6ff993b22c3db51192476c75d45486d1e2541ad73056671b4bdbfd1447dcfc3f26ff3
DIST carbon-c-relay-3.7.4.tar.gz 584098 BLAKE2B
27fe6d7b785129aa6edd81e0a92880eee3530249900662e63f1ad7a9c1b4c8f9ff98635989311de964e4c42d4bb98f3ce1956ed170b8eceeea558ec3c191f45e
SHA512
a9bcaa699e071e57e0a9092b97d1ead6781af4e00ef19f289a986c5baf56dec2c747961dfc2622285de034c17ce7ed2f5a7c856d617b26488dbdea58c4d72754
+DIST carbon-c-relay-3.8.1.tar.gz 465489 BLAKE2B
984bc330e0188cd403461c44388e8166840eeafc6f76cefd3f13da617ef9026ee7638367522d046b7f7df268aecaa088603be98a7f5650cce7759b00193d52d0
SHA512
fd59bf8af91a606e03e80c7ab7c8819d6040e2f8057bd66c6fcdacc526e5ba41479b19393919d89712af78a5050dd61db378b9620a880e7cec6b5c9b19e10ff5
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.7.3.ebuild
b/app-misc/carbon-c-relay/carbon-c-relay-3.7.3.ebuild
deleted file mode 100644
index 4e3fbd702416..
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.7.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
-HOMEPAGE="https://github.com/grobian/carbon-c-relay;
-SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x64-solaris"
-IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
-
-# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
-# unforunately pcre is in global USE, so we have to exclude that here
-REQUIRED_USE="
- pcre2? ( !oniguruma )
- oniguruma? ( !pcre2 )
-"
-RDEPEND="lz4? ( app-arch/lz4 )
- snappy? ( app-arch/snappy )
- zlib? ( app-arch/gzip )
- ssl? ( dev-libs/openssl:0= )
- !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
- pcre2? ( dev-libs/libpcre2 )
- oniguruma? ( dev-libs/oniguruma )
- acct-group/carbon
- acct-user/carbon"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local pcrecfg
- if use !pcre2 && use !oniguruma ; then
- pcrecfg=$(use_with pcre)
- else
- pcrecfg="--without-pcre"
- fi
-
- econf $(use_with lz4) $(use_with snappy) \
- $(use_with ssl) $(use_with zlib gzip) \
- "${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
-}
-
-src_install() {
- default
-
- # rename too generic name
- mv "${ED}"/usr/bin/{relay,${PN}} || die
-
- # remove libfaketime, necessary for testing only
- rm -f "${ED}"/usr/$(get_libdir)/libfaketime.*
-
- dodoc ChangeLog.md
-
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-}
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild
b/app-misc/carbon-c-relay/carbon-c-relay-3.8.1.ebuild
similarity index 54%
rename from app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild
rename to app-misc/carbon-c-relay/carbon-c-relay-3.8.1.ebuild
index 3282c5737a7d..17b4a10ca21f 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.7.4-r1.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.8.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
HOMEPAGE="https://github.com/grobian/carbon-c-relay;
@@ -10,36 +10,44 @@
SRC_URI="https://githu
[gentoo-commits] repo/gentoo:master commit in: app-portage/portage-utils/
commit: 8616ac9fa23c6cfb013673c339832fc07b39d6df
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Apr 20 13:42:22 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Apr 20 13:43:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8616ac9f
app-portage/portage-utils-0.97: version bump
This release no longer requires OpenSSL and fixes a bunch of ASAN
issues.
Signed-off-by: Fabian Groffen gentoo.org>
app-portage/portage-utils/Manifest | 1 +
...utils-.ebuild => portage-utils-0.97.ebuild} | 26 --
.../portage-utils/portage-utils-.ebuild| 26 --
3 files changed, 19 insertions(+), 34 deletions(-)
diff --git a/app-portage/portage-utils/Manifest
b/app-portage/portage-utils/Manifest
index 8fe52687a1b1..bbb5571ae09c 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,3 +1,4 @@
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
+DIST portage-utils-0.97.tar.xz 1861616 BLAKE2B
bdb4c6c1260a00304fb2c659629e0ddd4ca0378b1a060ea8b1f02ecb6060b4101c6e8984a6befd8b831a2b415fcdc5a51b6dac2fb203b36585f4a7d389ea0913
SHA512
f0f9ecf87df6e08b7f7dbdfe758c1a585a6836478d3adbcecdc2e33c9cfd78a5a10ae3090f0aa5ad0fa8a1eff88bf9e512d861b46bc77e5a536b46a3b36cd466
diff --git a/app-portage/portage-utils/portage-utils-.ebuild
b/app-portage/portage-utils/portage-utils-0.97.ebuild
similarity index 77%
copy from app-portage/portage-utils/portage-utils-.ebuild
copy to app-portage/portage-utils/portage-utils-0.97.ebuild
index 31ad40ade17a..64f18b80703d 100644
--- a/app-portage/portage-utils/portage-utils-.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.97.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="openmp +qmanifest +qtegrity static"
+IUSE="openmp +qmanifest static"
RDEPEND="
openmp? ( || (
@@ -29,33 +29,26 @@ RDEPEND="
!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"
-# bug #898362, gnulib check explicitly looks for MIN in some headers
-QA_CONFIG_IMPL_DECL_SKIP="MIN"
+# bug #898362, gnulib explicit checks
+QA_CONFIG_IMPL_DECL_SKIP=(
+ "MIN"
+ "unreachable"
+ "alignof"
+ "static_assert"
+)
pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -73,6 +66,5 @@ src_configure() {
--disable-maintainer-mode \
--with-eprefix="${EPREFIX}" \
$(use_enable qmanifest) \
- $(use_enable qtegrity) \
$(use_enable openmp)
}
diff --git a/app-portage/portage-utils/portage-utils-.ebuild
b/app-portage/portage-utils/portage-utils-.ebuild
index 31ad40ade17a..64f18b80703d 100644
--- a/app-portage/portage-utils/portage-utils-.ebuild
+++ b/app-portage/portage-utils/portage-utils-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General P
[gentoo-commits] proj/portage-utils: New tag: v0.97
commit: Commit: Fabian Groffen gentoo org> CommitDate: Sat Apr 20 13:05:13 2024 + New tag: v0.97
[gentoo-commits] proj/portage-utils:master commit in: /
commit: 9cee7e77de1fb0d4d685c650e1643f2835d98dfe Author: Fabian Groffen gentoo org> AuthorDate: Sat Apr 20 12:56:02 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sat Apr 20 12:56:02 2024 + URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=9cee7e77 autogen: autoconf-archive was moved from sys-devel to dev-build Signed-off-by: Fabian Groffen gentoo.org> autogen.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index dc41d69..0c9a8c9 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,8 +9,8 @@ if ! qlist -qI dev-libs/gnulib > /dev/null ; then echo "please install dev-libs/gnulib" exit 1 fi -if ! qlist -qI sys-devel/autoconf-archive > /dev/null ; then - echo "please install sys-devel/autoconf-archive" +if ! qlist -qI dev-build/autoconf-archive > /dev/null ; then + echo "please install dev-build/autoconf-archive" exit 1 fi
[gentoo-commits] proj/portage-utils: Tag deleted: v0.97
commit: Commit: Fabian Groffen gentoo org> CommitDate: Sat Apr 20 12:57:08 2024 + Tag deleted: v0.97
[gentoo-commits] proj/portage-utils: New tag: v0.97
commit: Commit: Fabian Groffen gentoo org> CommitDate: Sat Apr 20 12:52:52 2024 + New tag: v0.97
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 9fb2039405aef2dd162c7fdc06b3bcfbd5653fbd Author: Fabian Groffen gentoo org> AuthorDate: Tue Apr 16 09:28:44 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Tue Apr 16 09:29:09 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb20394 profiles/package.mask: last-rite dev-python/carbon Bug: https://bugs.gentoo.org/929444 Signed-off-by: Fabian Groffen gentoo.org> profiles/package.mask | 6 ++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index c3ed28dbe377..14b0c6a61244 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,12 @@ #--- END OF EXAMPLES --- +# Fabian Groffen (2024-04-16) +# Official latest Python support 3.8, replacement app-metrics/go-carbon +# is more performant and designed to be a drop-in replacement. +# Removal on 2024-05-16, bug #929444 +dev-python/carbon + # Matthew Smith (2024-04-15) # Unexpected ABI break, bug #930039 =dev-libs/tree-sitter-0.22.4
[gentoo-commits] repo/gentoo:master commit in: dev-util/uncrustify/
commit: 0073815df1e11ae28ebf48f8f3ee8cd6f4c7ca14
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Apr 13 12:47:49 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Apr 13 12:48:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0073815d
dev-util/uncrustify: fix homepage, tested Python 3.12 with 0.78.1
Bug: https://bugs.gentoo.org/929557
Signed-off-by: Fabian Groffen gentoo.org>
dev-util/uncrustify/uncrustify-0.76.0.ebuild | 4 ++--
dev-util/uncrustify/uncrustify-0.78.1.ebuild | 6 +++---
dev-util/uncrustify/uncrustify-.ebuild | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-util/uncrustify/uncrustify-0.76.0.ebuild
b/dev-util/uncrustify/uncrustify-0.76.0.ebuild
index ab255d602451..0041f4754279 100644
--- a/dev-util/uncrustify/uncrustify-0.76.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.76.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,7 +17,7 @@ PYTHON_COMPAT=( python3_{9..11} )
inherit cmake python-any-r1 ${scm_eclass}
DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/;
+HOMEPAGE="https://uncrustify.sourceforge.net/;
LICENSE="GPL-2"
SLOT="0"
diff --git a/dev-util/uncrustify/uncrustify-0.78.1.ebuild
b/dev-util/uncrustify/uncrustify-0.78.1.ebuild
index 5b681b1ddc92..812dd3d459d2 100644
--- a/dev-util/uncrustify/uncrustify-0.78.1.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.78.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,12 +12,12 @@ else
S=${WORKDIR}/${PN}-${P}
fi
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
inherit cmake python-any-r1 ${scm_eclass}
DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/;
+HOMEPAGE="https://uncrustify.sourceforge.net/;
LICENSE="GPL-2"
SLOT="0"
diff --git a/dev-util/uncrustify/uncrustify-.ebuild
b/dev-util/uncrustify/uncrustify-.ebuild
index 01cb78302eb6..b831203eb214 100644
--- a/dev-util/uncrustify/uncrustify-.ebuild
+++ b/dev-util/uncrustify/uncrustify-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,12 +14,12 @@ fi
inherit cmake ${scm_eclass}
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
inherit python-any-r1
DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/;
+HOMEPAGE="https://uncrustify.sourceforge.net/;
LICENSE="GPL-2"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 2d1c1a90e23390074263d8ab4b61136e65c9ba39 Author: Fabian Groffen gentoo org> AuthorDate: Sat Apr 13 12:28:44 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sat Apr 13 12:28:44 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d1c1a90 profiles/package.mask: last-rite dev-python/PySensors Bug: https://bugs.gentoo.org/929495 Signed-off-by: Fabian Groffen gentoo.org> profiles/package.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index ab6b823bcfc6..6fc1781ae4e9 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,11 @@ #--- END OF EXAMPLES --- +# Fabian Groffen (2024-04-13) +# Python wrapper around liblmsensors, no reverse dependencies +# Removal on 2024-05-13, bug #929495 +dev-python/PySensors + # Arthur Zamarin (2024-04-12) # EAPI6. Fails to compile with go versions in tree. Upstream is archived. # Uses deprecated go eclasses. Maintainer needed, no rev deps.
[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/
commit: 0cef2e3969e9feeda46d0ca1849df5bc61aaf922
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Apr 11 11:31:09 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Apr 11 11:31:09 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0cef2e39
dev-lang/python-3.12.3: bump minor version
Signed-off-by: Fabian Groffen gentoo.org>
dev-lang/python/Manifest | 8
dev-lang/python/{python-3.12.2_p1.ebuild => python-3.12.3.ebuild} | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a4c422c8cc..1f45842d37 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -4,8 +4,8 @@ DIST Python-3.11.3.tar.xz 19906156 BLAKE2B
c23815e09a0012b2af03f3e18471389382978
DIST Python-3.11.3.tar.xz.asc 833 BLAKE2B
1846858480428293047bfaf87a74f5a6cf28227f63dbc36e658ab68444a5b91c2178fca42f35a413591103a0ceeea3cd5f8b757fb2f42cbcad023c62970ab950
SHA512
34bfb6e74e2bbec15bf3f653e32a3d705961b5f724e3f4713cf9b6b530f9c9e7e94f5cf855798bdf9763235b97a60ec9ad554d24cdc793e21a0c39540b5818d8
DIST Python-3.11.7.tar.xz 20074108 BLAKE2B
3414118d30076e4223571825b5c595c5795422244de20dc70d07389a03b2c2b03b98a9ff562a8fd164db8f776dd741a9d7beb1c2ae4087ec6af677619a9dfd80
SHA512
11e06f2ffe1f66888cb5b4e9f607de815294d6863a77eda6ec6d7c724ef158df9f51881f4a956d4a6fa973c2fb6fd031d495e3496e9b0bb53793fb1cc8434c63
DIST Python-3.11.7.tar.xz.asc 833 BLAKE2B
32d6984631d7b4b064e2c2588835a89098842a0ecc3d8ccb893830c9946124a159123e2082e6da3abcdb97d27dde0fb68c1fd11e4ed2bf2e0641fa95191354bb
SHA512
7b342990c6e32897047f8ba33c4d264f1be987b73843b61bd7db08bfa1a7280c616e9dcd96225f37602f876549d011ff82a4d79f1e32a5ab7d7cc22651bba44f
-DIST Python-3.12.2.tar.xz 20591308 BLAKE2B
419186d220d4ae5ca31466771158c8b56f5298b93e81a29993f36711e08b0384e002d891280ca29099ae826919ba99c2d056d468d9d3049a984d58e01d4972c0
SHA512
2ccfae7b9f95d8e15ea85d3f66eea5f6a8fdcaffc0b405095fecb33efc0df50b831c1215542910ced948b54e6de1f7242b0b8b9afc5f89079451c552430d7d9f
-DIST Python-3.12.2.tar.xz.asc 963 BLAKE2B
45bfa01009f4df19d348a1fda722901cb4f0b76eb63fcf1061c2796949b5b2ef301fd0fdf818cd145e41d45e5785e0cfbfab8d98751765741715ee7d1b27f2f8
SHA512
fb477acb49864a662b1586db79e80fd8ebab85d4e5e14acd3bfb5afc3dbe8d6b9bf97eb518dfb77662e27040d400f451ed7575fe1264a6cc0d9feb06e4f2dc84
+DIST Python-3.12.3.tar.xz 20625068 BLAKE2B
fc4f57ae50183db4c8cb37d94c37a7e58da5d031e03866841a678b986f01bbb8afdefb38124ba82b0a4988445b647214be43338dea13b0f063d3c2bf81c48c0b
SHA512
4a2213b108e7f1f1525baa8348e68b2a2336d925e60d0a59f0225fc470768a2c8031edafc0b8243f94dbae18afda335ee5adf2785328c2218fd64cbb439f13a4
+DIST Python-3.12.3.tar.xz.asc 963 BLAKE2B
f9668dde210793f8da0e0bb026b8ec3e0b4bc3abc58e72732f8faf356b19ca88a59b9d89b4b10f77b3602d9a967f0f2f44a0f091d698bc28ba9bad8049e5e006
SHA512
c291ec5b5e4f8deba867cc517624dd9a174745f04061ef737e58f3d52b9b30318264aec350e339fe88ccb493809ca1a90a378e86d86b8ec4a4f578b1a5843624
DIST Python-3.8.8.tar.xz 18271736 BLAKE2B
af0ff1acd919b365a58278e82678324ff884cc8120bcaf12e0e3afb1bd978e6469e256335df131935f51ff481fb83dda04e4b6f1cd1746611f9ec944db73d692
SHA512
64181db5aa48281284a3230436ebfb8cb91b645a9dec956fd48c0048334498477073fc4e14d6b426d0ef7fbcdcfd5d59cbf01a504e6c9014dc9529494b9309fb
DIST Python-3.8.8.tar.xz.asc 833 BLAKE2B
a11188f9f68c518259de1a4e271bf56409d7356a7eb3dd8cbea7bbb0b5bc1b43f9aeb85bda4add65bbae906bef65cb20a30bcc77da04c0d383cd5b527821fd85
SHA512
0e6f11a310c1796dd056d9a4b63b5e03aa8dbd290088966e04a590a78c3887dbfd7a7029a6cf8c5626ecd6ca91c1c16433bb0a41bf1225b02b8db8541b95
DIST Python-3.9.12.tar.xz 19740524 BLAKE2B
05f2469aa53ca36221ef4976b17bfde3e5b86afd5a8114e5a7fd899f975a8e55022555ef718d5352ab68de1b7b23865a0bf713768c9c2b30d591438c9a396d25
SHA512
081981901e14149748fd35228db0b3b1d96fef227ae7404f07b8bad0fda4b02649bf31c348c94aefdaf3327565d78f9489437c2c02f647b15d41376a27a23e97
@@ -15,14 +15,14 @@ DIST Python-3.9.6.tar.xz.asc 833 BLAKE2B
41901bfb80a901f2f14e86769e6d08ded8f7565
DIST python-gentoo-patches-3.10.4.tar.xz 8592 BLAKE2B
67fba3e1fedb17430e5cd93da995b4acaf714db512031b5a2f775a25f793f007941561663cfa413d645ccddc2e22d65d250a40fa166cafda8805488d877ff57d
SHA512
3ed2b8ff8f1eb8febe7dcd4b5d13d6d54468be1d525f8f1118977d3bbc78f690a597b09383939d023b03380a306e4bff1693382e29ff562312d803305b1709b2
DIST python-gentoo-patches-3.11.3.tar.xz 7776 BLAKE2B
78bf26f554c608c68826b9ea3c63a1df2b45bff755860f39f14306ebb63f17f5111b117519c4a9cb30452a62a14a3a7393798b8920c3d108ec8b6a30db88641e
SHA512
64b79c90055fd940590b72ffd3744fe02ab9e46caf7b46f4aa1d074bf3e62d355e128bb2ac68c42f228f2e1bcdee2b0b114d9e2b9bf8427512083c1c5f8680e8
DIST python-gentoo-patches-3.11.7_p1.tar.xz 8364 BLAKE2B
246da406e6d58d85ab2ef79dd3a018a134e473f90d42f8dd9274629f998a6129f3b03da228aa5e65c1b4508a71979ceb1f752a28066c356f813be21c30a4
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: 64a78631d4bf682f8f95f87fe150accfa0d66222
Author: Fabian Groffen gentoo org>
AuthorDate: Wed Apr 10 06:59:22 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed Apr 10 06:59:22 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=64a78631
scripts/bootstrap-prefix: bump snapshot for Darwin Python fix
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 660d32c487..741f6e6cde 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ bootstrap_tree() {
# retain this comment and the line below to
# keep this snapshot around in the snapshots
# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
- local PV="20240407"
+ local PV="20240409"
# RAP uses the latest gentoo main repo snapshot to bootstrap.
is-rap && LATEST_TREE_YES=1
[gentoo-commits] repo/gentoo:master commit in: app-text/atril/
commit: 4fd165f1006870f1d257a5c901ad31694dec0193 Author: Fabian Groffen gentoo org> AuthorDate: Tue Apr 9 19:31:32 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Tue Apr 9 19:31:32 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd165f1 app-text/atril: fix syntax add missing Signed-off-by: Fabian Groffen gentoo.org> app-text/atril/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml index 8ddaf88c17a3..6a86e9c210cb 100644 --- a/app-text/atril/metadata.xml +++ b/app-text/atril/metadata.xml @@ -7,7 +7,7 @@ immolo...@gmail.com - Ian Jordan/name> + Ian Jordan/name> proxy-ma...@gentoo.org
[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/
commit: cb1ae5a724c6b2127e46f36b22526ae461dd85fa Author: Fabian Groffen gentoo org> AuthorDate: Tue Apr 9 14:40:12 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Tue Apr 9 14:40:12 2024 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cb1ae5a7 dev-lang/python-3.12.2_p1: fix manifest for -r2 patchrev Repoman I still miss you sometimes. Signed-off-by: Fabian Groffen gentoo.org> dev-lang/python/Manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 77860cc37a..a4c422c8cc 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -22,7 +22,7 @@ DIST python-gentoo-patches-3.9.6_p1.tar.xz 12764 BLAKE2B 927718f1aadb5d5ef67e647 DIST python-prefix-gentoo-3.10.4-patches-r0.tar.xz 6772 BLAKE2B b807ae02242926d99c3823b73ce33193926d55891d54b5d214b4bdf24d2213b4d7b248030146a01698ceadd255aef8937d84fc11e6d587ffcc91286e81b2 SHA512 a8f16d12b785a4b9ca884e4235cb298e4155273534a7957e517a679f0c2d4b35dcca08e445bed3fe2a80e3a6441f04004eae955a362eb1091ac1f9e2b9a5448f DIST python-prefix-gentoo-3.11.3-patches-r3.tar.xz 5404 BLAKE2B 7c76056854361a4dad879218d2e0f60f874d534ac354c6b47158b5b0de18e5c66a522e717efa8a0a8a0ca3c77dbe5e9297a2ea17b725cb9c7e59478defd951ae SHA512 1bfb1c5e9b53c0b2f5d5fbf112c1742cc91a5cc3f505dc0d8d54683b508063be3578e3e6b8ad617bb0ea0a311b9235d862867ec4e9ca3fbcefcda98613235c72 DIST python-prefix-gentoo-3.11.7-patches-r1.tar.xz 5752 BLAKE2B 8d6ee07491b23d1947af748b0178fd5c81cce78e77e2153480425d38a6b9badeb3b42cd635d340ddf50a451f977f04f498ac25ad1a18250ddae851aac06b9a0d SHA512 c5687c97a41c2e1ed0eacac987a7ea4b38bb8b60b91a16d2ea36ce9aad2f3360d25295951c083386b791b33f18267e545bfcb8280172f878736fef57d7188d0f -DIST python-prefix-gentoo-3.12.2-patches-r0.tar.xz 3232 BLAKE2B 2a9b7cdbc6d95740b96b7beabaf642a0195a6f012aa8cca902fb214bd1e48235b478323a41c9fa1b4117eafa1d9386e97143d6a7504fe1a35a9b601c928791b3 SHA512 5f81cfd7e1ee413d0a3a0c4cae1b7934b799a720cfcc1fb2c885ed42366c81d4bc2df0aad672e8fcb680b68dab67edc8689c55534c0d58118942778244526694 +DIST python-prefix-gentoo-3.12.2-patches-r2.tar.xz 3468 BLAKE2B 58417ddd0038693e6cde05c09d75d80d216b352f70085a2e733f8f16a4e1a98e30b65737b9d48d75d87c4c4768458634959605cd41c651a84aa0f908858fe478 SHA512 8229d6b213c3a35337155d67883493654ccdf22bf66b842f3a9e369b4b5f0a2dabdd391bf1616c3b35c4d45e19a78366091168837924d1484115d272f39e4175 DIST python-prefix-gentoo-3.8.7-patches-r2.tar.xz 8312 BLAKE2B 268f3cff62dc51d4f91994c3f6b05cea0e29edb1ccf39476ba52485fb94c3cad72b54ed5cd941c227bdad004a7ae0069d60ee6bbde5a30d16115263d0dc2a5c3 SHA512 e43ce1e9e851bebce968ee025f765fc9a558c8edc4ee2d51616043183fd12301ab3d5c7f92915238e53b5cf92f6c00617ab0fcf9859d4cebe0966271e6f64725 DIST python-prefix-gentoo-3.9.12-patches-r1.tar.xz 7124 BLAKE2B afff1a574e13515084b0bee3aee1d0f0796ed885451086485f54f3c9a2498de6b4f403fdec1fe7fc5718a45fd89773720a4ef24d700b494337665b3f6d74e2de SHA512 4a12e8be1b38217d66e4a6374e09f93f956fdf4970130edcea2fedd6989c9a1af309fa939c213f8645676401c6d10b5e8789dbe902de9c03b8ea2b57c1632b72 DIST python-prefix-gentoo-3.9.6_p1-patches-r0.tar.xz 6984 BLAKE2B 8b032d3000fd2dfcb8e099ac071c1a911ba2a0e30343788f7191043800f9d0088307cd7007b2b3f6cc7d2f315fc22bbac5990fed81f0dd8d60dca0314bd59b88 SHA512 76c56895c99ee203bd266f475766d2572659939abaf478932e7c9c65ddc52cb5e012e23c9455dd0a4bf0281a07c70e23a2fea8337c693b8a4ac8abb534e21982
[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/
commit: f315aa88f9f4bc77265e807ec67caf31980e490a
Author: Fabian Groffen gentoo org>
AuthorDate: Tue Apr 9 11:01:53 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Tue Apr 9 11:01:53 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f315aa88
dev-lang/python-3.12.2_p1: bump patchset for Darwin buildfix
Fix linking against ncursesw because that's the lib that contains the
symbols discovered when using -I.../ncursesw
Signed-off-by: Fabian Groffen gentoo.org>
dev-lang/python/python-3.12.2_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/python/python-3.12.2_p1.ebuild
b/dev-lang/python/python-3.12.2_p1.ebuild
index 01e1834a66..5e102d4de2 100644
--- a/dev-lang/python/python-3.12.2_p1.ebuild
+++ b/dev-lang/python/python-3.12.2_p1.ebuild
@@ -11,7 +11,7 @@ MY_PV=${PV/_rc/rc}
MY_P="Python-${MY_PV%_p*}"
PYVER=$(ver_cut 1-2)
PATCHSET="python-gentoo-patches-${MY_PV}"
-PREFIX_PATCHSET="python-prefix-gentoo-${MY_PV%_p*}-patches-r0"
+PREFIX_PATCHSET="python-prefix-gentoo-${MY_PV%_p*}-patches-r2"
DESCRIPTION="An interpreted, interactive, object-oriented programming language"
HOMEPAGE="
[gentoo-commits] proj/portage-utils:master commit in: libq/
commit: 9594126239e0d21b88c3b8c535b6635b4a8b8892
Author: Boris Staletic protonmail com>
AuthorDate: Fri Mar 29 17:30:05 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Mon Apr 8 19:26:59 2024 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=95941262
libq/xarray: Handle NULL arrays in xarraysort()
Some invocations of `q` may try to call `xarraysort(NULL, 0)`.
One example is `qlop -a foo` where `foo` was never unmerged.
Instead of requiring every call of `xarraysort()` to take care of `NULL`
arguments, `xarraysort()` now exits early if `arr->eles == NULL`.
Closes: https://github.com/gentoo/portage-utils/pull/28
Signed-off-by: Boris Staletic protonmail.com>
Signed-off-by: Fabian Groffen gentoo.org>
libq/xarray.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libq/xarray.c b/libq/xarray.c
index 49b478b..3251a12 100644
--- a/libq/xarray.c
+++ b/libq/xarray.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2019 Gentoo Foundation
+ * Copyright 2003-2024 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2003-2007 Ned Ludd-
@@ -46,7 +46,8 @@ void *xarraypush(array_t *arr, const void *ele, size_t
ele_len)
void xarraysort(array_t *arr, int (*compar)(const void *, const void *))
{
- qsort(arr->eles, arr->num, sizeof(void *), compar);
+ if (arr->num > 1)
+ qsort(arr->eles, arr->num, sizeof(void *), compar);
}
void xarraydelete_ptr(array_t *arr, size_t elem)
[gentoo-commits] proj/portage-utils:master commit in: tests/rmspace/
commit: 80468f8d60b0761e9e993d245c7c2e9a40815437
Author: Boris Staletic protonmail com>
AuthorDate: Fri Mar 29 17:26:56 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Mon Apr 8 09:16:36 2024 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=80468f8d
tests: Avoid buffer underflow when checking rmspace result
`s[len - 1]` is not allowed for strings whose length is 0.
Caught by clang's UBSAN.
PR: https://github.com/gentoo/portage-utils/pull/28
Signed-off-by: Fabian Groffen gentoo.org>
tests/rmspace/test.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/rmspace/test.c b/tests/rmspace/test.c
index aac4fd9..843cccb 100644
--- a/tests/rmspace/test.c
+++ b/tests/rmspace/test.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2019 Gentoo Foundation
+ * Copyright 2005-2024 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2005-2008 Ned Ludd-
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
for (i = 1; i < argc; ++i) {
s = rmspace(argv[i]);
len = strlen(s);
- if (isspace(s[0]) || isspace(s[len - 1])) {
+ if (isspace(s[0]) || (len && isspace(s[len - 1]))) {
fprintf(stderr, "FAIL {%s}\n", s);
return 1;
}
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: 441669168f51b3b6efc403fa69f66afec6fbf86c
Author: Fabian Groffen gentoo org>
AuthorDate: Mon Apr 8 08:20:54 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Mon Apr 8 08:20:54 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=44166916
scripts/bootstrap-prefix: bump bootstrap snapshot
fix upstream distfile change for darwin-miscutils
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index f27be96a45..660d32c487 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ bootstrap_tree() {
# retain this comment and the line below to
# keep this snapshot around in the snapshots
# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
- local PV="20240406"
+ local PV="20240407"
# RAP uses the latest gentoo main repo snapshot to bootstrap.
is-rap && LATEST_TREE_YES=1
[gentoo-commits] repo/gentoo:master commit in: sys-apps/darwin-miscutils/
commit: c4c6fd53513500abf68cf0e68733d6b4471ebd2e Author: Fabian Groffen gentoo org> AuthorDate: Sun Apr 7 10:33:29 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Apr 7 10:34:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4c6fd53 app-misc/darwin-miscutils: drop upstream refs for no longer used dists Signed-off-by: Fabian Groffen gentoo.org> sys-apps/darwin-miscutils/metadata.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys-apps/darwin-miscutils/metadata.xml b/sys-apps/darwin-miscutils/metadata.xml index a872132ae25a..e511bd3af00b 100644 --- a/sys-apps/darwin-miscutils/metadata.xml +++ b/sys-apps/darwin-miscutils/metadata.xml @@ -7,8 +7,6 @@ apple-oss-distributions/adv_cmds - apple-oss-distributions/misc_cmds - apple-oss-distributions/shell_cmds apple-oss-distributions/developer_cmds
[gentoo-commits] repo/gentoo:master commit in: sys-apps/darwin-miscutils/
commit: 7c8790630d1e837dd3ab6ba87ffda2d76f77a90a Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Apr 7 09:18:50 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Apr 7 10:30:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c879063 sys-apps/darwin-miscutils: add missing remote-id Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Fabian Groffen gentoo.org> sys-apps/darwin-miscutils/metadata.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/sys-apps/darwin-miscutils/metadata.xml b/sys-apps/darwin-miscutils/metadata.xml index 232d18dd1fa2..a872132ae25a 100644 --- a/sys-apps/darwin-miscutils/metadata.xml +++ b/sys-apps/darwin-miscutils/metadata.xml @@ -5,4 +5,10 @@ pre...@gentoo.org Gentoo Prefix + + apple-oss-distributions/adv_cmds + apple-oss-distributions/misc_cmds + apple-oss-distributions/shell_cmds + apple-oss-distributions/developer_cmds +
[gentoo-commits] repo/gentoo:master commit in: sys-apps/darwin-miscutils/files/, sys-apps/darwin-miscutils/
commit: 0b459be146d2d379af518b7e8d02a9e0ecff6c50
Author: Fabian Groffen gentoo org>
AuthorDate: Sun Apr 7 10:29:27 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun Apr 7 10:30:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b459be1
app-misc/darwin-miscutils-12-r1: big cleanup
Remove most tools that are nowadays obsolete compared to host versions
and not really necessary either.
Patch md so we can have silent compilation with compilers from this era.
Signed-off-by: Fabian Groffen gentoo.org>
sys-apps/darwin-miscutils/Manifest | 4 +-
.../darwin-miscutils/darwin-miscutils-12-r1.ebuild | 96 ++---
.../darwin-miscutils/darwin-miscutils-12.ebuild| 157 --
.../files/darwin-miscutils-12-md-modern-c.patch| 235 +
.../files/darwin-miscutils-12-md-register.patch| 14 --
.../files/darwin-miscutils-6-w64.patch | 17 --
6 files changed, 256 insertions(+), 267 deletions(-)
diff --git a/sys-apps/darwin-miscutils/Manifest
b/sys-apps/darwin-miscutils/Manifest
index 3696e7f13dba..f2902a6d8de1 100644
--- a/sys-apps/darwin-miscutils/Manifest
+++ b/sys-apps/darwin-miscutils/Manifest
@@ -1,6 +1,4 @@
DIST adv_cmds-md-147-compile.patch 5423 BLAKE2B
f548fcecb81fd8e628bcb384f537e572095b8210612c0748017f033e7bb6f9c5b1bd2c544fec23e8002a2ac7b99d840c85a8ca6faadac3b4da2edb77b459
SHA512
951e981b57e7d3d6ef51d638759559581dd4995ce66ec17bb2658f8a298683feb0842d10fd834b713ec39b2a0f671df56049b876d55f17bf1e988d76839fead1
DIST adv_cmds-md-147.1 3623 BLAKE2B
18b856770f0490ef241e19cc6f1661f6521bcc7f363bff41fbec548388d8f1e2d9e6aea879064cd3d7e7d16f8e0b2ff17ead990051a068a66f520a5ff504afa3
SHA512
459beb2b7c92b8718c76d744bbabf631bf8c329feb65c9434ce8a023c73ceac2d207c95e39c4b90b095a4724a74096a3d1bed9122883eb54e5311dfc64ffc718
DIST adv_cmds-md-147.c 25945 BLAKE2B
38af9e06e18a15cc74a81464a4c1ecdf98b800eb34f33f6ab6203b60540e693d459805432e51bae1008661aa566830c87357432428f62d8cbea9973b1e5fc59a
SHA512
93e70f7d8697652b5a3c661975d21b51545d2eb07de64fd40524fcf0d5016dae9ae1dc63c4a85cb5ad455c8d1c246b7f5f2eac38226dcefbf4cab12b0b1c7592
-DIST developer_cmds-63.tar.gz 110662 BLAKE2B
383573203d124904d69e5dbc8f1c5e0aef1b5a2288e40449c8e95470b131c9dc1f181338c38f292a1bcc5a105a54010e23bc12e233d7a92d9c983eb975429474
SHA512
4f672835f0290feaf54c7c268b31774282325448f30c02e4f12ead84c41e15083784fac4c9c4916c098953bc61aa8f29bea24a7b51312428aa87448595be50a1
-DIST misc_cmds-34.tar.gz 124023 BLAKE2B
3c634ab540f4b1046e6abe05476a399ea00fd6d35d2d450f68cd7c3f52c8b9321039221659647b6623d5621af1789dba3798ec9f5cff8677653fbb3f295d1d1c
SHA512
5e4040c49cc6aed8d4b471cc5d26d978717c9ad29315d40098090d0f7fee5a78289f2092fd6e8c7b7adea31b766cfefdef0da957b86ffb4e0781c13f4b5e4dbe
-DIST shell_cmds-203.tar.gz 428799 BLAKE2B
54103daa8a8758dd34a66f9c34a5fa4cad2e6a2dd36ff838498d82179566eb95c25c49126341ac481889381c2d39ebea3bf57959bb943536a7ba8a90fcf96f67
SHA512
ba9b00d6681d286e6210d49d70e1f526e86b0a76ed794050e9cdbdb8c0cc30dbe82ee9cd908578ddabb19c53c8994f1b84650f08bfeb88ea9f77d4de942c1cb1
+DIST developer_cmds-63.tar.gz 110943 BLAKE2B
3dfa56406ca3bb3a56122c172151f20cdbf6191a1511e5cfe2db03bd133e565bee7ddd5cd7cbe34aa2e4513a21a8502d44d480f5bc20621cc615b2bc36f1b8c1
SHA512
c37dead04c6e4fb409704d206e5ad66c779917d21aa2930746ed1145be9a392db861f09feb9c97a2fc8c985cf6bce98ddb96fc2688bada1b21a3ac7abbb90f1f
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild
b/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild
index 5762a7cf8207..c8f3e71d0567 100644
--- a/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild
@@ -5,27 +5,20 @@ EAPI=8
inherit edo toolchain-funcs
-# from macOS 10.13
-MISC_VER=34
-SHELL_VER=203
# from DT 8.2.1
DEV_VER=63
# from 10.7.4
MD_VER=147 # adv_cmds-148 in 10.8 has no md, bug #428530
DESCRIPTION="Miscellaneous commands used on macOS, High Sierra 10.13"
-HOMEPAGE="
- https://www.opensource.apple.com/
- https://github.com/apple-oss-distributions;
+HOMEPAGE="https://github.com/apple-oss-distributions;
SRC_URI="
https://github.com/apple-oss-distributions/adv_cmds/blob/c8dbac91aa855b2d05282f45709b318f8bc3693d/md/md.1
\
-> adv_cmds-md-${MD_VER}.1
https://github.com/apple-oss-distributions/adv_cmds/blob/c8dbac91aa855b2d05282f45709b318f8bc3693d/md/md.c
\
-> adv_cmds-md-${MD_VER}.c
https://642666.bugs.gentoo.org/attachment.cgi?id=511988 ->
adv_cmds-md-${MD_VER}-compile.patch
-
https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-${MISC_VER}.tar.gz
-
https://opensource.apple.com/tarballs/shell_cmds/shell_cmds-${SHELL_VER}.tar.gz
-
https://opensource.apple.com/tarballs/developer_cmds/developer_cmds-${DEV_VER}.tar.gz;
+
https://github.com/apple-oss-distributions/developer_cmds/archive/ref
[gentoo-commits] repo/gentoo:master commit in: sys-apps/darwin-miscutils/
commit: e8835c99b0b32c3c27b1bd5a618f2ff1df7f7f07
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sun Apr 7 08:49:14 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun Apr 7 10:30:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8835c99
sys-apps/darwin-miscutils: 12: EAPI8 bump, ebuild improvements
Closes: https://github.com/gentoo/gentoo/pull/36147
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Fabian Groffen gentoo.org>
.../darwin-miscutils/darwin-miscutils-12-r1.ebuild | 157 +
1 file changed, 157 insertions(+)
diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild
b/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild
new file mode 100644
index ..5762a7cf8207
--- /dev/null
+++ b/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+# from macOS 10.13
+MISC_VER=34
+SHELL_VER=203
+# from DT 8.2.1
+DEV_VER=63
+# from 10.7.4
+MD_VER=147 # adv_cmds-148 in 10.8 has no md, bug #428530
+
+DESCRIPTION="Miscellaneous commands used on macOS, High Sierra 10.13"
+HOMEPAGE="
+ https://www.opensource.apple.com/
+ https://github.com/apple-oss-distributions;
+SRC_URI="
+
https://github.com/apple-oss-distributions/adv_cmds/blob/c8dbac91aa855b2d05282f45709b318f8bc3693d/md/md.1
\
+ -> adv_cmds-md-${MD_VER}.1
+
https://github.com/apple-oss-distributions/adv_cmds/blob/c8dbac91aa855b2d05282f45709b318f8bc3693d/md/md.c
\
+ -> adv_cmds-md-${MD_VER}.c
+ https://642666.bugs.gentoo.org/attachment.cgi?id=511988 ->
adv_cmds-md-${MD_VER}-compile.patch
+
https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-${MISC_VER}.tar.gz
+
https://opensource.apple.com/tarballs/shell_cmds/shell_cmds-${SHELL_VER}.tar.gz
+
https://opensource.apple.com/tarballs/developer_cmds/developer_cmds-${DEV_VER}.tar.gz;
+S="${WORKDIR}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos"
+
+# for ncal
+DEPEND="sys-libs/ncurses:="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ cd "${S}"/shell_cmds-${SHELL_VER} || die
+ eapply "${FILESDIR}"/${PN}-6-w64.patch
+
+ mkdir -p "${S}"/adv_cmds-${MD_VER}/md || die
+ cd "${S}"/adv_cmds-${MD_VER} || die
+ cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.c md/md.c || die
+ cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 md/md.1 || die
+ eapply "${DISTDIR}"/adv_cmds-md-${MD_VER}-compile.patch
+ eapply "${FILESDIR}"/${PN}-12-md-register.patch
+
+ cd "${S}" || die
+ eapply_user
+}
+
+src_compile() {
+ local flags=(
+ ${CFLAGS}
+ -I.
+ -D__FBSDID=__RCSID
+ -Du_int=uint32_t
+ -include stdint.h
+ )
+
+ local TS="${S}/misc_cmds-${MISC_VER}"
+ local t
+ # tsort is provided by coreutils
+ for t in leave units calendar; do
+ cd "${TS}/${t}" || die
+ echo "in ${TS}/${t}:"
+ edo $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c
+ done
+ # compile cal separately
+ cd "${TS}/ncal" || die
+ echo "in ${TS}/ncal:"
+ edo $(tc-getCC) ${flags[@]} -c calendar.c
+ edo $(tc-getCC) ${flags[@]} -c easter.c
+ edo $(tc-getCC) ${flags[@]} -c ncal.c
+ edo $(tc-getCC) -o cal ${LDFLAGS} -lncurses calendar.o easter.o ncal.o
+
+ TS="${S}/shell_cmds-${SHELL_VER}"
+ # only pick those tools not provided by coreutils, findutils
+ for t in \
+ apply getopt hexdump hostname jot kill killall \
+ lastcomm renice script shlock time whereis;
+ do
+ echo "in ${TS}/${t}:"
+ cd "${TS}/${t}" || die
+ edo $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c
+ done
+ cd "${TS}/w" || die
+ sed -i -e '/#include /d' w.c || die
+ echo "in ${TS}/w:"
+ edo $(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 ${LDFLAGS} -lresolv -o w *.c
+
+ TS="${S}/developer_cmds-${DEV_VER}"
+ # only pick those tools that do not conflict (no ctags and indent)
+ # do not install lorder, mkdep and vgrind as they are a non-prefix-aware
+ # shell scripts
+ # don't install rpcgen, as it is heavily related to the OS it runs
+ # on (and this is the High Sierra version)
+ for t in asa unifdef what ; do
+ echo "in ${TS}/${t}:"
+ cd "${TS}/${t}" || die
+ edo
[gentoo-commits] repo/gentoo:master commit in: sys-apps/darwin-miscutils/files/, sys-apps/darwin-miscutils/
commit: 5ae690d4a2711c96f26b8158549a6e43566bbe6a Author: Fabian Groffen gentoo org> AuthorDate: Sun Apr 7 09:42:03 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Apr 7 09:42:03 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae690d4 sys-apps/darwin-miscutils: cleanup old darwin-miscutils-12 compiles/installs/runs fine on ppc-darwin9, the oldest target this is relevant for, so weed out all old versions Signed-off-by: Fabian Groffen gentoo.org> sys-apps/darwin-miscutils/Manifest | 12 -- .../darwin-miscutils/darwin-miscutils-10.ebuild| 157 .../darwin-miscutils/darwin-miscutils-11.ebuild| 158 - .../darwin-miscutils/darwin-miscutils-6-r1.ebuild | 139 -- .../darwin-miscutils/darwin-miscutils-8.ebuild | 134 - .../darwin-miscutils/darwin-miscutils-9.ebuild | 131 - .../files/darwin-miscutils-5-error.patch | 14 -- .../files/darwin-miscutils-5-stdlib.patch | 20 --- .../files/darwin-miscutils-5-w.patch | 10 -- 9 files changed, 775 deletions(-) diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest index 2bc123dcefa2..3696e7f13dba 100644 --- a/sys-apps/darwin-miscutils/Manifest +++ b/sys-apps/darwin-miscutils/Manifest @@ -1,18 +1,6 @@ DIST adv_cmds-md-147-compile.patch 5423 BLAKE2B f548fcecb81fd8e628bcb384f537e572095b8210612c0748017f033e7bb6f9c5b1bd2c544fec23e8002a2ac7b99d840c85a8ca6faadac3b4da2edb77b459 SHA512 951e981b57e7d3d6ef51d638759559581dd4995ce66ec17bb2658f8a298683feb0842d10fd834b713ec39b2a0f671df56049b876d55f17bf1e988d76839fead1 DIST adv_cmds-md-147.1 3623 BLAKE2B 18b856770f0490ef241e19cc6f1661f6521bcc7f363bff41fbec548388d8f1e2d9e6aea879064cd3d7e7d16f8e0b2ff17ead990051a068a66f520a5ff504afa3 SHA512 459beb2b7c92b8718c76d744bbabf631bf8c329feb65c9434ce8a023c73ceac2d207c95e39c4b90b095a4724a74096a3d1bed9122883eb54e5311dfc64ffc718 DIST adv_cmds-md-147.c 25945 BLAKE2B 38af9e06e18a15cc74a81464a4c1ecdf98b800eb34f33f6ab6203b60540e693d459805432e51bae1008661aa566830c87357432428f62d8cbea9973b1e5fc59a SHA512 93e70f7d8697652b5a3c661975d21b51545d2eb07de64fd40524fcf0d5016dae9ae1dc63c4a85cb5ad455c8d1c246b7f5f2eac38226dcefbf4cab12b0b1c7592 -DIST developer_cmds-49.tar.gz 307753 BLAKE2B 774259d7b82efc85bf487111e5a3c4c0d4aa3f8a788463b503e4d108c684837327b97882114d3646dfba5f60a1a1a2671e0e574d92e159b5ea014fc9e2c61015 SHA512 3750374c891f6d681829986291d887cacf2c5b1c7a5de94f12c92ded0b3456157b85e57653c6061526d1f6626a7be8a9e6db9c1df09e2bb3e40c7fa20b9b4103 -DIST developer_cmds-53.1.tar.gz 139637 BLAKE2B cd61d6f86195ee43705b4b8e8802d7c1c578e2d64869ec33ed7acd7894a3231cab4152e08aa44694836fc542b4c3ab29d83b8a30b8b69545a25b12921c547fc9 SHA512 ac15b499d0642332e8deae2f498e5ffb0c64502e2d877bbdfe0fac4118e17fe525b169f3b015cfe8c9f40e2688bd30df4b050fe50eaa706b21a2e62ca9dd4b80 -DIST developer_cmds-55.tar.gz 139664 BLAKE2B 2dcd3b3e5ac9ebd8c15dbffe388fc016c037bfe8cbe0ae600552bf7de7dfc4351380eb0b16df0ecec2a79937d970044d1e937703cef6fb5205c62bd0b5298c4e SHA512 062e4c4a2b1ba4cffe7e850d07f4351c736988958450735f9f653936d64defa3347c9dac7b5fea3dcd25f8efe076133dc9ac3edb4a3e512387d6842bd177c35e DIST developer_cmds-63.tar.gz 110662 BLAKE2B 383573203d124904d69e5dbc8f1c5e0aef1b5a2288e40449c8e95470b131c9dc1f181338c38f292a1bcc5a105a54010e23bc12e233d7a92d9c983eb975429474 SHA512 4f672835f0290feaf54c7c268b31774282325448f30c02e4f12ead84c41e15083784fac4c9c4916c098953bc61aa8f29bea24a7b51312428aa87448595be50a1 -DIST misc_cmds-23.tar.gz 114747 BLAKE2B 9c4a1376555775a6999437e0712f62200d10be972f6828c02cfc0215a6004b706e36030e66ebdca59fdb8bcb18fabe4e596ce485b45ffaa072f8262ee9b91d82 SHA512 0e02a939c308f4483cf11cb8b21face84f442589e3774b1827ed0ab5064ee2b433a4468ac634051fa0817919f5d39ac1ed56c67b1f5b011b83388a3806ed33c8 -DIST misc_cmds-27.tar.gz 116351 BLAKE2B 00aece4bc8679d9a7a1e114db65bca97e8f855ead64ee0672ac598c28069c56355f4a763fef0e56784ee9d2de9a081ef6f7e6d9390fc79cb0dec25dbe40ec881 SHA512 594560b179f7dafc651d3a336d33bcb7075f2199cf4964e95d63164faf19bd50ef3a6095124f0e4f91c50d1bceeb831fcd81ceecf740e2696a8e7445c1a690d2 -DIST misc_cmds-31.tar.gz 121187 BLAKE2B 3d12a13cbdc7c541b98596ab5ea675d27a0da93a913ee94945dc5b68b3238a85c3fd13472c3ead30219ae3317a6111ba8d22a6e702fe07f927318f5174870a70 SHA512 d49bb8a49c23aa7efaa7db1958676390b4d5ef1b2e57f80b0bea0f10b8b29a6c3ec6d2d7a1248d3af77d382c5113fb3cbf9d3632ca92bb51c01d8c286fd9f25f -DIST misc_cmds-33.tar.gz 123114 BLAKE2B fb86518067b36de536503df521f1dc5e4f20fa1da74cfee4679dd728862b9ca4c1c272fd0ba39107d058f992acc04c2c98f3f44d6b2fc57386d3c458cfedd68f SHA512 34957adaebe4ce1569464a466e136a567c582b784b99dd260c891a417d37a0297bf11acc9eb16dfabed18f42480058ae726e0a56b7d98ed93b59f75a5644 DIST misc_cmds-34.tar.gz 12402
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: 98bf92d8362aefed6b1a535e1598380b06367ec0
Author: Fabian Groffen gentoo org>
AuthorDate: Sun Apr 7 06:53:31 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun Apr 7 06:53:31 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=98bf92d8
scripts/bootstrap-prefix: snapshot bump to fix Solaris bootstrap
bump for binutils-config' -rpath handling, which affects probably more
than just Solaris
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5eee608a9a..f27be96a45 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ bootstrap_tree() {
# retain this comment and the line below to
# keep this snapshot around in the snapshots
# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
- local PV="20240405"
+ local PV="20240406"
# RAP uses the latest gentoo main repo snapshot to bootstrap.
is-rap && LATEST_TREE_YES=1
[gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/
commit: 7d25d2ad9824e2424b7a5344028c2c36cbb89daf Author: Fabian Groffen gentoo org> AuthorDate: Sat Apr 6 17:28:02 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sat Apr 6 20:08:10 2024 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7d25d2ad dev-lang/python-3.12.2_p1: version bump Tested on OpenIndiana. This release actually seems to have improved things considerably for us with regards to build-system patching, which is hopeful. Signed-off-by: Fabian Groffen gentoo.org> dev-lang/python/Manifest| 4 + dev-lang/python/python-3.12.2_p1.ebuild | 605 2 files changed, 609 insertions(+) diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 3398644956..77860cc37a 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -4,6 +4,8 @@ DIST Python-3.11.3.tar.xz 19906156 BLAKE2B c23815e09a0012b2af03f3e18471389382978 DIST Python-3.11.3.tar.xz.asc 833 BLAKE2B 1846858480428293047bfaf87a74f5a6cf28227f63dbc36e658ab68444a5b91c2178fca42f35a413591103a0ceeea3cd5f8b757fb2f42cbcad023c62970ab950 SHA512 34bfb6e74e2bbec15bf3f653e32a3d705961b5f724e3f4713cf9b6b530f9c9e7e94f5cf855798bdf9763235b97a60ec9ad554d24cdc793e21a0c39540b5818d8 DIST Python-3.11.7.tar.xz 20074108 BLAKE2B 3414118d30076e4223571825b5c595c5795422244de20dc70d07389a03b2c2b03b98a9ff562a8fd164db8f776dd741a9d7beb1c2ae4087ec6af677619a9dfd80 SHA512 11e06f2ffe1f66888cb5b4e9f607de815294d6863a77eda6ec6d7c724ef158df9f51881f4a956d4a6fa973c2fb6fd031d495e3496e9b0bb53793fb1cc8434c63 DIST Python-3.11.7.tar.xz.asc 833 BLAKE2B 32d6984631d7b4b064e2c2588835a89098842a0ecc3d8ccb893830c9946124a159123e2082e6da3abcdb97d27dde0fb68c1fd11e4ed2bf2e0641fa95191354bb SHA512 7b342990c6e32897047f8ba33c4d264f1be987b73843b61bd7db08bfa1a7280c616e9dcd96225f37602f876549d011ff82a4d79f1e32a5ab7d7cc22651bba44f +DIST Python-3.12.2.tar.xz 20591308 BLAKE2B 419186d220d4ae5ca31466771158c8b56f5298b93e81a29993f36711e08b0384e002d891280ca29099ae826919ba99c2d056d468d9d3049a984d58e01d4972c0 SHA512 2ccfae7b9f95d8e15ea85d3f66eea5f6a8fdcaffc0b405095fecb33efc0df50b831c1215542910ced948b54e6de1f7242b0b8b9afc5f89079451c552430d7d9f +DIST Python-3.12.2.tar.xz.asc 963 BLAKE2B 45bfa01009f4df19d348a1fda722901cb4f0b76eb63fcf1061c2796949b5b2ef301fd0fdf818cd145e41d45e5785e0cfbfab8d98751765741715ee7d1b27f2f8 SHA512 fb477acb49864a662b1586db79e80fd8ebab85d4e5e14acd3bfb5afc3dbe8d6b9bf97eb518dfb77662e27040d400f451ed7575fe1264a6cc0d9feb06e4f2dc84 DIST Python-3.8.8.tar.xz 18271736 BLAKE2B af0ff1acd919b365a58278e82678324ff884cc8120bcaf12e0e3afb1bd978e6469e256335df131935f51ff481fb83dda04e4b6f1cd1746611f9ec944db73d692 SHA512 64181db5aa48281284a3230436ebfb8cb91b645a9dec956fd48c0048334498477073fc4e14d6b426d0ef7fbcdcfd5d59cbf01a504e6c9014dc9529494b9309fb DIST Python-3.8.8.tar.xz.asc 833 BLAKE2B a11188f9f68c518259de1a4e271bf56409d7356a7eb3dd8cbea7bbb0b5bc1b43f9aeb85bda4add65bbae906bef65cb20a30bcc77da04c0d383cd5b527821fd85 SHA512 0e6f11a310c1796dd056d9a4b63b5e03aa8dbd290088966e04a590a78c3887dbfd7a7029a6cf8c5626ecd6ca91c1c16433bb0a41bf1225b02b8db8541b95 DIST Python-3.9.12.tar.xz 19740524 BLAKE2B 05f2469aa53ca36221ef4976b17bfde3e5b86afd5a8114e5a7fd899f975a8e55022555ef718d5352ab68de1b7b23865a0bf713768c9c2b30d591438c9a396d25 SHA512 081981901e14149748fd35228db0b3b1d96fef227ae7404f07b8bad0fda4b02649bf31c348c94aefdaf3327565d78f9489437c2c02f647b15d41376a27a23e97 @@ -13,12 +15,14 @@ DIST Python-3.9.6.tar.xz.asc 833 BLAKE2B 41901bfb80a901f2f14e86769e6d08ded8f7565 DIST python-gentoo-patches-3.10.4.tar.xz 8592 BLAKE2B 67fba3e1fedb17430e5cd93da995b4acaf714db512031b5a2f775a25f793f007941561663cfa413d645ccddc2e22d65d250a40fa166cafda8805488d877ff57d SHA512 3ed2b8ff8f1eb8febe7dcd4b5d13d6d54468be1d525f8f1118977d3bbc78f690a597b09383939d023b03380a306e4bff1693382e29ff562312d803305b1709b2 DIST python-gentoo-patches-3.11.3.tar.xz 7776 BLAKE2B 78bf26f554c608c68826b9ea3c63a1df2b45bff755860f39f14306ebb63f17f5111b117519c4a9cb30452a62a14a3a7393798b8920c3d108ec8b6a30db88641e SHA512 64b79c90055fd940590b72ffd3744fe02ab9e46caf7b46f4aa1d074bf3e62d355e128bb2ac68c42f228f2e1bcdee2b0b114d9e2b9bf8427512083c1c5f8680e8 DIST python-gentoo-patches-3.11.7_p1.tar.xz 8364 BLAKE2B 246da406e6d58d85ab2ef79dd3a018a134e473f90d42f8dd9274629f998a6129f3b03da228aa5e65c1b4508a71979ceb1f752a28066c356f813be21c30a40f70 SHA512 c5c1448a2e9b15b8084125e07cee288b667267779d89da8aab9df4b1d014739ba9af4d09e51b3cdc37e8942821d7aee0d1998e55820b67b83ef654d0a442767e +DIST python-gentoo-patches-3.12.2_p1.tar.xz 7208 BLAKE2B 8266f2b6c64ffd509278c0d8756680e6700dcd3ed3ab6d3f0e1be2cc87cb20bc694f9e386b474fa5d115ffecdd5d4807a956a48450e109ef7f449ed6f4a8afce SHA512 5fdb93ffae471b5a9e617c12ca1646b9521867cd260efe6da6350fcf5ba24114cad1dc715f033079ab69ecab7cc62c870e14fe2d2035c2d7f29c05cc0f1297db DIST python-gentoo-patches-3.8.8_p1.tar.xz 1545
[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/binutils-config/files/, sys-devel/binutils-config/
commit: 1e8c1aa5752b38209bb521578377cd2025773e62
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Apr 6 14:34:38 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Apr 6 14:34:38 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1e8c1aa5
sys-devel/binutils-config: fix -rpath and -L handling
A thinko broke skipping of arguments consisting of two entries,
resulting in very weird command lines. Not noticed on Darwin because
for some odd reason.
Signed-off-by: Fabian Groffen gentoo.org>
...1-r11.ebuild => binutils-config-5.1-r12.ebuild} | 0
sys-devel/binutils-config/files/ldwrapper.c| 22 +++---
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/sys-devel/binutils-config/binutils-config-5.1-r11.ebuild
b/sys-devel/binutils-config/binutils-config-5.1-r12.ebuild
similarity index 100%
rename from sys-devel/binutils-config/binutils-config-5.1-r11.ebuild
rename to sys-devel/binutils-config/binutils-config-5.1-r12.ebuild
diff --git a/sys-devel/binutils-config/files/ldwrapper.c
b/sys-devel/binutils-config/files/ldwrapper.c
index 22fbf9aba8..1aa96537d0 100644
--- a/sys-devel/binutils-config/files/ldwrapper.c
+++ b/sys-devel/binutils-config/files/ldwrapper.c
@@ -530,7 +530,7 @@ main(int argc, char *argv[])
char *path;
int pth;
char duplicate;
- int before = j - 1;
+ int nexti = i;
/* arguments can be in many ways here:
* -L
@@ -541,10 +541,11 @@ main(int argc, char *argv[])
while (*path != '\0' && isspace(*path))
path++;
if (*path == '\0') {
+ nexti++;
/* no more arguments?!? skip */
- if (i + 1 >= argc)
+ if (nexti >= argc)
continue;
- path = argv[i + 1];
+ path = argv[nexti];
while (*path != '\0' && isspace(*path))
path++;
}
@@ -570,7 +571,8 @@ main(int argc, char *argv[])
}
}
if (duplicate) {
- j = before;
+ i = nexti;
+ j--;
continue;
}
/* record path */
@@ -584,7 +586,8 @@ main(int argc, char *argv[])
}
}
if (duplicate) {
- j = before;
+ i = nexti;
+ j--;
continue;
}
/* record path */
@@ -597,8 +600,12 @@ main(int argc, char *argv[])
char *path;
int pth;
char duplicate;
+ int nexti = i + 1;
- path = argv[i + 1];
+ /* no more arguments?!? skip */
+ if (nexti >= argc)
+ continue;
+ path = argv[nexti];
while (*path != '\0' && isspace(*path))
path++;
/* not absolute (or empty)?!? skip */
@@ -617,7 +624,8 @@ main(int argc, char *argv[])
}
}
if (duplicate) {
- j -= 2;
+ j--;
+ i = nexti;
continue;
}
/* record path */
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: 1152fbf41ae0e0272b8f77413d0dabb15e81ea59
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Apr 6 07:13:54 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Apr 6 07:16:12 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1152fbf4
scripts/bootstrap-prefix: bump snapshot for Darwin fixes
- binutils-config ld duplicate paths elimination
- gcc math.h fix for darwin
- openssl using --push-state --as-needed --pop-state LDFLAGS unconditional
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0ef1aefa3b..5eee608a9a 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -573,7 +573,7 @@ bootstrap_tree() {
# retain this comment and the line below to
# keep this snapshot around in the snapshots
# MKSNAPSHOT-ANCHOR -- directory of rsync slaves
- local PV="20240218"
+ local PV="20240405"
# RAP uses the latest gentoo main repo snapshot to bootstrap.
is-rap && LATEST_TREE_YES=1
[gentoo-commits] repo/gentoo:master commit in: sys-libs/native-uuid/
commit: cb6f55e41236e20bc41230ce583c365ec0a25368
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Apr 1 12:07:57 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Apr 5 18:32:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6f55e4
sys-libs/native-uuid: EAPI8 bump
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Fabian Groffen gentoo.org>
.../native-uuid/{native-uuid-1.0.ebuild => native-uuid-1.0-r1.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-libs/native-uuid/native-uuid-1.0.ebuild
b/sys-libs/native-uuid/native-uuid-1.0-r1.ebuild
similarity index 93%
rename from sys-libs/native-uuid/native-uuid-1.0.ebuild
rename to sys-libs/native-uuid/native-uuid-1.0-r1.ebuild
index fc152909b641..f5df8a1a1bbe 100644
--- a/sys-libs/native-uuid/native-uuid-1.0.ebuild
+++ b/sys-libs/native-uuid/native-uuid-1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION=".pc file for uuid"
HOMEPAGE="https://prefix.gentoo.org/;
[gentoo-commits] repo/gentoo:master commit in: sys-libs/libuuid/
commit: 6fbc31f140305c72b21f9649abcd63cb0604a5f5
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Apr 1 12:02:07 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Apr 5 18:33:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fbc31f1
sys-libs/libuuid: EAPI8 bump
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Fabian Groffen gentoo.org>
.../libuuid/{libuuid-1.0.3.ebuild => libuuid-1.0.3-r1.ebuild}| 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/sys-libs/libuuid/libuuid-1.0.3.ebuild
b/sys-libs/libuuid/libuuid-1.0.3-r1.ebuild
similarity index 76%
rename from sys-libs/libuuid/libuuid-1.0.3.ebuild
rename to sys-libs/libuuid/libuuid-1.0.3-r1.ebuild
index db7955c7b880..fe50ffb5bf2f 100644
--- a/sys-libs/libuuid/libuuid-1.0.3.ebuild
+++ b/sys-libs/libuuid/libuuid-1.0.3-r1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit libtool
DESCRIPTION="Portable uuid C library"
-HOMEPAGE="https://libuuid.sourceforge.net/;
+HOMEPAGE="https://libuuid.sourceforge.io/;
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~x64-solaris"
-IUSE=""
DEPEND="!!sys-apps/util-linux
!!sys-libs/native-uuid"
@@ -29,5 +28,5 @@ src_configure() {
src_install() {
default
- rm -f "${ED}"/usr/lib/*.la || die
+ find "${ED}" -name "*.la" -delete || die
}
[gentoo-commits] repo/gentoo:master commit in: app-text/antixls/
commit: 980594a8d3fb6517673747c5797ce41d7b83cfa0
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sun Mar 31 18:34:14 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Apr 5 18:34:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=980594a8
app-text/antixls: EAPI8 bump
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Fabian Groffen gentoo.org>
app-text/antixls/antixls-0.3b.ebuild | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/app-text/antixls/antixls-0.3b.ebuild
b/app-text/antixls/antixls-0.3b.ebuild
index 39fa4963ce93..392f97f84af0 100644
--- a/app-text/antixls/antixls-0.3b.ebuild
+++ b/app-text/antixls/antixls-0.3b.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="Print out an XLS file with minimal formatting, or extract the
data into CSV"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.perl;
+
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
+
DEPEND="dev-perl/Spreadsheet-ParseExcel"
RDEPEND="${DEPEND}"
[gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
commit: ebb0a9e25b78000c8f2e47c4559014c92e88e2b4
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Apr 5 15:08:49 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Apr 5 15:08:49 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ebb0a9e2
scripts/auto-bootstraps/dobootstrap: fix shellcheck fix
previous fix included some quotes in the output, making no sense and
failing portage down the line
Signed-off-by: Fabian Groffen gentoo.org>
scripts/auto-bootstraps/dobootstrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/dobootstrap
b/scripts/auto-bootstraps/dobootstrap
index b79d42060f..cafd4df1fa 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -132,7 +132,7 @@ do_prepare() {
USER="${USER}" \
CHOST="${chost}" \
EPREFIX="${EPREFIX}" \
- ${GENTOO_MIRRORS+GENTOO_MIRRORS=\""${GENTOO_MIRRORS}"\"} \
+ ${GENTOO_MIRRORS+GENTOO_MIRRORS="${GENTOO_MIRRORS}"} \
${DOLOCAL+DOLOCAL=1} \
${RESUME+RESUME=1} \
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
[gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
commit: bb9c656be46db918063c92c09391a1c952cea61d
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Apr 5 11:44:19 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Apr 5 11:45:39 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bb9c656b
scripts/auto-bootstraps/dobootstrap: unbreak after shellcheck
the quoting-eagerness of shellcheck isn't always resulting in the
desired output, in this case quoted empty strings broke where they
previously would be ignored as whitespace separators
Signed-off-by: Fabian Groffen gentoo.org>
scripts/auto-bootstraps/dobootstrap | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/scripts/auto-bootstraps/dobootstrap
b/scripts/auto-bootstraps/dobootstrap
index f2b670d9b2..b79d42060f 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -127,20 +127,20 @@ do_prepare() {
starttime=${SECONDS}
env -i \
HOME="${EPREFIX}" \
- SHELL=/bin/sh \
+ SHELL="/bin/sh" \
TERM="${TERM}" \
USER="${USER}" \
CHOST="${chost}" \
EPREFIX="${EPREFIX}" \
- ${GENTOO_MIRRORS+GENTOO_MIRRORS="${GENTOO_MIRRORS}"} \
+ ${GENTOO_MIRRORS+GENTOO_MIRRORS=\""${GENTOO_MIRRORS}"\"} \
${DOLOCAL+DOLOCAL=1} \
${RESUME+RESUME=1} \
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
- ${TREE_FROM_SRC+TREE_FROM_SRC=}"${TREE_FROM_SRC}" \
- ${USE_CPU_CORES+USE_CPU_CORES=}"${USE_CPU_CORES}" \
- ${DARWIN_USE_GCC+DARWIN_USE_GCC=}"${DARWIN_USE_GCC}" \
-
${PREFIX_DISABLE_RAP+PREFIX_DISABLE_RAP=}"${PREFIX_DISABLE_RAP}" \
-
${BP_KEEPALIVE_ACTIVE+BP_KEEPALIVE_ACTIVE=}"${BP_KEEPALIVE_ACTIVE}" \
+ ${TREE_FROM_SRC+TREE_FROM_SRC="${TREE_FROM_SRC}"} \
+ ${USE_CPU_CORES+USE_CPU_CORES="${USE_CPU_CORES}"} \
+ ${DARWIN_USE_GCC+DARWIN_USE_GCC="${DARWIN_USE_GCC}"} \
+
${PREFIX_DISABLE_RAP+PREFIX_DISABLE_RAP="${PREFIX_DISABLE_RAP}"} \
+
${BP_KEEPALIVE_ACTIVE+BP_KEEPALIVE_ACTIVE="${BP_KEEPALIVE_ACTIVE}"} \
"${BASH}" "${bootstrapscript}" bootstrap
endtime=${SECONDS}
[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/binutils-config/, sys-devel/binutils-config/files/
commit: e3536efbe87342ead017157e0cc359dead73d9dd
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Apr 4 20:27:06 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Apr 4 20:29:39 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e3536efb
sys-devel/binutils-config: remove duplicate -L and -rpath entries
Ever since CLT15.3 duplicate -L or -rpath entries result in warnings.
These warnings, albeit just ugly, make that some packages croak or
worse: abort, claiming the linker is broken (such as Ruby). This is
nonsense, but cater for this by removing any duplicate paths, and not
adding any paths that are already added.
Signed-off-by: Fabian Groffen gentoo.org>
...1-r10.ebuild => binutils-config-5.1-r11.ebuild} | 0
sys-devel/binutils-config/files/ldwrapper.c| 198 -
2 files changed, 150 insertions(+), 48 deletions(-)
diff --git a/sys-devel/binutils-config/binutils-config-5.1-r10.ebuild
b/sys-devel/binutils-config/binutils-config-5.1-r11.ebuild
similarity index 100%
rename from sys-devel/binutils-config/binutils-config-5.1-r10.ebuild
rename to sys-devel/binutils-config/binutils-config-5.1-r11.ebuild
diff --git a/sys-devel/binutils-config/files/ldwrapper.c
b/sys-devel/binutils-config/files/ldwrapper.c
index c799b4cdd9..22fbf9aba8 100644
--- a/sys-devel/binutils-config/files/ldwrapper.c
+++ b/sys-devel/binutils-config/files/ldwrapper.c
@@ -197,7 +197,10 @@ int
main(int argc, char *argv[])
{
int newargc = 0;
+ int rpathcnt = 0;
char **newargv = NULL;
+ char **rpaths = NULL;
+ char **lpaths = NULL;
char *wrapper = argv[0];
char *wrapperctarget = NULL;
char verbose = getenv("BINUTILS_CONFIG_VERBOSE") != NULL;
@@ -214,7 +217,6 @@ main(int argc, char *argv[])
size_t len;
int i;
int j;
- int k;
DIR *dirp;
struct dirent *dp;
@@ -287,10 +289,12 @@ main(int argc, char *argv[])
/* walk over the arguments to see if there's anything interesting
* for us and calculate the final number of arguments */
for (i = 1; i < argc; i++) {
- /* -L: account space for the matching -R */
if (argv[i][0] == '-') {
+ /* -L: account space for the matching -R */
if (argv[i][1] == 'L')
newargc++;
+ if (argv[i][1] == 'R' || strcmp(argv[i], "-rpath") == 0)
+ rpathcnt++;
if (argv[i][1] == 'v' || argv[i][1] == 'V')
verbose = 1;
if ((strcmp(argv[i], "-macosx_version_min") == 0 ||
@@ -316,8 +320,6 @@ main(int argc, char *argv[])
darwin_dt_ver += (int)strtol(p + 1, , 10);
}
- /* Note: Code below assumes that newargc is the count of -L arguments.
*/
-
/* If a package being cross-compiled injects standard directories, it's
* non-cross-compilable on any platform, prefix or no prefix. So no
* need to add PREFIX- or CTARGET-aware libdirs. */
@@ -341,13 +343,15 @@ main(int argc, char *argv[])
* -rpath and the path itself */
newargc *= 2;
- /* and we will be adding two for the each of
-* the two system paths as well */
- newargc += 4;
+ /* PREFIX rpaths */
+ newargc += 2 * 2;
}
- /* add the 2 prefix paths (-L) and -search_paths_first
*/
- newargc += 2 + 1;
+ /* PREFIX paths */
+ newargc += 3;
+
+ /* add -search_paths_first */
+ newargc += 1;
/* add -syslibroot -platform_version macos
0.0 */
newargc += 6;
@@ -357,6 +361,27 @@ main(int argc, char *argv[])
}
}
+ /* Note: Code below assumes that newargc is the count of -L arguments.
*/
+
+ /* allocate space for -L lookups/uniqueifying */
+ lpaths = malloc(sizeof(lpaths[0]) * (newargc + 1));
+ if (lpaths == NULL) {
+ fprintf(stderr, "%s: failed to allocate memory for new
arguments\n",
+ wrapper);
+ exit(1);
+ }
+ lpaths[0] = NULL;
+
+ if (!is_darwin || darwin_use_rpath) {
+ rpaths = malloc(sizeof(rpaths[0]) * (rpathcnt + 1));
+ if (rpaths == NULL) {
+ fprintf(stderr, "%s: failed to allocate memory for new
arguments\n",
+ wrapper);
+ exit(1);
+ }
[gentoo-commits] repo/gentoo:master commit in: dev-python/thrift/
commit: 821e04528753a88f5735834bb77811870aa18a1c Author: Fabian Groffen gentoo org> AuthorDate: Wed Apr 3 09:47:57 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Wed Apr 3 09:48:17 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=821e0452 dev-python/thrift: add maintainer-needed tag Signed-off-by: Fabian Groffen gentoo.org> dev-python/thrift/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-python/thrift/metadata.xml b/dev-python/thrift/metadata.xml index 30984ee5ffab..09527b1c7c73 100644 --- a/dev-python/thrift/metadata.xml +++ b/dev-python/thrift/metadata.xml @@ -1,6 +1,7 @@ https://www.gentoo.org/dtd/metadata.dtd;> + thrift
[gentoo-commits] repo/gentoo:master commit in: dev-python/thrift/
commit: 9d78d2b91646de9e01ef93f1c34fc0b5ac9ab9e0 Author: Fabian Groffen gentoo org> AuthorDate: Wed Apr 3 09:40:35 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Wed Apr 3 09:40:35 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d78d2b9 dev-python/thrift: drop myself as maintainer Signed-off-by: Fabian Groffen gentoo.org> dev-python/thrift/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/dev-python/thrift/metadata.xml b/dev-python/thrift/metadata.xml index abb484e6dd78..30984ee5ffab 100644 --- a/dev-python/thrift/metadata.xml +++ b/dev-python/thrift/metadata.xml @@ -1,10 +1,6 @@ https://www.gentoo.org/dtd/metadata.dtd;> - -grob...@gentoo.org -Fabian Groffen - thrift
[gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/files/, dev-libs/openssl/
commit: 0785cd27c30f5e045bda1b6dc6e517d3499a4e55
Author: Fabian Groffen gentoo org>
AuthorDate: Tue Apr 2 17:52:42 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Tue Apr 2 17:54:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0785cd27
dev-libs/openssl-3.2.1-r1: fix for Darwin
don't run append-atomic-flags with non-GNU-like linker
add guess for arm64-darwin
Signed-off-by: Fabian Groffen gentoo.org>
dev-libs/openssl/files/gentoo.config-1.0.4 | 2 ++
dev-libs/openssl/openssl-3.2.1-r1.ebuild | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-libs/openssl/files/gentoo.config-1.0.4
b/dev-libs/openssl/files/gentoo.config-1.0.4
index 5f205781ae3e..d32ce877a34a 100644
--- a/dev-libs/openssl/files/gentoo.config-1.0.4
+++ b/dev-libs/openssl/files/gentoo.config-1.0.4
@@ -32,6 +32,7 @@ if [[ $1 == "test" ]] ; then
"i686-apple-darwinX |darwin-i386-cc" \
"i386-apple-darwinX |darwin-i386-cc" \
"powerpc-apple-darwinX|darwin-ppc-cc" \
+ "arm64-apple-darwinX |darwin-arm64-cc" \
"i586-pc-winnt|winnt-parity" \
"s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \
"s390x-linux-gnu |linux64-s390x" \
@@ -155,6 +156,7 @@ darwin)
powerpc) machine=ppc-cc;;
i?86*)machine=i386-cc;;
x86_64) machine=x86_64-cc; system=${system}64;;
+ arm64)machine=arm64-cc; system=${system}64;;
esac
;;
hpux)
diff --git a/dev-libs/openssl/openssl-3.2.1-r1.ebuild
b/dev-libs/openssl/openssl-3.2.1-r1.ebuild
index 79bd29a1a54e..ee2e112cd6f0 100644
--- a/dev-libs/openssl/openssl-3.2.1-r1.ebuild
+++ b/dev-libs/openssl/openssl-3.2.1-r1.ebuild
@@ -148,8 +148,8 @@ src_configure() {
append-flags $(test-flags-CC -Wa,--noexecstack)
- # bug #895308
- append-atomic-flags
+ # bug #895308 -- check inserts GNU ld-compatible arguments
+ [[ ${CHOST} == *-darwin* ]] || append-atomic-flags
# Configure doesn't respect LIBS
export LDLIBS="${LIBS}"
[gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
commit: 643ab6c4370c2d3f79a4828b45ad7bb68c8fce01
Author: Fabian Groffen gentoo org>
AuthorDate: Tue Apr 2 17:30:53 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Tue Apr 2 17:31:16 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=643ab6c4
scripts/auto-bootstraps/process_uploads: allow processing of temp files too
Signed-off-by: Fabian Groffen gentoo.org>
scripts/auto-bootstraps/process_uploads.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/process_uploads.sh
b/scripts/auto-bootstraps/process_uploads.sh
index 8a71d296a4..8e51f7c992 100755
--- a/scripts/auto-bootstraps/process_uploads.sh
+++ b/scripts/auto-bootstraps/process_uploads.sh
@@ -62,8 +62,10 @@ for d in "${UPLOADDIR}"/* ; do
mkdir -p "${RESULTSDIR}/${w}"
[[ -e "${pkg}"/build-info ]] && \
mv "${pkg}"/build-info "${RESULTSDIR}/${w}"/
- [[ -e "${pkg}"/temp ]] && \
+ if [[ -e "${pkg}"/temp ]] ; then
mv "${pkg}"/temp "${RESULTSDIR}/${w}"/
+ process_file "${RESULTSDIR}/${w}"/temp
+ fi
done
fi
chmod -R o+rX,go-w "${RESULTSDIR}/${dir}"
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: f6acc1e57a57e74b0424973a5c79d07feeb74eee
Author: Fabian Groffen gentoo org>
AuthorDate: Sun Mar 31 10:24:42 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun Mar 31 10:24:42 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f6acc1e5
scripts/rsync-generation/mksnapshot: disable all but bz2 snapshots
who am I kidding, the bootstrap and the mirror retaining is all
hardwired to bz2, and other compression formats don't really make a big
enough dent to warrant lots of changes to allow picking a different
compresion format
disable all but bz2, that's the only thing we use afterall
Signed-off-by: Fabian Groffen gentoo.org>
scripts/rsync-generation/mksnapshot.sh | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/scripts/rsync-generation/mksnapshot.sh
b/scripts/rsync-generation/mksnapshot.sh
index 5b8776b45e..4d45ef2727 100755
--- a/scripts/rsync-generation/mksnapshot.sh
+++ b/scripts/rsync-generation/mksnapshot.sh
@@ -44,10 +44,16 @@ popd > /dev/null || exit 1
rm -Rf "${TMPDIR}"
+# The differences in size (57/52/47MB) for bz2,zstd,lz are not really that
+# big considering gzip's size (75MB) but the bootstrap-prefix script and
+# the logic above rely on .bz2 snapshot, so in reality no other format
+# than bzip2-compressed is necessary. Since bzip2 is available
+# everywhere, or bootstrapped just fine for a long long time, stick with
+# it, for it is good enough for its purpose here
COMPRS=(
"bz2:bzip2 -c -9"
- "lz:lzip -c -9"
- "zst:zstd -c -19"
+# "lz:lzip -c -9"
+# "zst:zstd -c -19"
)
# produce compressed variants, use as much cpu as left on the system, do
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: 9edffa4de19c5906e02a23ff5149eac2b66fc38f
Author: Fabian Groffen gentoo org>
AuthorDate: Sun Mar 31 10:07:39 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun Mar 31 10:07:39 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9edffa4d
scripts/rsync-generation/mksnapshot: xz can read lzip archives, so drop xz
lzip (lzma) compresses better than xz (lzma2) but xz can read/decompress
lzip archives, so drop the xz archive in favour of lzip
Signed-off-by: Fabian Groffen gentoo.org>
scripts/rsync-generation/mksnapshot.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/scripts/rsync-generation/mksnapshot.sh
b/scripts/rsync-generation/mksnapshot.sh
index 2fbdcfae0f..5b8776b45e 100755
--- a/scripts/rsync-generation/mksnapshot.sh
+++ b/scripts/rsync-generation/mksnapshot.sh
@@ -46,7 +46,6 @@ rm -Rf "${TMPDIR}"
COMPRS=(
"bz2:bzip2 -c -9"
- "xz:xz -c -9"
"lz:lzip -c -9"
"zst:zstd -c -19"
)
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: 29055666a0ad23b72e20081f40811b5202b445c7
Author: Fabian Groffen gentoo org>
AuthorDate: Sun Mar 31 08:51:35 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun Mar 31 08:51:35 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=29055666
scripts/rsync-generation/mksnapshot: drop gzip snapshot
gzip compresses to around 75MB which is much higher than bzip2's 57MB
The gzip snapshot was historically never used ever by the bootstrap
script, it always used and hardcoded bz2. So don't bother creating a
gzip variant.
Signed-off-by: Fabian Groffen gentoo.org>
scripts/rsync-generation/mksnapshot.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/scripts/rsync-generation/mksnapshot.sh
b/scripts/rsync-generation/mksnapshot.sh
index 66ad8a91ed..2fbdcfae0f 100755
--- a/scripts/rsync-generation/mksnapshot.sh
+++ b/scripts/rsync-generation/mksnapshot.sh
@@ -45,7 +45,6 @@ popd > /dev/null || exit 1
rm -Rf "${TMPDIR}"
COMPRS=(
- "gz:gzip -c -9"
"bz2:bzip2 -c -9"
"xz:xz -c -9"
"lz:lzip -c -9"
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: bd139cb929506a78bc3eab87e2e24a8e38b3032f Author: Fabian Groffen gentoo org> AuthorDate: Sun Mar 31 08:43:50 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Mar 31 08:43:50 2024 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bd139cb9 scripts/rsync-generation/mksnapshot: increase zstd compression level Using -9 we end up at 58MB, which is more than gzip2's 57MB. So up the level to -19 (the max, basically like how we configure the other compressors too) to get 52MB, which is still much more than xz (48MB) and lzip (47MB). Signed-off-by: Fabian Groffen gentoo.org> scripts/rsync-generation/mksnapshot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/rsync-generation/mksnapshot.sh b/scripts/rsync-generation/mksnapshot.sh index 3accd67637..66ad8a91ed 100755 --- a/scripts/rsync-generation/mksnapshot.sh +++ b/scripts/rsync-generation/mksnapshot.sh @@ -49,7 +49,7 @@ COMPRS=( "bz2:bzip2 -c -9" "xz:xz -c -9" "lz:lzip -c -9" - "zst:zstd -c -k -f -9" + "zst:zstd -c -19" ) # produce compressed variants, use as much cpu as left on the system, do
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: 34687be68301c57de465565393b2d3843a170e94 Author: Fabian Groffen gentoo org> AuthorDate: Sun Mar 31 08:27:23 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Mar 31 08:27:23 2024 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=34687be6 scripts/rsync-generation/mksnapshot: fix zstd file extension Signed-off-by: Fabian Groffen gentoo.org> scripts/rsync-generation/mksnapshot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/rsync-generation/mksnapshot.sh b/scripts/rsync-generation/mksnapshot.sh index 6fad8b895d..3accd67637 100755 --- a/scripts/rsync-generation/mksnapshot.sh +++ b/scripts/rsync-generation/mksnapshot.sh @@ -49,7 +49,7 @@ COMPRS=( "bz2:bzip2 -c -9" "xz:xz -c -9" "lz:lzip -c -9" - "zstd:zstd -k -f -9" + "zst:zstd -c -k -f -9" ) # produce compressed variants, use as much cpu as left on the system, do
[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/, sys-devel/gcc/files/
commit: a436f2219c40b0d7fab0a3aacb6e66bd1eb33908 Author: Fabian Groffen gentoo org> AuthorDate: Sat Mar 30 21:46:49 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sat Mar 30 21:46:49 2024 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a436f221 sys-devel/gcc-13.2.0-r1: switch to original source + patch for arm64-darwin Borrow patch from Homebrew to apply to 13.2.0 proper. Add two patches to help interoperability with newer OS/CLTs. Signed-off-by: Fabian Groffen gentoo.org> sys-devel/gcc/Manifest | 3 + .../files/gcc-13-darwin14-fix-duplicate-libs.patch | 28 sys-devel/gcc/files/gcc-13-darwin14-math_h.patch | 96 + sys-devel/gcc/gcc-13.2.0-r1.ebuild | 149 + 4 files changed, 276 insertions(+) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 889fc273b5..cdd006894a 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -6,8 +6,11 @@ DIST gcc-12.2-darwin-r0.tar.gz 131069986 BLAKE2B 42de71c9f0802f1a43e675d3fae7341 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 +DIST gcc-13-20240323.tar.xz 84414636 BLAKE2B cd95fc9d83d9e2477597543af5ec4e9ac82029eca6deb8cd8f82b71132e3a54e5a770be201c9e596c48f936a169f60e19979128527f41086a9a12deebbfebb26 SHA512 b25fb0efbe7346f72407ad1102d877f2ed5b40a8bff88018db4541d15cd47a849d7aeb8706be3c2ca6256fc073fe6881c8ba74db220c80b01666195d3be038d4 DIST gcc-13.2-darwin-r0.tar.gz 137958605 BLAKE2B b6777b76baf2dc007c4080c0b7a6d448223747f0cf832e493e3b903b3bdb7f87a0e2e9cf41f9355769b178a72409b1e2866b3e73b1cc33ed0aba837f3a9e66c1 SHA512 a33177bd55d228d1df93e2a029e8af5d215ad8b2ebc84a0c90df629d6f69c5de0ed1ec9dd27bc21a62362522d83bad9a8f34407b89b13321b65f513fa2202dd2 +DIST gcc-13.2.0-arm64-darwin.patch 470156 BLAKE2B 5ba9c380d488c1ceda2f4ece68701a51d1de3d82f6aa9c96f33c4f2066e7053356c00158eec524298c16c916ff1d14bb3560eedb90f09bade44970156e86c604 SHA512 4428340c79cad8f4324bb4f5962640805f45e4a2a2be165abb0386e283f863fad9dbff8eefa508ee30ba966691f604fdadfb4d42bc9cc4c29536feaae5c1f55a DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb SHA512 a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69 +DIST gcc-13.2.0-patches-14.tar.xz 46928 BLAKE2B fce23bc5315f35b04a4976550c4b44578944a1b17e40c7553351eeb8a1ef0f3a2538da5a5e1ae6f37b784ff11bbd8a44b8f6eec542be63e34d984dee69e1cd81 SHA512 d7d52bb2915fd89c06b0134bede8db939cadbb1f2dcddf923bee2c3f9f577ff9e5e986b60420d892539edf82867a0d1bd635807814bc618b06a2b37cdaca893a DIST gcc-13.2.0-patches-7.tar.xz 37064 BLAKE2B 4a8700a8d44bfaa84926f8bfd0da4c5b0c0377f47fc0679456e909f7c9029b9cf1b72c0ba0bc505d9035d5c38e27f7e5b029727eaf2bc7aca417a6be966b2f43 SHA512 f440c97e6782ecb8581d41608e31a648ac426e2d870bc1d171da7794cdeff2fd0546cae0c7214e72fd3a00ead8a5c66f3f633b670b74553a2f3a40378b51f20c DIST gcc-13.2.0.tar.xz 87858592 BLAKE2B 0034b29d3d6cc05821f0c4253ce077805943aff7b370729dd203bda57d89c107edd657eeddc2fb1e69ea15c7b0323b961f46516c7f4af89a3ccf7fea84701be2 SHA512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2 DIST gcc-14-20240225.tar.xz 87651536 BLAKE2B 01283581b8684e0dce73b2d9a586e473f3c87753435d905e193816911edc06f9bd2a8d542a95d69f47f1c884124349520f410925b13b7bb51b913e603000d32f SHA512 f424b0935d8fdcf9ff55067467eac20a518a11c2cb14928a47e1a218cde1f4238091f25861daf417d1125c5d5d5465d32fc1b3cb04504b3ca99fe27a7a7d5792 diff --git a/sys-devel/gcc/files/gcc-13-darwin14-fix-duplicate-libs.patch b/sys-devel/gcc/files/gcc-13-darwin14-fix-duplicate-libs.patch new file mode 100644 index 00..06eee94341 --- /dev/null +++ b/sys-devel/gcc/files/gcc-13-darwin14-fix-duplicate-libs.patch @@ -0,0 +1,28 @@ +https://raw.githubusercontent.com/Homebrew/formula-patches/e923a0cd6c0e60bb388e8a5b8cd1dcf9c3bf7758/gcc/gcc-xcode15-warn
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: f61f449ad80c27e5ccaba5c8baa7ff1ee524b235 Author: Fabian Groffen gentoo org> AuthorDate: Sat Mar 30 18:43:13 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sat Mar 30 18:43:13 2024 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f61f449a scripts/rsync-generation/mksnapshot: also compress using lzip lzip seems to reach a better compression ratio than xz, let's see if we can use it Signed-off-by: Fabian Groffen gentoo.org> scripts/rsync-generation/mksnapshot.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/rsync-generation/mksnapshot.sh b/scripts/rsync-generation/mksnapshot.sh index f932102daa..6fad8b895d 100755 --- a/scripts/rsync-generation/mksnapshot.sh +++ b/scripts/rsync-generation/mksnapshot.sh @@ -48,6 +48,7 @@ COMPRS=( "gz:gzip -c -9" "bz2:bzip2 -c -9" "xz:xz -c -9" + "lz:lzip -c -9" "zstd:zstd -k -f -9" )
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: e1aa6894580cd3c71f21adc3ff667c5223fc9a4c
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Mar 30 13:16:09 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Mar 30 13:16:09 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e1aa6894
scripts/bootstrap-prefix: fix econf after shellconf
CONFIG_SHELL may be unset, so only quote it, when it is, leave it unset
otherwise
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index d58d58175d..0ef1aefa3b 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -25,7 +25,7 @@ v() { echo "$@"; "$@"; }
econf() {
estatus "stage1: configuring ${PWD##*/}"
- v "${CONFIG_SHELL}" ./configure \
+ v ${CONFIG_SHELL:+"${CONFIG_SHELL}"} ./configure \
--host="${CHOST}" \
--prefix="${ROOT}"/tmp/usr \
--mandir="${ROOT}"/tmp/usr/share/man \
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: 9aa0206b6acc8c1267e73f9e1c0d6d7daec8e3f8
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Mar 30 13:05:35 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Mar 30 13:05:35 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9aa0206b
scripts/bootstrap-prefix: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 46 ++---
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 24e10f92b7..d58d58175d 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1980,8 +1980,8 @@ bootstrap_stage2() {
fi
elif ! is-rap ; then
# make sure the EPREFIX gcc shared libraries are there
- mkdir -p "${ROOT}"/usr/${CHOST}/lib/gcc
- cp "${ROOT}"/tmp/usr/${CHOST}/lib/gcc/*
"${ROOT}"/usr/${CHOST}/lib/gcc
+ mkdir -p "${ROOT}/usr/${CHOST}/lib/gcc"
+ cp "${ROOT}/tmp/usr/${CHOST}/lib/gcc"/*
"${ROOT}/usr/${CHOST}/lib/gcc"
fi
estatus "stage2 finished"
@@ -2326,10 +2326,10 @@ bootstrap_stage3() {
export USE="-git -crypt -http2"
# Portage should figure out itself what it needs to do, if anything.
- eflags="--deep --update --changed-use @system"
- einfo "running emerge ${eflags}"
- estatus "stage3: emerge ${eflags}"
- emerge --color n -v ${eflags} || return 1
+ local eflags=( "--deep" "--update" "--changed-use" "@system" )
+ einfo "running emerge ${eflags[*]}"
+ estatus "stage3: emerge ${eflags[*]}"
+ emerge --color n -v "${eflags[@]}" || return 1
# Remove anything that we don't need (compilers most likely)
einfo "running emerge --depclean"
@@ -2462,10 +2462,10 @@ EOF
# note that this code is so complex because it handles both
# C-shell as well as *sh
dvar="echo \"((${flag}=\${${flag}}))\""
- dvar="$(echo "${dvar}" | env -i HOME=$HOME $SHELL -l
2>/dev/null)"
+ dvar="$(echo "${dvar}" | env -i HOME="${HOME}" "$SHELL" -l
2>/dev/null)"
if [[ ${dvar} == *"((${flag}="?*"))" ]] ; then
badflags="${badflags} ${flag}"
- dvar=${dvar#*((${flag}=}
+ dvar=${dvar#*"((${flag}="}
dvar=${dvar%%))*}
echo " uh oh, ${flag}=${dvar} :("
else
@@ -2616,7 +2616,7 @@ necessary to add to PATH for me to find a compiler. I
start off with
PATH=${PATH} and will add anything you give me here.
EOF
[[ ${TODO} == 'noninteractive' ]] &&
ans="${usergcc%/gcc}" ||
- read -p "Where can I find your compiler? [] "
ans
+ read -r -p "Where can I find your compiler? []
" ans
case "${ans}" in
"")
: ;;
@@ -2707,7 +2707,7 @@ clue what this means, you should go with my excellent
default I've
chosen below, really!
EOF
[[ ${TODO} == 'noninteractive' ]] && ans="" ||
- read -p "How many parallel make jobs do you want? [${tcpu}] " ans
+ read -r -p "How many parallel make jobs do you want? [${tcpu}] " ans
case "${ans}" in
"")
MAKEOPTS="-j${tcpu}"
@@ -2794,11 +2794,11 @@ EOF
case "${CHOST}" in
x86_64-*|sparcv9-*) # others can't do multilib, so
don't bother
# 64-bits native
- read -p "How many bits do you want your Prefix
to target? [64] " ans
+ read -r -p "How many bits do you want your
Prefix to target? [64] " ans
;;
*)
# 32-bits native
- read -p "How many bits do you want your Prefix
to target? [32] " ans
+ read -r -p "How many bits do you want your
Prefix to target? [32] " ans
;;
esac
case "${ans}" in
@@ -2833,7 +2833,7 @@ really a Gentoo lover, aren't you? Me too! By
leveraging the exist
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: 081349d858e3f82f2a61ce72ce04f8664f08ca2e
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Mar 30 12:51:01 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Mar 30 12:51:01 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=081349d8
scripts/bootstrap-prefix: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 54 +
1 file changed, 30 insertions(+), 24 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ab724b4c70..24e10f92b7 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-#shellcheck disable=SC1091,SC2016,SC2030,SC2031,SC2038,SC2185,SC2120
+#shellcheck disable=SC1091,SC2015,SC2016,SC2030,SC2031,SC2038,SC2185,SC2120
# Copyright 2006-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
@@ -1902,8 +1902,10 @@ bootstrap_stage2() {
emerge_pkgs --nodeps "${pkgs[@]}" || return 1
# Debian multiarch supported by RAP needs ld to support sysroot.
- EXTRA_ECONF=$(rapx --with-sysroot=/) \
- emerge_pkgs --nodeps ${linker} || return 1
+ for pkg in ${linker} ; do
+ EXTRA_ECONF=$(rapx --with-sysroot=/) \
+ emerge_pkgs --nodeps "${pkg}" || return 1
+ done
# During Gentoo prefix bootstrap stage2, GCC is built with
# "--disable-bootstrap". For Darwin, it means that rather than letting
@@ -1941,7 +1943,7 @@ bootstrap_stage2() {
OVERRIDE_CXXFLAGS="${CPPFLAGS} ${OVERRIDE_CXXFLAGS}" \
TPREFIX="${ROOT}" \
PYTHON_COMPAT_OVERRIDE=python$(python_ver) \
- emerge_pkgs --nodeps ${pkg} || return 1
+ emerge_pkgs --nodeps "${pkg}" || return 1
if [[ "${pkg}" == *sys-devel/llvm* || ${pkg} ==
*sys-devel/clang* ]] ;
then
@@ -1972,7 +1974,9 @@ bootstrap_stage2() {
# multilib.eclass -- can't blame it at this point really)
# do it ourselves here to make the bootstrap continue
if [[ -x "${ROOT}"/tmp/usr/bin/${CHOST}-clang ]] ; then
- ( cd "${ROOT}"/tmp/usr/bin && ln -s clang
${CHOST}-clang && ln -s clang++ ${CHOST}-clang++ )
+ ( cd "${ROOT}"/tmp/usr/bin && \
+ ln -s clang "${CHOST}-clang" && \
+ ln -s clang++ "${CHOST}-clang++" )
fi
elif ! is-rap ; then
# make sure the EPREFIX gcc shared libraries are there
@@ -1990,11 +1994,11 @@ bootstrap_stage2_log() {
echo "CHOST: ${CHOST}"
echo "IDENT: ${CHOST_IDENTIFY}"
echo "==="
- } >> ${ROOT}/stage2.log
- bootstrap_stage2 "${@}" 2>&1 | tee -a ${ROOT}/stage2.log
+ } >> "${ROOT}"/stage2.log
+ bootstrap_stage2 "${@}" 2>&1 | tee -a "${ROOT}"/stage2.log
local ret=${PIPESTATUS[0]}
[[ ${ret} == 0 ]] && touch "${ROOT}/.stage2-finished"
- return ${ret}
+ return "${ret}"
}
bootstrap_stage3() {
@@ -2038,7 +2042,7 @@ bootstrap_stage3() {
# tmp, we basically made the system unusable, so remove python-exec
# here so we can use the python in tmp
for pef in python{,3} python{,3}-config ; do
- rm -f "${ROOT}"/tmp/usr/bin/${pef}
+ rm -f "${ROOT}/tmp/usr/bin/${pef}"
[[ ${pef} == *-config ]] && ppf=-config || ppf=
( cd "${ROOT}"/tmp/usr/bin && \
ln -s "python$(python_ver)${ppf}" "${pef}" )
@@ -2084,13 +2088,13 @@ bootstrap_stage3() {
# packages installed end up in ROOT/tmp, which means we keep using
# stage2 area and config which breaks things like binutils-config'
# path search, so don't use this
- with_stack_emerge_pkgs() {
- # keep FEATURES=stacked-prefix until we bump portage in stage1
- FEATURES="${FEATURES} stacked-prefix" \
- USE="${USE} prefix-stack" \
- PORTAGE_OVERRIDE_EPREFIX="${ROOT}/tmp" \
- emerge_pkgs "$@"
- }
+ #with_stack_emerge_pkgs() {
+ # # keep FEATURES=stacked-prefix until we bump portage in stage1
+ # FEATURES="${FEATURES} stacked-prefix" \
+ # USE="${USE} prefix-stack" \
+ # PORTAGE_OVERRIDE_EPREFIX="${ROOT
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: 8c71637fe91262dc2cdd948fe47c35c665c65eb2 Author: Fabian Groffen gentoo org> AuthorDate: Sat Mar 30 12:39:22 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sat Mar 30 12:39:22 2024 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8c71637f scripts/bootstrap-prefix: bleh, fix shellcheck Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 447f81274c..ab724b4c70 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#shellcheck disable=SCSC1091,SC2016,SC2030,SC2031,SC2038,SC2185,SC2120 +#shellcheck disable=SC1091,SC2016,SC2030,SC2031,SC2038,SC2185,SC2120 # Copyright 2006-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: 9473056957f34a82c177b7b42cd0c0617f43bdc5
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Mar 30 12:38:01 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Mar 30 12:38:01 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=94730569
scripts/bootstrap-prefix: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 41 +
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 15e2c1098e..447f81274c 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-#shellcheck disable=SC2016,SC2030,SC2031,SC2038,SC2185,SC2120
+#shellcheck disable=SCSC1091,SC2016,SC2030,SC2031,SC2038,SC2185,SC2120
# Copyright 2006-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
@@ -1088,8 +1088,6 @@ bootstrap_python() {
fix_config_sub
- local myconf=""
-
case ${CHOST} in
(x86_64-*-*|sparcv9-*-*)
export CFLAGS="-m64"
@@ -1103,7 +1101,9 @@ bootstrap_python() {
*-linux*)
# Bug 382263: make sure Python will know about the
libdir in use for
# the current arch
- libdir="-L/usr/lib/$(gcc ${CFLAGS}
-print-multi-os-directory)"
+ local -a flgarg
+ read -r -a flgarg <<< "${CFLAGS}"
+ libdir="-L/usr/lib/$(gcc "${flgarg[@]}"
-print-multi-os-directory)"
;;
x86_64-*-solaris*|sparcv9-*-solaris*)
# Like above, make Python know where GCC's 64-bits
@@ -1157,7 +1157,7 @@ bootstrap_python() {
--disable-ipv6 \
--disable-shared \
--libdir="${ROOT}"/tmp/usr/lib \
- ${myconf} || return 1
+ || return 1
emake || return 1
einfo "Installing ${A%.tar.*}"
@@ -1178,7 +1178,7 @@ bootstrap_cmake_core() {
einfo "Bootstrapping ${A%.tar.*}"
- efetch https://github.com/Kitware/CMake/releases/download/v${PV}/${A} \
+ efetch "https://github.com/Kitware/CMake/releases/download/v${PV}/${A};
\
|| return 1
einfo "Unpacking ${A%.tar.*}"
@@ -1186,7 +1186,7 @@ bootstrap_cmake_core() {
rm -rf "${S}"
mkdir -p "${S}" || return 1
cd "${S}" || return 1
- gzip -dc "${DISTDIR}"/${A} | tar -xf -
+ gzip -dc "${DISTDIR}/${A}" | tar -xf -
[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
S="${S}"/cmake-${PV}
cd "${S}" || return 1
@@ -1212,10 +1212,10 @@ bootstrap_cmake_core() {
# later on, so kill it in the installed version
ver=${A%-*} ; ver=${ver%.*}
sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-
"${ROOT}"/tmp/usr/share/${ver}/Modules/Platform/Apple-GNU-*.cmake || die
+
"${ROOT}/tmp/usr/share/${ver}/Modules/Platform"/Apple-GNU-*.cmake || die
# disable isysroot usage with clang as well
sed -i -e '/_SYSROOT_FLAG/d' \
-
"${ROOT}"/tmp/usr/share/${ver}/Modules/Platform/Apple-Clang.cmake || die
+
"${ROOT}/tmp/usr/share/${ver}/Modules/Platform"/Apple-Clang.cmake || die
einfo "${A%.tar.*} bootstrapped"
}
@@ -1231,7 +1231,7 @@ bootstrap_zlib_core() {
einfo "Bootstrapping ${A%.tar.*}"
- efetch ${DISTFILES_G_O}/distfiles/${A} || return 1
+ efetch "${DISTFILES_G_O}/distfiles/${A}" || return 1
einfo "Unpacking ${A%.tar.*}"
export S="${PORTAGE_TMPDIR}/zlib-${PV}"
@@ -1242,7 +1242,7 @@ bootstrap_zlib_core() {
*.tar.gz) decomp=gzip ;;
*)decomp=bzip2 ;;
esac
- ${decomp} -dc "${DISTDIR}"/${A} | tar -xf -
+ ${decomp} -dc "${DISTDIR}/${A}" | tar -xf -
[[ ${PIPESTATUS[*]} == '0 0' ]] || return 1
S="${S}"/zlib-${PV}
cd "${S}" || return 1
@@ -1356,7 +1356,7 @@ bootstrap_make() {
bootstrap_gnu make 4.2.1 || return 1
if [[ ${MAKE} == gmake ]] ; then
# make make available as gmake
- ( cd ${ROOT}/tmp/usr/bin && ln -s make gmake )
+ ( cd "${ROOT}"/tmp/usr/bin && ln -s make gmake )
fi
}
@@ -1464,7 +1464,7 @@ bootstrap_stage1() {
# See comments in do_tree().
local portroot=${PORTDIR%/*}
- mkdir -p "${ROOT}"/tmp/${portroot#${ROOT}/}
+ mkdir -p "${R
[gentoo-commits] repo/proj/prefix:master commit in: scripts/, scripts/rsync-generation/
commit: 00075c640010369a4cb9c5d6ae9dba37c7cc47fb
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Mar 30 12:26:13 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Mar 30 12:26:28 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=00075c64
scripts/bootstrap-prefix: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh| 59 +++---
scripts/rsync-generation/mksnapshot.sh | 2 +-
2 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 2e4f542440..15e2c1098e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -43,7 +43,7 @@ emake() {
else
estatus "stage1: building ${PWD##*/}"
fi
- read -a makeopts <<< "${MAKEOPTS}"
+ read -r -a makeopts <<< "${MAKEOPTS}"
v "${MAKE}" "${makeopts[@]}" "$@" || return 1
}
@@ -101,7 +101,7 @@ efetch() {
done
locs=( "${locs[@]}" "$1" )
- read -a fetchcmd <<< "${FETCH_COMMAND}"
+ read -r -a fetchcmd <<< "${FETCH_COMMAND}"
for loc in "${locs[@]}" ; do
v "${fetchcmd[@]}" "${loc}" < /dev/null
[[ -f ${1##*/} ]] && break
@@ -811,7 +811,7 @@ bootstrap_gnu() {
fi
URL=${GNU_URL}/${PN}/${A}
- efetch ${URL} || continue
+ efetch "${URL}" || continue
einfo "Unpacking ${A%.tar.*}"
S="${PORTAGE_TMPDIR}/${PN}-${PV}"
@@ -850,12 +850,12 @@ bootstrap_gnu() {
# have a suffix. Remove suffix by copy, not move, to not
# trigger refetch on repeated invocations of this script.
if [[ -f "${DISTDIR}/${tar_patch_file}?${tar_patch_id}" ]]; then
- cp ${DISTDIR}/${tar_patch_file}{?${tar_patch_id},} ||
return 1
+ cp "${DISTDIR}/${tar_patch_file}"{"?${tar_patch_id}",}
|| return 1
fi
- patch -p1 < ${DISTDIR}/${tar_patch_file} || return 1
+ patch -p1 < "${DISTDIR}/${tar_patch_file}" || return 1
fi
- local myconf=""
+ local -a myconf
if [[ ${PN} == "make" && ${PV} == "4.2.1" ]] ; then
if [[ ${CHOST} == *-linux-gnu* ]] ; then
# force this, macros aren't set correctly with newer
glibc
@@ -887,25 +887,27 @@ bootstrap_gnu() {
# so just don't set it at all.
# Solaris 11 has a messed up prce installation. We don't need
# it anyway, so just disable it
- myconf="${myconf} --disable-perl-regexp"
+ myconf+=( "--disable-perl-regexp" )
fi
if [[ ${PN} == "mpfr" || ${PN} == "mpc" || ${PN} == "gcc" ]] ; then
[[ -e "${ROOT}"/tmp/usr/include/gmp.h ]] \
- && myconf="${myconf} --with-gmp=${ROOT}/tmp/usr"
+ && myconf+=( "--with-gmp=${ROOT}/tmp/usr" )
fi
if [[ ${PN} == "mpc" || ${PN} == "gcc" ]] ; then
[[ -e "${ROOT}"/tmp/usr/include/mpfr.h ]] \
- && myconf="${myconf} --with-mpfr=${ROOT}/tmp/usr"
+ && myconf+=( "--with-mpfr=${ROOT}/tmp/usr" )
fi
if [[ ${PN} == "gcc" ]] ; then
[[ -e "${ROOT}"/tmp/usr/include/mpc.h ]] \
- && myconf="${myconf} --with-mpc=${ROOT}/tmp/usr"
+ && myconf+=( "--with-mpc=${ROOT}/tmp/usr" )
- myconf="${myconf} --enable-languages=c,c++"
- myconf="${myconf} --disable-bootstrap"
- myconf="${myconf} --disable-multilib"
- myconf="${myconf} --disable-nls"
+ myconf+=(
+ "--enable-languages=c,c++"
+ "--disable-bootstrap"
+ "--disable-multilib"
+ "--disable-nls"
+ )
export CFLAGS="-O1 -pipe"
export CXXFLAGS="-O1 -pipe"
@@ -917,7 +919,7 @@ bootstrap_gnu() {
# On e.g. musl systems bash will crash with a malloc error if we use
# bash' internal malloc, so disable it during it this s
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: fac47bdfea3b3ecd54abd87cc7ee9ca653aad5f7
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Mar 30 12:13:25 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Mar 30 12:13:25 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fac47bdf
scripts/bootstrap-prefix: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 40
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6276ccb8d6..2e4f542440 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-#shellcheck disable=SC2016,SC2030,SC2038,SC2185,SC2120
+#shellcheck disable=SC2016,SC2030,SC2031,SC2038,SC2185,SC2120
# Copyright 2006-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
@@ -43,7 +43,8 @@ emake() {
else
estatus "stage1: building ${PWD##*/}"
fi
- v "${MAKE}" ${MAKEOPTS} "$@" || return 1
+ read -a makeopts <<< "${MAKEOPTS}"
+ v "${MAKE}" "${makeopts[@]}" "$@" || return 1
}
efetch() {
@@ -100,8 +101,9 @@ efetch() {
done
locs=( "${locs[@]}" "$1" )
+ read -a fetchcmd <<< "${FETCH_COMMAND}"
for loc in "${locs[@]}" ; do
- v ${FETCH_COMMAND} "${loc}" < /dev/null
+ v "${fetchcmd[@]}" "${loc}" < /dev/null
[[ -f ${1##*/} ]] && break
done
if [[ ! -f ${1##*/} ]] ; then
@@ -459,7 +461,7 @@ bootstrap_profile() {
fsdk="$(readlink -f "${SDKPATH}")"
osvers="$(sw_vers -productVersion)"
if [[ ${osvers%%.*} -le 10 ]] ; then
- osvers=$(echo ${osvers} | cut -d'.'
-f1-2)
+ osvers=$(echo "${osvers}" | cut -d'.'
-f1-2)
else
osvers=${osvers%%.*}
fi
@@ -604,7 +606,7 @@ bootstrap_startscript() {
fi
einfo "Trying to emerge the shell you use, if necessary by running:"
einfo "emerge -u ${theshell}"
- if ! emerge -u ${theshell} ; then
+ if ! emerge -u "${theshell}" ; then
eerror "Your shell is not available in portage, hence we
cannot" > /dev/stderr
eerror "automate starting your prefix, set SHELL and rerun this
script" > /dev/stderr
return 1
@@ -617,7 +619,7 @@ bootstrap_startscript() {
local minPATH
local theirPATH
minPATH="preamble:${BASH%/*}:postlude"
- theirPATH="$(echo 'echo "${PATH}"' | env LS_COLORS= PATH="${minPATH}"
$SHELL -l 2>/dev/null | grep "preamble:.*:postlude")"
+ theirPATH="$(echo 'echo "${PATH}"' | env LS_COLORS= PATH="${minPATH}"
"${SHELL}" -l 2>/dev/null | grep "preamble:.*:postlude")"
if [[ ${theirPATH} != *"preamble:"*":postlude"* ]] ; then
einfo "WARNING: your shell initialisation (.cshrc, .bashrc,
.profile)"
einfo " seems to overwrite your PATH, this effectively
kills"
@@ -649,7 +651,7 @@ bootstrap_portage() {
A=prefix-portage-${PV}.tar.bz2
einfo "Bootstrapping ${A%.tar.*}"
- efetch ${DISTFILES_URL}/${A} || return 1
+ efetch "${DISTFILES_URL}/${A}" || return 1
einfo "Unpacking ${A%.tar.*}"
export S="${PORTAGE_TMPDIR}"/portage-${PV}
@@ -696,7 +698,7 @@ bootstrap_portage() {
emake install || return 1
cd "${ROOT}" || return 1
- rm -Rf ${ptmp} >& /dev/null
+ rm -Rf "${ptmp}" >& /dev/null
# Some people will skip the tree() step and hence var/log is not created
# As such, portage complains..
@@ -708,8 +710,8 @@ bootstrap_portage() {
local tmpportdir=${ROOT}/tmp/${PORTDIR#"${ROOT}"}
[[ -e "${tmpportdir}" ]] || ln -s "${PORTDIR}" "${tmpportdir}"
for d in "${ROOT}"/tmp/usr/lib/python$(python_ver); do
- [[ -e ${d}/portage ]] || ln -s
"${ROOT}"/tmp/usr/lib/portage/lib/portage ${d}/portage
- [[ -e ${d}/_emerge ]] || ln -s
"${ROOT}"/tmp/usr/lib/portage/lib/_emerge ${d}/_emerge
+
[gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
commit: 198171d5f421bdf77b91f1acf9830690fa69fb12 Author: Fabian Groffen gentoo org> AuthorDate: Sat Mar 30 11:59:03 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Sat Mar 30 11:59:03 2024 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=198171d5 scripts/auto-bootstraps/process_uploads: silence SC1091 the local script being sourced is supposed for local instance overrides, and thus not available in the tree Signed-off-by: Fabian Groffen gentoo.org> scripts/auto-bootstraps/process_uploads.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto-bootstraps/process_uploads.sh b/scripts/auto-bootstraps/process_uploads.sh index fae40dddef..8a71d296a4 100755 --- a/scripts/auto-bootstraps/process_uploads.sh +++ b/scripts/auto-bootstraps/process_uploads.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +#shellcheck disable=SC1091 UPLOADDIR="./uploads" RESULTSDIR="./results"
[gentoo-commits] repo/proj/prefix:master commit in: .github/workflows/
commit: 2e3f842a40866cead42486b306045ce4d63c7e7f
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Mar 30 11:55:52 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Mar 30 11:55:52 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2e3f842a
github: run latest shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
.github/workflows/scripts.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/scripts.yml b/.github/workflows/scripts.yml
index 461bd8d036..ec027738e5 100644
--- a/.github/workflows/scripts.yml
+++ b/.github/workflows/scripts.yml
@@ -18,6 +18,6 @@ jobs:
bash -n "${script}"
done
- name: Test scripts with ShellCheck
- uses: ludeeus/action-shellcheck@1.1.0
+ uses: ludeeus/action-shellcheck@master
with:
scandir: "./scripts"
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: b117cb02bf01f1db7244db5b569cc9d7d32ca866
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Mar 30 11:46:31 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Mar 30 11:46:31 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b117cb02
scripts/bootstrap-prefix: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 69 -
1 file changed, 37 insertions(+), 32 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 351cf89f20..6276ccb8d6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1250,7 +1250,7 @@ bootstrap_zlib_core() {
[[ ${PV} == 1.2.5 ]] || read -a makeopts <<< "${MAKEOPTS}"
einfo "Compiling ${A%.tar.*}"
- CHOST= ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/tmp/usr || return
1
+ CHOST='' ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/tmp/usr ||
return 1
MAKEOPTS=''
emake "${makeopts[@]}" || return 1
@@ -2022,7 +2022,7 @@ bootstrap_stage3() {
get_libdir() {
local l
- l="$(portageq envvar LIBDIR_$(portageq envvar ABI) 2>/dev/null)"
+ l="$(portageq envvar "LIBDIR_$(portageq envvar ABI)"
2>/dev/null)"
[[ -z ${l} ]] && l=lib
echo "${l}"
}
@@ -2092,6 +2092,8 @@ bootstrap_stage3() {
cp -a "${ROOT}"{/tmp,}/usr/share/portage
fi
+ read -a linker_pkgs <<< "${linker}"
+
if is-rap ; then
# We need ${ROOT}/usr/bin/perl to merge glibc.
if [[ ! -x "${ROOT}"/usr/bin/perl ]]; then
@@ -2156,10 +2158,10 @@ bootstrap_stage3() {
pkgs=(
sys-devel/binutils-config
sys-libs/zlib
- ${linker}
+ "${linker_pkgs[@]}"
)
# use the new dynamic linker in place of rpath from now on.
- RAP_DLINKER=$(echo "${ROOT}"/$(get_libdir)/ld*.so.[0-9] | sed
s"!${ROOT}/$(get_libdir)/ld-lsb.*!!")
+ RAP_DLINKER=$(echo "${ROOT}/$(get_libdir)"/ld*.so.[0-9] | sed
s"!${ROOT}/$(get_libdir)/ld-lsb.*!!")
export CPPFLAGS="--sysroot=${ROOT}"
export LDFLAGS="-Wl,--dynamic-linker=${RAP_DLINKER}"
# make sure these flags are used even in places that
ignore/strip CPPFLAGS/LDFLAGS
@@ -2189,7 +2191,7 @@ bootstrap_stage3() {
sys-devel/flex
sys-devel/binutils-config
sys-libs/zlib
- ${linker}
+ "${linker_pkgs[@]}"
)
pre_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
@@ -2209,9 +2211,9 @@ bootstrap_stage3() {
# setup for a scenario where python doesn't live in the target
# prefix and no helpers are available
( cd "${ROOT}"/usr/bin && test ! -e python && \
- ln -s "${ROOT}"/tmp/usr/bin/python$(python_ver) )
+ ln -s "${ROOT}/tmp/usr/bin/python$(python_ver)"
"python$(python_ver)" )
# in addition, avoid collisions
- rm -Rf "${ROOT}"/tmp/usr/lib/python$(python_ver)/site-packages/clang
+ rm -Rf "${ROOT}/tmp/usr/lib/python$(python_ver)/site-packages/clang"
# Try to get ourself out of the mud, bug #575324
EXTRA_ECONF="--disable-compiler-version-checks $(rapx '--disable-lto
--disable-bootstrap')" \
@@ -2229,7 +2231,7 @@ bootstrap_stage3() {
# need special care, it depends on texinfo, #717786
pre_emerge_pkgs --nodeps sys-apps/gawk || return 1
- ( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python$(python_ver)
)
+ ( cd "${ROOT}"/usr/bin && test ! -e python && rm -f
"python$(python_ver)" )
# Use $ROOT tools where possible from now on.
if [[ $(readlink "${ROOT}"/bin/sh) == "${ROOT}/tmp/"* ]] ; then
rm -f "${ROOT}"/bin/sh
@@ -2342,7 +2344,6 @@ set_helper_vars() {
GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"}
SNAPSHOT_HOST=$(rapx http://distfiles.gentoo.org
http://rsync.prefix.bitzolder.nl)
SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"}
-
GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other;
export MAKE CONFIG_SHELL
}
@@ -2656,7 +2657,7 @@ EOF
*-solaris*)
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: 9d09093d2d36c4bf651594f209aadc2e79da7a8e
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Mar 30 11:15:09 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Mar 30 11:15:09 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9d09093d
scripts/rsync-generation/mksnapshot: start generating Zstd snapshots
Prepare for Zstandard becoming a standard, replacing another compressor.
Signed-off-by: Fabian Groffen gentoo.org>
scripts/rsync-generation/mksnapshot.sh | 55 --
1 file changed, 33 insertions(+), 22 deletions(-)
diff --git a/scripts/rsync-generation/mksnapshot.sh
b/scripts/rsync-generation/mksnapshot.sh
index 22808d58d4..1feece5577 100755
--- a/scripts/rsync-generation/mksnapshot.sh
+++ b/scripts/rsync-generation/mksnapshot.sh
@@ -44,20 +44,29 @@ popd > /dev/null || exit 1
rm -Rf "${TMPDIR}"
-# be nice
-nice -n19 bzip2 -c -9 "${SNAME}" > "${SNAME}".bz2 &
-nice -n19 xz-c -9 "${SNAME}" > "${SNAME}".xz &
-nice -n19 gzip -c -9 "${SNAME}" > "${SNAME}".gz &
+COMPRS=(
+ "gz:gzip -c -9"
+ "bz2:bzip2 -c -9"
+ "xz:xz -c -9"
+ "zstd:zstd -k -f -9"
+)
+
+# produce compressed variants, use as much cpu as left on the system, do
+# all in parallel
+for compr in "${COMPRS[@]}" ; do
+ read -a args <<< "${compr#*:}"
+ nice -n19 "${args[@]}" "${SNAME}" > "${SNAME}.${compr%%:*}" &
+done
wait
# generate accompanying meta files
-md5sum "${SNAME##*/}" > "${SNAME}".xz.umd5sum
-md5sum "${SNAME##*/}".xz > "${SNAME}".xz.md5sum
-md5sum "${SNAME##*/}" > "${SNAME}".bz2.umd5sum
-md5sum "${SNAME##*/}".bz2 > "${SNAME}".bz2.md5sum
-md5sum "${SNAME##*/}" > "${SNAME}".gz.umd5sum
-md5sum "${SNAME##*/}".bz2 > "${SNAME}".gz.md5sum
-# use passphrase-fd to pass password
+for compr in "${COMPRS[@]}" ; do
+ compr=${compr%%:*}
+ md5sum "${SNAME##*/}" > "${SNAME}.${compr}.umd5sum"
+ md5sum "${SNAME##*/}.${compr}" > "${SNAME}.${compr}.md5sum"
+done
+
+# create GPG detached signature, use passphrase-fd to pass password
gpgopts=(
"--quiet"
"--batch"
@@ -68,18 +77,20 @@ gpgopts=(
"--detach-sign"
"--armor"
)
-gpg "${gpgopts[@]}" -o "${SNAME}".xz.gpgsig "${SNAME}".xz \
- < "${SCRIPTLOC}"/autosigner.pwd
-gpg "${gpgopts[@]}" -o "${SNAME}".bz2.gpgsig "${SNAME}".bz2 \
- < "${SCRIPTLOC}"/autosigner.pwd
-gpg "${gpgopts[@]}" -o "${SNAME}".gz.gpgsig "${SNAME}".gz \
- < "${SCRIPTLOC}"/autosigner.pwd
-
-# we no longer need the tar
+for compr in "${COMPRS[@]}" ; do
+ compr=${compr%%:*}
+ gpg "${gpgopts[@]}" -o "${SNAME}.${compr}.gpgsig" "${SNAME}.${compr}" \
+ < "${SCRIPTLOC}"/autosigner.pwd
+done
+
+# we no longer need the (original/uncompressed) tar
rm "${SNAME}"
# make convenience symlinks
-for f in {xz,bz2,gz}{,.gpgsig,.md5sum,.umd5sum} ; do
- rm "portage-latest.tar.$f"
- ln -s "${SNAME##*/}.$f" "portage-latest.tar.$f"
+for compr in "${COMPRS[@]}" ; do
+ compr=${compr%%:*}
+ for f in "${compr}"{,.gpgsig,.md5sum,.umd5sum} ; do
+ rm "portage-latest.tar.${f}"
+ ln -s "${SNAME##*/}.${f}" "portage-latest.tar.${f}"
+ done
done
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: c509de99f99cdd760a80dcef64e9d9051c2ca71a
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Mar 29 17:16:54 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Mar 29 17:16:54 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c509de99
scripts/bootstrap-prefix: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 74 -
1 file changed, 39 insertions(+), 35 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 0e3bf1ef75..351cf89f20 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
+#shellcheck disable=SC2016,SC2030,SC2038,SC2185,SC2120
# Copyright 2006-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
@@ -200,13 +201,15 @@ configure_toolchain() {
esac
;;
*-darwin*)
+ local ccvers
+ local llvm_deps
einfo "Triggering Darwin with LLVM/Clang toolchain"
# for compilers choice, see bug:
# https://bugs.gentoo.org/show_bug.cgi?id=538366
compiler_stage1="sys-apps/darwin-miscutils"
compiler_type="clang"
- local ccvers="$(unset CHOST; ${CC} --version
2>/dev/null)"
- local llvm_deps="dev-build/ninja"
+ ccvers="$(unset CHOST; ${CC} --version 2>/dev/null)"
+ llvm_deps="dev-build/ninja"
case "${ccvers}" in
*"Apple clang version "*|*"Apple LLVM version
"*)
# this is Clang, recent enough to
compile recent clang
@@ -683,8 +686,8 @@ bootstrap_portage() {
einfo "Compiling ${A%.tar.*}"
econf \
--with-offset-prefix="${ROOT}"/tmp \
- --with-portage-user="`id -un`" \
- --with-portage-group="`id -gn`" \
+ --with-portage-user="$(id -un)" \
+ --with-portage-group="$(id -gn)" \
--with-extra-path="${PATH}" \
|| return 1
emake || return 1
@@ -980,7 +983,7 @@ bootstrap_gnu() {
emake install || return 1
fi
- cd "${ROOT}"
+ cd "${ROOT}" || return 1
rm -Rf "${S}"
einfo "${A%.tar.*} successfully bootstrapped"
}
@@ -1242,13 +1245,13 @@ bootstrap_zlib_core() {
# compiler to 32-bits code generation if requested here
export CC="${CC} -m32"
fi
- local makeopts=( ${MAKEOPTS} )
+ local makeopts=()
# 1.2.5 suffers from a concurrency problem
- [[ ${PV} == 1.2.5 ]] && makeopts=()
+ [[ ${PV} == 1.2.5 ]] || read -a makeopts <<< "${MAKEOPTS}"
einfo "Compiling ${A%.tar.*}"
CHOST= ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/tmp/usr || return
1
- MAKEOPTS=
+ MAKEOPTS=''
emake "${makeopts[@]}" || return 1
einfo "Installing ${A%.tar.*}"
@@ -1502,8 +1505,8 @@ bootstrap_stage1() {
|| [[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] \
|| (bootstrap_m4) || return 1
[[ -x ${ROOT}/tmp/usr/bin/bison ]] \
- || [[ $(bison --version 2>&1) == *GNU" "Bison") "2.[3-7]* ]] \
- || [[ $(bison --version 2>&1) == *GNU" "Bison") "[3-9]* ]] \
+ || [[ $(bison --version 2>&1) == *"GNU Bison) "2.[3-7]* ]] \
+ || [[ $(bison --version 2>&1) == *"GNU Bison) "[3-9]* ]] \
|| (bootstrap_bison) || return 1
if [[ ! -x ${ROOT}/tmp/usr/bin/uniq ]]; then
# If the system has a uniq, let's use it to test whether
@@ -1612,12 +1615,12 @@ bootstrap_stage1() {
# Portage) and binutils use it
# note that this actually breaks the concept of stage1, this will be
# compiled for the target prefix
- for zlib in ${ROOT}/tmp/usr/lib*/libz.* ; do
+ for zlib in "${ROOT}"/tmp/usr/lib*/libz.* ; do
[[ -e ${zlib} ]] && break
zlib=
done
[[ -n ${zlib} ]] || (bootstrap_zlib) || return 1
- for libffi in ${ROOT}/tmp/usr/lib*/libffi.* ; do
+ for libffi in "${ROOT}"/tmp/usr/lib*/libffi.* ; do
[[ -e ${libffi} ]] && break
libffi=
done
@@ -1661,9 +16
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: 27837af6735978cb95e440521fbe37861aad21ff
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Mar 29 11:53:46 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Mar 29 11:53:46 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=27837af6
stage1: allow libz to be in lib64 or something for Gentoo host shortcut
Fix by flow from PR #35 on github.
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index cb15d53cd6..0e3bf1ef75 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1612,7 +1612,7 @@ bootstrap_stage1() {
# Portage) and binutils use it
# note that this actually breaks the concept of stage1, this will be
# compiled for the target prefix
- for zlib in ${ROOT}/tmp/usr/lib/libz.* ; do
+ for zlib in ${ROOT}/tmp/usr/lib*/libz.* ; do
[[ -e ${zlib} ]] && break
zlib=
done
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: fc8ff18f3a1a54c592dcfdb3a5c0a514de6f0ad7
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Mar 29 11:51:23 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Mar 29 11:51:23 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fc8ff18f
scripts/bootstrap-prefix: fix Gentoo host shortcut path
Thanks flow for pointing out.
Closes: https://bugs.gentoo.org/927957
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c3daad42ca..cb15d53cd6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1591,8 +1591,10 @@ bootstrap_stage1() {
# Host compiler can output a variety of libdirs. At stage1,
# they should be the same as lib. Otherwise libffi may not be
- # found by python.
- if is-rap ; then
+ # found by python. Don't do this when we're using a Gentoo host to
+ # speed up bootstrapping, it should be good, and we shouldn't be
+ # touching the host either. Bug #927957
+ if is-rap && [[ ! -L "${ROOT}"/tmp ]] ; then
[[ -d ${ROOT}/tmp/usr/lib ]] || mkdir -p "${ROOT}"/tmp/usr/lib
local libdir
for libdir in lib64 lib32 libx32; do
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: 6d11c0bf665e15ee3393ffb92ca03214f73003b3
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Mar 29 11:45:34 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Mar 29 11:45:34 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6d11c0bf
scripts/bootstrap-prefix: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-prefix.sh | 93 -
1 file changed, 50 insertions(+), 43 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 6440b4563e..c3daad42ca 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -58,7 +58,7 @@ efetch() {
if [[ ${OFFLINE_MODE} ]] ; then
echo "I need ${1##*/} from $1 in $DISTDIR, can you give
it to me?"
- read
+ read -r
[[ -e ${DISTDIR}/${1##*/} ]] && return 0
# Give fetch a try
fi
@@ -66,15 +66,15 @@ efetch() {
if [[ -z ${FETCH_COMMAND} ]] ; then
# Try to find a download manager, we only deal with
wget,
# curl, FreeBSD's fetch and ftp.
- if [[ x$(type -t wget) == "xfile" ]] ; then
+ if [[ $(type -t wget) == "file" ]] ; then
FETCH_COMMAND="wget"
[[ $(wget -h) == *"--no-check-certificate"* ]] \
&& FETCH_COMMAND+="
--no-check-certificate"
- elif [[ x$(type -t curl) == "xfile" ]] ; then
+ elif [[ $(type -t curl) == "file" ]] ; then
FETCH_COMMAND="curl -f -L -O"
- elif [[ x$(type -t fetch) == "xfile" ]] ; then
+ elif [[ $(type -t fetch) == "file" ]] ; then
FETCH_COMMAND="fetch"
- elif [[ x$(type -t ftp) == "xfile" ]] ; then
+ elif [[ $(type -t ftp) == "file" ]] ; then
FETCH_COMMAND="ftp"
else
eerror "no suitable download manager found!"
@@ -86,7 +86,7 @@ efetch() {
einfo "Fetching ${1##*/}"
estatus "stage1: fetching ${1##*/}"
- pushd "${DISTDIR}" > /dev/null
+ pushd "${DISTDIR}" > /dev/null || exit 1
# Try for mirrors first, fall back to distfiles, then try given
location
local locs=( )
@@ -107,7 +107,7 @@ efetch() {
eerror "downloading ${1} failed!"
return 1
fi
- popd > /dev/null
+ popd > /dev/null || exit 1
fi
return 0
}
@@ -311,7 +311,7 @@ bootstrap_setup() {
else
getent passwd > "${ROOT}"/etc/passwd
# add user if it's not in /etc/passwd, bug
#766417
- getent passwd $(id -un) >> "${ROOT}"/etc/passwd
+ getent passwd "$(id -un)" >>
"${ROOT}"/etc/passwd
fi
fi
if [[ ! -f ${ROOT}/etc/group ]]; then
@@ -320,7 +320,7 @@ bootstrap_setup() {
else
getent group > "${ROOT}"/etc/group
# add group if it's not in /etc/group, bug
#766417
- getent group $(id -gn) >> "${ROOT}"/etc/group
+ getent group "$(id -gn)" >> "${ROOT}"/etc/group
fi
fi
[[ -f ${ROOT}/etc/resolv.conf ]] || ln -s
{,"${ROOT}"}/etc/resolv.conf
@@ -331,10 +331,11 @@ bootstrap_setup() {
}
bootstrap_profile() {
- local profile=""
+ local profile
+ local profile_linux
# 2.6.32.1 -> 2*256^3 + 6*256^2 + 32 * 256 + 1 = 33955841
- kver() { uname -r|cut -d\- -f1|awk -F. '{for (i=1; i<=NF;
i++){s+=lshift($i,(4-i)*8)};print s}'; }
+ kver() { uname -r|cut -d- -f1|awk -F. '{for (i=1; i<=NF;
i++){s+=lshift($i,(4-i)*8)};print s}'; }
# >=glibc-2.20 requires >=linux-2.6.32.
profile-kernel() {
if [[ $(kver) -ge 50462720 ]] ; then # 3.2
@@ -349,9 +350,9 @@ bootstrap_profile() {
}
if is-rap ; then
- local
profile_linux=default/linux/ARCH
[gentoo-commits] proj/portage-utils:master commit in: /
commit: cc4de0decf915ee76fcbf4420f15e68e6d10a17a
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Mar 29 11:19:52 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Mar 29 11:19:52 2024 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=cc4de0de
qmanifest: avoid out of bounds access in append_list macro
Empty strings, or those being just whitespace were not handled
correctly. Thanks bstaletic in PR #19 for pointing this out. Avoid
running under the original string pointer and skip any checks for
strings that are too short to match anything in particular. This sweeps
an edgecase of just a single whitespace char under the carpet -- which
is just about fine, for it needs not to be handled for any legitimate
case.
Signed-off-by: Fabian Groffen gentoo.org>
qmanifest.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/qmanifest.c b/qmanifest.c
index 2bb0f11..5246fc4 100644
--- a/qmanifest.c
+++ b/qmanifest.c
@@ -1421,13 +1421,15 @@ verify_manifest(
#define append_list(STR) \
if (strncmp(STR, "TIMESTAMP ", 10) != 0 || strncmp(STR, "DIST ", 5) !=
0) {\
char *endp = STR + strlen(STR) - 1;\
- while (isspace(*endp))\
+ while (endp > STR && isspace(*endp))\
*endp-- = '\0';\
if (elemslen == elemssize) {\
elemssize += LISTSZ;\
elems = xrealloc(elems, elemssize * sizeof(elems[0]));\
}\
- if (strncmp(STR, "IGNORE ", 7) == 0) {\
+ if (endp - STR < 4) {\
+ /* avoid doing comparisons, none will match */\
+ } else if (strncmp(STR, "IGNORE ", 7) == 0) {\
STR[5] = 'I';\
elems[elemslen] = xstrdup(STR + 5);\
elemslen++;\
[gentoo-commits] proj/portage-utils:master commit in: tests/copy_file/
commit: 26fe1cf9fc9d99e2ae9f4add01bccd1938656712 Author: Boris Staletic protonmail com> AuthorDate: Thu Mar 28 22:08:32 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Fri Mar 29 10:58:26 2024 + URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=26fe1cf9 tests: Avoid leaking buf in copy_file/test.c Signed-off-by: Fabian Groffen gentoo.org> tests/copy_file/test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/copy_file/test.c b/tests/copy_file/test.c index 4482237..aa0edaa 100644 --- a/tests/copy_file/test.c +++ b/tests/copy_file/test.c @@ -72,6 +72,7 @@ int main(int argc, char *argv[]) assert(buf != NULL); memset(buf, 0xaf, len); testone(buf, len); + free(buf); return 0; }
[gentoo-commits] proj/portage-utils:master commit in: tests/atom_explode/
commit: 06d9fb823e99cce2c66c5c4888b91538e66d166e Author: Boris Staletic protonmail com> AuthorDate: Thu Mar 28 20:30:40 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Fri Mar 29 10:58:25 2024 + URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=06d9fb82 tests: avoid leaking buf after exiting the loop in atom_explode Signed-off-by: Fabian Groffen gentoo.org> tests/atom_explode/test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/atom_explode/test.c b/tests/atom_explode/test.c index b794d3b..ff1c58d 100644 --- a/tests/atom_explode/test.c +++ b/tests/atom_explode/test.c @@ -64,6 +64,7 @@ int main(int argc, char *argv[]) boom(a, buf); atom_implode(a); } + free(buf); } return EXIT_SUCCESS;
[gentoo-commits] proj/portage-utils:master commit in: /
commit: ad4eb81f3fda3b3df705c48c875c901f814ec74a
Author: Boris Staletic protonmail com>
AuthorDate: Thu Mar 28 19:57:26 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Mar 29 10:58:23 2024 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ad4eb81f
qlop: Do not leak avgs array in predict mode
Previously, `values_set(merge_averages, avgs)` would allocate `avgs`,
then it would be used in `array_for_each(atoms, i, atom)`, but a call to
`xarrayfree_int(avgs)` was missing after the loop.
Hopefully, this, along with #26, will solve the issues from #19.
Signed-off-by: Fabian Groffen gentoo.org>
qlop.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/qlop.c b/qlop.c
index cfad246..ae0bc3b 100644
--- a/qlop.c
+++ b/qlop.c
@@ -1324,6 +1324,7 @@ static int do_emerge_log(
}
}
}
+ xarrayfree_int(avgs);
}
{
[gentoo-commits] proj/portage-utils:master commit in: libq/, /
commit: 268c2076b5276fbce37df3f751619646c4b8d7a4
Author: Boris Staletic protonmail com>
AuthorDate: Thu Mar 28 18:08:00 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Mar 29 10:57:17 2024 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=268c2076
qlop: Properly handle atom_compar_cb when called from qsort
`qsort` passes pointers to elements ("iterators" in C++ lingo) to the
callback, not elements directly.
Hence `l` and `r` in `atom_compar_cb` actually receives `depend_atom**`,
but only when called from `qsort`. The other two call sites
(`tree_pkg_compar` and `pkg_sort_cb`) actually apssed `depend_atom*`.
This leads to type casting confusion and undefined behaviour for any
invocation of `qlop -p`.
First discovered by SEGFAULT-ing with the following invocation:
qlop -p `cat /var/lib/portage/world`
Valgrind and ASAN made triggering the SEGFAULT easier - any invocation
with two or more atoms triggered a NULL dereference.
This commit addresses the above problem:
1. Expect that `atom_compar_cb` is actually called with two
`depend_atom**`.
2. Make `tree_pkg_compar` and `pkg_sort_cb` comply with the above
change, by passing `` and ``, instead of `al` and `ar`.
Signed-off-by: Fabian Groffen gentoo.org>
libq/atom.c | 4 ++--
libq/tree.c | 2 +-
qlop.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libq/atom.c b/libq/atom.c
index b1a150a..3cc2100 100644
--- a/libq/atom.c
+++ b/libq/atom.c
@@ -1242,8 +1242,8 @@ atom_format(const char *format, const depend_atom *atom)
inline int
atom_compar_cb(const void *l, const void *r)
{
- const depend_atom *al = l;
- const depend_atom *ar = r;
+ const depend_atom *al = *(const depend_atom**)l;
+ const depend_atom *ar = *(const depend_atom**)r;
switch (atom_compare(al, ar)) {
case EQUAL: return 0;
diff --git a/libq/tree.c b/libq/tree.c
index 4678634..335ac79 100644
--- a/libq/tree.c
+++ b/libq/tree.c
@@ -463,7 +463,7 @@ tree_pkg_compar(const void *l, const void *r)
depend_atom *al = tree_get_atom(pl, false);
depend_atom *ar = tree_get_atom(pr, false);
- return atom_compar_cb(al, ar);
+ return atom_compar_cb(, );
}
static tree_pkg_ctx *
diff --git a/qlop.c b/qlop.c
index 3e6db53..cfad246 100644
--- a/qlop.c
+++ b/qlop.c
@@ -309,7 +309,7 @@ pkg_sort_cb(const void *l, const void *r)
depend_atom *al = pl->atom;
depend_atom *ar = pr->atom;
- return atom_compar_cb(al, ar);
+ return atom_compar_cb(, );
}
/* The format of the sync log has changed over time.
[gentoo-commits] proj/portage-utils:master commit in: /
commit: a425c1a91f01dd57f68d25eec3116c9634338d14
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Mar 29 10:54:19 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Mar 29 10:54:27 2024 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=a425c1a9
qmerge: add reminder for myself
Signed-off-by: Fabian Groffen gentoo.org>
qmerge.c | 4
1 file changed, 4 insertions(+)
diff --git a/qmerge.c b/qmerge.c
index fba5299..280b0c1 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1481,6 +1481,10 @@ pkg_merge(int level, const depend_atom *qatom, const
tree_match_ctx *mpkg)
cpath = xstrdup(""); /* xrealloced in merge_tree_at */
+ /* TODO: use replacing to pass over pervinst->pkg for
+* VDB/CONTENTS and respect the config-protect-if-modified flag
+* like unmerge does */
+
ret = merge_tree_at(AT_FDCWD, "image",
AT_FDCWD, portroot, contents, eprefix_len,
, , cp_argc, cp_argv, cpm_argc,
cpm_argv);
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: ed6eb030f4bf489a935891eb5fbdd1f5b0dd659d
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Mar 28 18:48:36 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Mar 28 18:48:36 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ed6eb030
scripts/rsync-generation/mksnapshot: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/rsync-generation/mksnapshot.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/rsync-generation/mksnapshot.sh
b/scripts/rsync-generation/mksnapshot.sh
index 7879adc353..22808d58d4 100755
--- a/scripts/rsync-generation/mksnapshot.sh
+++ b/scripts/rsync-generation/mksnapshot.sh
@@ -14,7 +14,7 @@ SNAME=${PWD}/portage-$(date +%Y%m%d -d @${YESTERDAY}).tar
TMPDIR=${PWD}/tmp-prefix-snapshot
# clean up
-find . -maxdepth 2 -daystart -ctime +4 -type f | xargs --no-run-if-empty rm
+find . -maxdepth 2 -daystart -ctime +4 -type f -exec rm '{}' +
# pull in active snapshot
BOOTSTRAP_SNAPSHOT=$( \
@@ -31,7 +31,7 @@ mkdir -p "${TMPDIR}"
# quickly take a snapshot, such that we get a consistent image
pushd "${RSYNCTREE}" > /dev/null || exit 1
tar -cf "${SNAME}" --exclude=snapshots -- * || exit 1
-popd > /dev/null
+popd > /dev/null || exit 1
# now revamp it such that it's in a directory "portage"
rm -Rf "${TMPDIR}"
@@ -40,7 +40,7 @@ pushd "${TMPDIR}" > /dev/null || exit 1
mkdir portage
tar -xf "${SNAME}" -C portage/
tar --numeric-owner --format=posix --hard-dereference -cf "${SNAME}" portage/
-popd > /dev/null
+popd > /dev/null || exit 1
rm -Rf "${TMPDIR}"
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: 3cbbb77fd201b19b99a31d35b7be7b91e9b3dd36 Author: Fabian Groffen gentoo org> AuthorDate: Fri Mar 29 10:30:11 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Fri Mar 29 10:30:11 2024 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3cbbb77f scripts/rsync-generation/update-rsync-master: disable shellcheck fps Disable false positives, unfortunately including the most helpful check SC2086. Signed-off-by: Fabian Groffen gentoo.org> scripts/rsync-generation/update-rsync-master.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/rsync-generation/update-rsync-master.sh b/scripts/rsync-generation/update-rsync-master.sh index 304877ac95..b169a4a3f2 100755 --- a/scripts/rsync-generation/update-rsync-master.sh +++ b/scripts/rsync-generation/update-rsync-master.sh @@ -1,4 +1,7 @@ #!/usr/bin/env bash +#shellcheck disable=SC2016,SC2086 +#SC2016: expressions don't expand in single quotes -> purposely in sed +#SC2086: double quote to prevent word splitting -> exactly what we need w/ set SCRIPTSTARTTIME=$(date +%s)
[gentoo-commits] repo/proj/prefix:master commit in: scripts/, scripts/auto-bootstraps/
commit: 97ff630a73ccec168656694cf6cca91275e2a67f
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Mar 28 16:12:00 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Mar 28 16:12:00 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=97ff630a
scripts/auto-bootstraps/dobootstrap: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/auto-bootstraps/dobootstrap | 62 +++--
scripts/bootstrap-prefix.sh | 24 +++---
2 files changed, 45 insertions(+), 41 deletions(-)
diff --git a/scripts/auto-bootstraps/dobootstrap
b/scripts/auto-bootstraps/dobootstrap
index 14cc137a0d..f2b670d9b2 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -5,14 +5,14 @@
BOOTURL="http://rsync.prefix.bitzolder.nl/scripts/bootstrap-prefix.sh;
UPLOAD="rsync1.prefix.bitzolder.nl::gentoo-portage-bootstraps"
do_fetch() {
- local FETCHCOMMAND
+ local FETCH_COMMAND
# Try to find a download manager, we only deal with wget,
# curl, FreeBSD's fetch and ftp.
- if [[ x$(type -t wget) == "xfile" ]] ; then
+ if [[ $(type -t wget) == "file" ]] ; then
FETCH_COMMAND="wget -O -"
[[ $(wget -h) == *"--no-check-certificate"* ]] && \
FETCH_COMMAND+=" --no-check-certificate"
- elif [[ x$(type -t curl) == "xfile" ]] ; then
+ elif [[ $(type -t curl) == "file" ]] ; then
FETCH_COMMAND="curl -f -L"
else
echo "could not download ${1##*/}"
@@ -26,6 +26,8 @@ do_prepare() {
local bitw=$1
local dte=$2
local bootstrap
+ local chost
+ local bootstrapscript
if [[ -n ${RESUME} && -n ${bitw} && -n ${dte} ]] ; then
bootstrap=${OVERRIDE_EPREFIX:-bootstrap${bitw}-${dte}}/bootstrap-prefix.sh
@@ -37,7 +39,7 @@ do_prepare() {
do_fetch ${BOOTURL} > ${bootstrap}
fi
- local chost=$(${BASH} ${bootstrap} chost.guess x)
+ chost=$("${BASH}" "${bootstrap}" chost.guess x)
case ${chost} in
*-darwin[89])
# ppc64-darwin never really worked for unknown reasons
@@ -86,7 +88,7 @@ do_prepare() {
chost=sparc-${chost#*-}
fi
;;
- sparcv9-*|sparc64-*)
+ SParcv9-*|sparc64-*)
if [[ ${bitw} == 32 ]] ; then
chost=sparc-${chost#*-}
else
@@ -105,11 +107,11 @@ do_prepare() {
EPREFIX=${PWD}/bootstrap${bitw}-${dte}
[[ -n ${OVERRIDE_EPREFIX} ]] && EPREFIX=${OVERRIDE_EPREFIX}
- local bootstrapscript=$(realpath ${BASH_SOURCE[0]} 2>/dev/null)
+ bootstrapscript=$(realpath "${BASH_SOURCE[0]}" 2>/dev/null)
if [[ -z ${bootstrapscript} ]] ; then
local b=${BASH_SOURCE[0]}
- cd "${b%/*}"
- bootstrapscript=$(pwd -P)/${b##*/}
+ cd "${b%/*}" || exit 1
+ bootstrapscript="$(pwd -P)/${b##*/}"
fi
echo "EPREFIX=${EPREFIX}"
mkdir -p "${EPREFIX}"
@@ -124,33 +126,33 @@ do_prepare() {
# USE-flags in make.conf prior to stage2 (first emerge usage)
starttime=${SECONDS}
env -i \
- HOME=${EPREFIX} \
+ HOME="${EPREFIX}" \
SHELL=/bin/sh \
- TERM=${TERM} \
- USER=${USER} \
- CHOST=${chost} \
- EPREFIX=${EPREFIX} \
+ TERM="${TERM}" \
+ USER="${USER}" \
+ CHOST="${chost}" \
+ EPREFIX="${EPREFIX}" \
${GENTOO_MIRRORS+GENTOO_MIRRORS="${GENTOO_MIRRORS}"} \
${DOLOCAL+DOLOCAL=1} \
${RESUME+RESUME=1} \
${LATEST_TREE_YES+LATEST_TREE_YES=1} \
- ${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \
- ${USE_CPU_CORES+USE_CPU_CORES=}${USE_CPU_CORES} \
- ${DARWIN_USE_GCC+DARWIN_USE_GCC=}${DARWIN_USE_GCC} \
- ${PREFIX_DISABLE_RAP+PREFIX_DISABLE_RAP=}${PREFIX_DISABLE_RAP} \
-
${BP_KEEPALIVE_ACTIVE+BP_KEEPALIVE_ACTIVE=}${BP_KEEPALIVE_ACTIVE} \
- ${BASH} ${bootstrapscript} bootstrap
+ ${TREE_FROM_SRC+TREE_FROM_SRC=}"${TREE_FROM_SRC}" \
+ ${USE_CPU_CORES+USE_CPU_CORES=}"${USE_CPU_CORES}" \
+ ${DARWIN_USE_GCC+DARWIN_USE_GCC=}"${DARWIN_USE_GCC}" \
+
${PREFIX_DISABLE_RAP+PREFIX_DISABLE_RA
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: d4ce7ca1b7141ecebc27a660f8a34fcb4f9bec35
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Mar 28 15:42:07 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Mar 28 15:42:07 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d4ce7ca1
scripts/rsync-generation/update-rsync-master: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/rsync-generation/update-rsync-master.sh | 34 ++---
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/scripts/rsync-generation/update-rsync-master.sh
b/scripts/rsync-generation/update-rsync-master.sh
index 6a93207518..304877ac95 100755
--- a/scripts/rsync-generation/update-rsync-master.sh
+++ b/scripts/rsync-generation/update-rsync-master.sh
@@ -3,7 +3,7 @@
SCRIPTSTARTTIME=$(date +%s)
# get keys for ssh and signing
-eval $(env SHELL=/bin/bash keychain -q --noask --eval)
+eval "$(env SHELL=/bin/bash keychain -q --noask --eval)"
BASE_PATH="$(readlink -f "${BASH_SOURCE[0]%/*}")"
@@ -20,7 +20,6 @@ PORTAGE_BASE_PATH="${BASE_PATH}/prefix/usr/lib/portage/"
PYTHONPATH="${PORTAGE_BASE_PATH}/pym"
PORTAGE_CONFIGROOT="${BASE_PATH}/misc/config_root"
PORTAGE_DEPCACHEDIR="${BASE_PATH}/depcache"
-MANIFEST_CACHE="${BASE_PATH}/manifests"
# for .cvsps and gnupg cache mainly
HOME="${BASE_PATH}/misc"
@@ -34,7 +33,12 @@ echo "(init) PATH=$PATH"
egencache settings
-EGENCACHE_OPTS="--jobs=$(nproc) --load-average=$(nproc) --tolerant
--update-use-local-desc"
+EGENCACHE_OPTS=(
+ "--jobs=$(nproc)"
+ "--load-average=$(nproc)"
+ "--tolerant"
+ "--update-use-local-desc"
+)
export PYTHONPATH PORTDIR PORTAGE_BASE_PATH PORTAGE_CONFIGROOT \
ROOT PORTAGE_TMPFS FEATURES HOME
@@ -66,8 +70,8 @@ apply_git_mtimes() {
git log --pretty=%ct --name-status --reverse "${from}..${to}"
echo 999 # end marker to trigger the last block to be done
} | \
- while read line ; do
- case ${line} in
+ while read -r line ; do
+ case "${line}" in
[0-9][0-9][0-9]*)
if [[ ${ts} -gt 0 ]] ; then
[[ ${#files[@]} == 0 ]] || \
@@ -78,11 +82,11 @@ apply_git_mtimes() {
;;
[ACMT]*)
set -- ${line}
- files+=( $2 )
+ files+=( "$2" )
;;
[R]*)
set -- ${line}
- files+=( $3 )
+ files+=( "$3" )
;;
[D]*)
set -- ${line}
@@ -95,8 +99,8 @@ apply_git_mtimes() {
# if the entire package was removed,
touch the
# category level metadata
[[ -f ${f%/*}/metadata.xml ]] \
- && files+=(
${f%/*}/metadata.xml ) \
- || files+=(
${f%/*/*}/metadata.xml )
+ && files+=(
"${f%/*}"/metadata.xml ) \
+ || files+=(
"${f%/*/*}"/metadata.xml )
fi
;;
esac
@@ -201,8 +205,8 @@ echo "($(date +"%F %R")) git image updated"
echo "($(date +"%F %R")) rsync Prefix tree to rsync-master"
for entry in scripts *-*/* ; do
# copy it over
- [[ -e ${RSYNCDIR}/${entry} ]] || mkdir -p "${RSYNCDIR}"/${entry}
- rsync -v --delete -aC "${PREFIXTREEDIR}"/${entry}/
"${RSYNCDIR}"/${entry}/
+ [[ -e ${RSYNCDIR}/${entry} ]] || mkdir -p "${RSYNCDIR}/${entry}"
+ rsync -v --delete -aC "${PREFIXTREEDIR}/${entry}"/
"${RSYNCDIR}/${entry}"/
done
# we excluded the eclasses above, because we "overlay" them from gx86
@@ -230,7 +234,7 @@ START=$(date +%s)
# generate the metadata
echo "($(date +"%F %R")) generating metadata"
dolog() {
- echo $*
+ echo "$*"
"$@"
}
dolog "${PORTAGE_BASE_PATH}/bin/egencache" --update --rsync \
@@ -247,7 +251,7 @@ sync-type = rsync
sync-uri = rsync://dont-sync
auto-sync = no
' \
- ${EGENCACHE_OPTS} \
+ "${EGENCACHE_OPTS[@]}" \
|| exit 5
STOP=$(date +%s)
@@ -281,8 +285,8 @@ s
[gentoo-commits] repo/proj/prefix:master commit in: scripts/
commit: fa7c24ebb3b27299fd2195d4e821c8c615c02eec
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Mar 28 14:41:38 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Mar 28 14:41:38 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fa7c24eb
scripts/bootstrap-bash: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/bootstrap-bash.sh | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/scripts/bootstrap-bash.sh b/scripts/bootstrap-bash.sh
index c67d8943b7..db9d8c2795 100755
--- a/scripts/bootstrap-bash.sh
+++ b/scripts/bootstrap-bash.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 2006-2018 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 2006-2024 Gentoo Authors; Distributed under the GPL v2
# bash installer
#
@@ -14,15 +14,15 @@ if [ -z "$1" ] ; then
fi
mkdir -p "$1"
-cd "$1"
+cd "$1" || exit 1
mkdir bash-build
-cd bash-build
+cd bash-build || exit 1
GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.prefix.bitzolder.nl/distfiles"}
command_exists() {
check_cmd="$1"
- command -v $check_cmd >/dev/null 2>&1
+ command -v "${check_cmd}" >/dev/null 2>&1
}
same_file() {
@@ -40,7 +40,7 @@ if [ ! -e bash-4.2.tar.gz ] ; then
eerror() { echo "!!! $*" 1>&2; }
einfo() { echo "* $*"; }
- if [ -z ${FETCH_COMMAND} ] ; then
+ if [ -z "${FETCH_COMMAND}" ] ; then
# Try to find a download manager, we only deal with wget,
# curl, FreeBSD's fetch and ftp.
if command_exists wget; then
@@ -65,7 +65,7 @@ if [ ! -e bash-4.2.tar.gz ] ; then
;;
esac
fi
- if [ -z ${FETCH_COMMAND} ]; then
+ if [ -z "${FETCH_COMMAND}" ]; then
eerror "no suitable download manager found (need wget,
curl, fetch or ftp)"
eerror "could not download ${1##*/}"
eerror "download the file manually, and put it in
${PWD}"
@@ -77,7 +77,7 @@ fi
gzip -d bash-4.2.tar.gz
tar -xf bash-4.2.tar
-cd bash-4.2
+cd bash-4.2 || exit 2
./configure --prefix="${1}"/usr --disable-nls
make
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: e766d7ea7dae4c0f454a3e3a69f2f6bb3aba5ec8
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Mar 28 14:56:42 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Mar 28 14:56:42 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=e766d7ea
scripts/rsync-generation/push-rsync1: update to current usage
Signed-off-by: Fabian Groffen gentoo.org>
scripts/rsync-generation/push-rsync1.sh | 32 +++-
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/scripts/rsync-generation/push-rsync1.sh
b/scripts/rsync-generation/push-rsync1.sh
index fc15894ecd..c9df9a379d 100755
--- a/scripts/rsync-generation/push-rsync1.sh
+++ b/scripts/rsync-generation/push-rsync1.sh
@@ -1,25 +1,23 @@
#!/usr/bin/env bash
-TRGDIR="rsync1.domain::rsync-push_module"
+TRGDIR="/path/to/rsync0-prefix-tree"
LOCALDIR="/path/to/master-rsync-tree"
-# figure out what's currently the active rsync1 mirror
-#active=$(ssh $TRGHOST "readlink $TRGDIR/rsync1")
-#echo "($(date +"%F %R")) current active snapshot on rsync1: ${active}"
-
-#case $active in
-# rsync1a) target=rsync1b ;;
-# rsync1b) target=rsync1a ;;
-# *)
-# echo "don't know what the active rsync1 mirror is: '$active'" >
/dev/stderr
-# exit 1
-# ;;
-#esac
-echo "($(date +"%F %R")) will refresh and activate snapshot: ${target}"
+echo "($(date +"%F %R")) will refresh snapshot"
# synchronise the target
-rsync -va --delete "${LOCALDIR}"/ ${TRGDIR}/ > /var/tmp/rsync-updates.log ||
exit 1
+rsync -vca --delete --exclude=snapshots/ \
+ "${LOCALDIR}"/ ${TRGDIR}/ > /var/tmp/rsync-updates.log || exit 1
+PUBLICDIR=
+case $(hostname) in
+disabled)
+PUBLICDIR="somehost::gentoo-portage-prefix-push"
+;;
+esac
# switch the active rsync1 mirror
-echo "($(date +"%F %R")) rsync done, switching target now"
-#ssh $TRGHOST "cd ${TRGDIR} && rm rsync1 && ln -s ${target} rsync1"
+if [[ -n ${PUBLICDIR} ]] ; then
+rsync -vca --delete "${TRGDIR}"/ "${PUBLICDIR}"/
+fi
+
+echo "($(date +"%F %R")) rsync done"
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: 6f38e3bd7e84b8d7c8df5229b4a5f1a34cb4843a
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Mar 28 15:25:18 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Mar 28 15:25:18 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6f38e3bd
scripts/rsync-generation/refresh-mirror: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/rsync-generation/refresh-mirror.sh | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/scripts/rsync-generation/refresh-mirror.sh
b/scripts/rsync-generation/refresh-mirror.sh
index 6e2baffaa4..cbcb677266 100755
--- a/scripts/rsync-generation/refresh-mirror.sh
+++ b/scripts/rsync-generation/refresh-mirror.sh
@@ -1,4 +1,8 @@
#!/bin/bash -l
+#shellcheck disable=SC2009,SC2030,SC2031
+#SC2009: consider using pgrep instead of grepping ps output
+#SC2030: modification of FD is local (to subshell)
+#SC2031: FD was modified in subshell
# invocation script meant to be launched from cron
@@ -10,7 +14,7 @@ if [[ -f /tmp/rsync-master-busy ]] ; then
# allow one run to be skipped quietly
if [[ $((laststart + (40 * 60))) -lt ${now} ]] ; then
echo "another rsync-master generation process is still busy"
- type pstree > /dev/null && pstree -A -l -p $(head -n1
${LOGFILE})
+ type pstree > /dev/null && pstree -A -l -p "$(head -n1
${LOGFILE})"
ps -ef | grep '[r]efresh-mirror'
tail ${LOGFILE}
else
@@ -22,16 +26,16 @@ if [[ -f /tmp/rsync-master-busy ]] ; then
pid=$(head -n1 ${LOGFILE})
if [[ ${pid} -gt 0 ]] ; then
echo "Killing stray/stuck processes"
- pstree -A -l -c -p ${pid} | grep -o '[0-9]\+' | xargs
kill
+ pstree -A -l -c -p "${pid}" | grep -o '[0-9]\+' | xargs
kill
rm /tmp/rsync-master-busy
fi
fi
else
- mv ${LOGFILE} ${LOGFILE%.log}-prev.log
- cd "$(readlink -f "${BASH_SOURCE[0]%/*}")"
+ mv "${LOGFILE}" "${LOGFILE%.log}"-prev.log
+ cd "$(readlink -f "${BASH_SOURCE[0]%/*}")" || exit 1
touch /tmp/rsync-master-busy
- echo $$ > ${LOGFILE}
- echo "starting generation $(date)" >> ${LOGFILE}
+ echo $$ > "${LOGFILE}"
+ echo "starting generation $(date)" >> "${LOGFILE}"
genandpush() {
./update-rsync-master.sh \
&& ./push-rsync1.sh
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: f9a6be590436b9fd5e59c8edcca75767f60a9c9d
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Mar 28 15:11:30 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Mar 28 15:11:30 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f9a6be59
scripts/rsync-generation/mksnapshot: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/rsync-generation/mksnapshot.sh | 88 +++---
1 file changed, 39 insertions(+), 49 deletions(-)
diff --git a/scripts/rsync-generation/mksnapshot.sh
b/scripts/rsync-generation/mksnapshot.sh
index e4db893b64..7879adc353 100755
--- a/scripts/rsync-generation/mksnapshot.sh
+++ b/scripts/rsync-generation/mksnapshot.sh
@@ -25,71 +25,61 @@ if [[ ! -s "${BOOTSTRAP_SNAPSHOT}" ]] ; then
curl -s -L
"https://distfiles.prefix.bitzolder.nl/prefix/distfiles/${BOOTSTRAP_SNAPSHOT};
> "${BOOTSTRAP_SNAPSHOT}"
fi
-rm -Rf ${TMPDIR}
-mkdir -p ${TMPDIR}
+rm -Rf "${TMPDIR}"
+mkdir -p "${TMPDIR}"
# quickly take a snapshot, such that we get a consistent image
-pushd ${RSYNCTREE} > /dev/null
-tar -cf ${SNAME} --exclude=snapshots * || exit 1
+pushd "${RSYNCTREE}" > /dev/null || exit 1
+tar -cf "${SNAME}" --exclude=snapshots -- * || exit 1
popd > /dev/null
# now revamp it such that it's in a directory "portage"
-rm -Rf ${TMPDIR}
-mkdir -p ${TMPDIR}
-pushd ${TMPDIR} > /dev/null
+rm -Rf "${TMPDIR}"
+mkdir -p "${TMPDIR}"
+pushd "${TMPDIR}" > /dev/null || exit 1
mkdir portage
-tar -xf ${SNAME} -C portage/
-tar --numeric-owner --format=posix --hard-dereference -cf ${SNAME} portage/
+tar -xf "${SNAME}" -C portage/
+tar --numeric-owner --format=posix --hard-dereference -cf "${SNAME}" portage/
popd > /dev/null
-rm -Rf ${TMPDIR}
+rm -Rf "${TMPDIR}"
# be nice
-nice -n19 bzip2 -c -9 ${SNAME} > ${SNAME}.bz2 &
-nice -n19 xz -c -9 ${SNAME} > ${SNAME}.xz &
-nice -n19 gzip -c -9 ${SNAME} > ${SNAME}.gz &
+nice -n19 bzip2 -c -9 "${SNAME}" > "${SNAME}".bz2 &
+nice -n19 xz-c -9 "${SNAME}" > "${SNAME}".xz &
+nice -n19 gzip -c -9 "${SNAME}" > "${SNAME}".gz &
wait
# generate accompanying meta files
-md5sum ${SNAME##*/} > ${SNAME}.xz.umd5sum
-md5sum ${SNAME##*/}.xz > ${SNAME}.xz.md5sum
-md5sum ${SNAME##*/} > ${SNAME}.bz2.umd5sum
-md5sum ${SNAME##*/}.bz2 > ${SNAME}.bz2.md5sum
-md5sum ${SNAME##*/} > ${SNAME}.gz.umd5sum
-md5sum ${SNAME##*/}.bz2 > ${SNAME}.gz.md5sum
-# gpg is really stupid, or I am too stupid to find the right option
-gpgopts="--quiet --batch --no-tty --passphrase-fd 0 --pinentry-mode loopback"
-gpgopts+=" --default-key C6317B3C --detach-sign --armor"
-gpg ${gpgopts} -o ${SNAME}.xz.gpgsig ${SNAME}.xz < ${SCRIPTLOC}/autosigner.pwd
-gpg ${gpgopts} -o ${SNAME}.bz2.gpgsig ${SNAME}.bz2 <
${SCRIPTLOC}/autosigner.pwd
-gpg ${gpgopts} -o ${SNAME}.gz.gpgsig ${SNAME}.gz < ${SCRIPTLOC}/autosigner.pwd
+md5sum "${SNAME##*/}" > "${SNAME}".xz.umd5sum
+md5sum "${SNAME##*/}".xz > "${SNAME}".xz.md5sum
+md5sum "${SNAME##*/}" > "${SNAME}".bz2.umd5sum
+md5sum "${SNAME##*/}".bz2 > "${SNAME}".bz2.md5sum
+md5sum "${SNAME##*/}" > "${SNAME}".gz.umd5sum
+md5sum "${SNAME##*/}".bz2 > "${SNAME}".gz.md5sum
+# use passphrase-fd to pass password
+gpgopts=(
+ "--quiet"
+ "--batch"
+ "--no-tty"
+ "--passphrase-fd" 0
+ "--pinentry-mode" "loopback"
+ "--default-key" "C6317B3C"
+ "--detach-sign"
+ "--armor"
+)
+gpg "${gpgopts[@]}" -o "${SNAME}".xz.gpgsig "${SNAME}".xz \
+ < "${SCRIPTLOC}"/autosigner.pwd
+gpg "${gpgopts[@]}" -o "${SNAME}".bz2.gpgsig "${SNAME}".bz2 \
+ < "${SCRIPTLOC}"/autosigner.pwd
+gpg "${gpgopts[@]}" -o "${SNAME}".gz.gpgsig "${SNAME}".gz \
+ < "${SCRIPTLOC}"/autosigner.pwd
# we no longer need the tar
-rm ${SNAME}
+rm "${SNAME}"
# make convenience symlinks
for f in {xz,bz2,gz}{,.gpgsig,.md5sum,.umd5sum} ; do
- rm portage-latest.tar.$f
- ln -s ${SNAME##*/}.$f portage-latest.tar.$f
+ rm "portage-latest.tar.$f"
+ ln -s "${SNAME##*/}.$f" "portage-latest.tar.$f"
done
-
-# darkside's delta code
-
-# FAILS and nobody cares!
-
-#YESTERDAY=$(date +%Y%m%d -d @${YESTERDAY})
-#TODAY=$(date +%Y%m%d -d @${TODAY})
-#cp portage-{${YESTERDAY},${TODAY}}.tar.bz2 /dev/shm/
-#SNAP_DIR=${PWD}
-#
-#cd /dev/shm
-#bunzip2 portage*
-#
-#differ -f bdelta portage-{${YESTERDAY},${TODAY}}.tar \
-#${SNAP_DIR}/deltas/snapshot-${YESTERDAY}-${TODAY}.patch
-#
-#bzip2 "${SNAP_DIR}/deltas/snapshot-${YESTERDAY}-${TODAY}.patch"
-#
-#rm -f portage* snapshot*
-
-# FAILS and nobody cares
[gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
commit: 2de7386aef93884137d5700d56046f360546b250
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Mar 28 14:45:12 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Mar 28 14:45:12 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2de7386a
auto-bootstraps/process_uploads: shellcheck
Signed-off-by: Fabian Groffen gentoo.org>
scripts/auto-bootstraps/process_uploads.sh | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/auto-bootstraps/process_uploads.sh
b/scripts/auto-bootstraps/process_uploads.sh
index dc858589a8..fae40dddef 100755
--- a/scripts/auto-bootstraps/process_uploads.sh
+++ b/scripts/auto-bootstraps/process_uploads.sh
@@ -4,7 +4,7 @@ UPLOADDIR="./uploads"
RESULTSDIR="./results"
if [[ -x ${BASH_SOURCE[0]%/*}/process_uploads_local.sh ]] ; then
- source ${BASH_SOURCE[0]%/*}/process_uploads_local.sh
+ source "${BASH_SOURCE[0]%/*}"/process_uploads_local.sh
fi
if [[ $(type -t process_file) != function ]] ; then
@@ -14,7 +14,7 @@ if [[ $(type -t process_file) != function ]] ; then
fi
didsomething=
-for d in ${UPLOADDIR}/* ; do
+for d in "${UPLOADDIR}"/* ; do
if [[ ! -d "${d}" ]] ; then
rm -f "${d}"
continue
@@ -28,7 +28,7 @@ for d in ${UPLOADDIR}/* ; do
continue
fi
- dir=${1#${d}/}
+ dir=${1#"${d}"/}
# skip this thing from auto-processing if it is new platform
[[ -d ${RESULTSDIR}/${dir%/*} ]] || continue
# skip this thing if it already exists
@@ -57,7 +57,7 @@ for d in ${UPLOADDIR}/* ; do
if [[ -e "${d}/${dir}/portage" ]] ; then
for pkg in "${d}/${dir}/portage"/*/* ; do
[[ -e ${pkg} ]] || continue
- w=${pkg#${d}/}
+ w=${pkg#"${d}"/}
mkdir -p "${RESULTSDIR}/${w}"
[[ -e "${pkg}"/build-info ]] && \
mv "${pkg}"/build-info "${RESULTSDIR}/${w}"/
[gentoo-commits] repo/proj/prefix:master commit in: dev-build/meson/files/, dev-build/meson/
commit: 77fa58d79b6f22e7095cf4bcdb2a417c446eade4
Author: Fabian Groffen gentoo org>
AuthorDate: Wed Mar 27 17:46:56 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed Mar 27 17:46:56 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=77fa58d7
dev-build/meson-1.4.0-r1: add path to unbreak Darwin builds
Submitted upstream,
https://github.com/mesonbuild/meson/pull/13012
in the meanwhile unbreak Darwin hosts.
Closes: https://bugs.gentoo.org/923706
Signed-off-by: Fabian Groffen gentoo.org>
dev-build/meson/Manifest | 3 +
.../meson/files/meson-1.2.1-python-path.patch | 26 +++
.../meson/files/meson-1.4.0-darwin-rpath.patch | 101
dev-build/meson/meson-1.4.0-r1.ebuild | 181 +
4 files changed, 311 insertions(+)
diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
new file mode 100644
index 00..d7742feeed
--- /dev/null
+++ b/dev-build/meson/Manifest
@@ -0,0 +1,3 @@
+DIST meson-1.4.0.tar.gz 2224663 BLAKE2B
7f742ef870c182e552c1ff3508d65f251009d610def6a08e01fddb6c6a4ed6d608ead0d52cf8ca7d66b5bd7a4732dccd7ab5d98f141a4a61e275398885f79486
SHA512
2787941fbc77d5ad95011753df52fe39812929a06d84dbce8bdc965c9c1e62fd6bfa819712eb1f5934c2ebe6919a65f7874ecac2caf40d111ea024343108cfbd
+DIST meson-1.4.0.tar.gz.asc 833 BLAKE2B
6e4002303da16bcaa3d1d3c76a3485b23174074de2d29bd34347a4671d7fb0f1c0767559ed9267e0f0b52c02638b85a11a5980f4ee188e7e4d35c733b0821c62
SHA512
ea73e72d929bf30d28c033f103fd1d26bac7cef175aabbf9b3a24c7b336682c28f5aae184e04d2189731cf80dd7571939cb02de642bb5b412cea996ca30dfdad
+DIST meson-reference-1.4.0.3 339324 BLAKE2B
8ad24592c1a9100832dead97a55d4cb358892fc1cd6aee641f9610cb6a5df211831e6cfc42e047d5e835ed53de1bb9c7d711dd1a0a8cfe18a0f85e92a1a3f925
SHA512
8df06f63db6db01a6c8c0a5b4a8b26c868bb027f26580d290288b1067429a526fb654fae01a45085c1f20ee8dab1b5325e8b2fd285faf175d2fcfc2c704b4768
diff --git a/dev-build/meson/files/meson-1.2.1-python-path.patch
b/dev-build/meson/files/meson-1.2.1-python-path.patch
new file mode 100644
index 00..d6151881f8
--- /dev/null
+++ b/dev-build/meson/files/meson-1.2.1-python-path.patch
@@ -0,0 +1,26 @@
+From 2b33c94e6315e9a397dd48a58a5becb0df3b8aba Mon Sep 17 00:00:00 2001
+From: James Le Cuirot
+Date: Sat, 12 Aug 2023 09:56:44 +0100
+Subject: [PATCH 2/2] python module: Respect PATH when python is not given in
+ machine file
+
+We should only fall back to the Python interpreter running Meson itself
+if `python3` is not found in the PATH.
+
+https://github.com/mesonbuild/meson/pull/12116
+
+diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
+index 5654e4231..2b2395a9b 100644
+--- a/mesonbuild/modules/python.py
b/mesonbuild/modules/python.py
+@@ -381,7 +381,9 @@ class PythonModule(ExtensionModule):
+
+ def _find_installation_impl(self, state: 'ModuleState', display_name:
str, name_or_path: str, required: bool) -> MaybePythonProg:
+ if not name_or_path:
+-python = PythonExternalProgram('python3', mesonlib.python_command)
++python = PythonExternalProgram('python3')
++if not python.found():
++python = PythonExternalProgram('python3',
mesonlib.python_command)
+ else:
+ tmp_python = ExternalProgram.from_entry(display_name,
name_or_path)
+ python = PythonExternalProgram(display_name, ext_prog=tmp_python)
diff --git a/dev-build/meson/files/meson-1.4.0-darwin-rpath.patch
b/dev-build/meson/files/meson-1.4.0-darwin-rpath.patch
new file mode 100644
index 00..abcb9be6bb
--- /dev/null
+++ b/dev-build/meson/files/meson-1.4.0-darwin-rpath.patch
@@ -0,0 +1,101 @@
+From c9565bd44149041d613046d02be4cb9a5bd9ee2b Mon Sep 17 00:00:00 2001
+From: Fabian Groffen
+Date: Wed, 27 Mar 2024 17:20:16 +
+Subject: [PATCH] depfixer: change fix_darwin to act like fix_rpathtype_entry
+
+This somewhat aligns "darwin" (Mach-O) with how ELF RPATHs are treated.
+Instead of blindly removing all RPATHs, only remove the ones that are in
+the rpath_dirs_to_remove set. This way, RPATHs that were added by the
+toolchain or user are left untouched.
+
+It is important not to remove RPATHs as they may be vital for the
+executable at runtime. Issues #12045 and #12288 are examples of this.
+
+Issue: https://github.com/mesonbuild/meson/issues/12045
+Signed-off-by: Fabian Groffen
+---
+ mesonbuild/scripts/depfixer.py | 53 ++
+ 1 file changed, 21 insertions(+), 32 deletions(-)
+
+diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
+index 61b7ffa642f1..71599f784e73 100644
+--- a/mesonbuild/scripts/depfixer.py
b/mesonbuild/scripts/depfixer.py
+@@ -379,7 +379,7 @@ def fix_elf(fname: str, rpath_dirs_to_remove:
T.Set[bytes], new_rpath: T.Optiona
+ # note: e.get_rpath() and e.get_runpath() may be useful
+ e.fix_rpath(fname
[gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/
commit: c2da1a289c0a8140e7a9c1af5d48d3a78d750cd6
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Mar 22 09:01:11 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Mar 22 09:01:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2da1a28
mail-client/mutt-2.2.13: version bump
Signed-off-by: Fabian Groffen gentoo.org>
mail-client/mutt/Manifest | 2 +
mail-client/mutt/mutt-2.2.13.ebuild | 273
2 files changed, 275 insertions(+)
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index a416f9cf9c3d..842d5e6a712c 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,2 +1,4 @@
DIST mutt-2.2.12.tar.gz 5539244 BLAKE2B
f17811a37804221fbb351083a25fa8b67511b7a11220e82ab6ce971fc9a0627ec9bcd8df6095e525dacda347aac51b9671cc8e6f8a3fdd8920b44fbcbc61189e
SHA512
75e9926af9abc869929d7729cda67adc3710d15560b6a1853b1d95ca926a9e72d975bafa09ebd9a4919905498602a8b55cf72a576fad170c68902862e9474006
+DIST mutt-2.2.13.tar.gz 5539130 BLAKE2B
993b5dc43f09a313acb7e02b1d182e2856f4f9a9d61c7137a9e4ea3c399302adf69993d6f7d3af3dc1f89e17473071689eb3692949daadaacb0338302090abea
SHA512
dcd84235b6f759c31b56cf021efc17c0bb1fd4d59226d12af9838f3cbbcf0301262ae5f67803565cce3afd6ff5eed3a380a81958f57fb7d8f38e2ecfd0ff7d2c
DIST mutt-gentoo-2.2.12-patches-r0.tar.xz 22444 BLAKE2B
9c973cb0fe4705dda9e601d18b05d1385df6914af5928bfdba2ad196113a973dccac0f46373c3709654d1fc077aedd6e776c4c57803c095622a70807dafe2cc2
SHA512
3857d10055e98360d31d9ed2010e0d75db6fd0c0887e770f6b098869b25f72f5dc594a646b6fdf86cf6b24694e13965f82b8d8a4cb8b65a5e030f628a16b930d
+DIST mutt-gentoo-2.2.13-patches-r0.tar.xz 22388 BLAKE2B
e9833e8b8630b1d6a4e90a78b4077b7a4ee37e9b6a492bb3b55e2763e8d6d8d810b6f77f294f1acad721f8fa235b656066a11b2b75f73dcc5294966b8fa18860
SHA512
3093504700ea7caee25f814daab4b869151853ef5fe062abca3a3915a28f688dd38007d07f3da579da1cb25ddcd6017ebba0db35422952ee2adc94b07ba96005
diff --git a/mail-client/mutt/mutt-2.2.13.ebuild
b/mail-client/mutt/mutt-2.2.13.ebuild
new file mode 100644
index ..2a8f7e468966
--- /dev/null
+++ b/mail-client/mutt/mutt-2.2.13.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools
+
+PATCHREV="r0"
+PATCHSET="gentoo-${PVR}/${PATCHREV}"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="http://www.mutt.org/;
+MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
+SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
+ https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
+ https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES};
+IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme gsasl +hcache idn +imap
kerberos +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic
+smtp +ssl tokyocabinet vanilla prefix"
+# hcache: allow multiple, bug #607360
+REQUIRED_USE="
+ gsasl?( sasl )
+ hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
+ imap? ( ssl )
+ pop? ( ssl )
+ smime-classic?( ssl !gnutls )
+ smtp? ( ssl sasl )
+ sasl? ( || ( imap pop smtp ) )
+ kerberos? ( || ( imap pop smtp ) )
+ autocrypt?( gpgme )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos
~x64-solaris"
+# yes, we overdepend on the backend impls here, hopefully one day we can
+# have REQUIRED_USE do what it is made for again. bug #607360
+CDEPEND="
+ app-misc/mime-types
+ virtual/libiconv
+
+ berkdb?( >=sys-libs/db-4:= )
+ gdbm? ( sys-libs/gdbm )
+ lmdb? ( dev-db/lmdb:= )
+ qdbm? ( dev-db/qdbm )
+ tokyocabinet? ( dev-db/tokyocabinet )
+
+ ssl? (
+ gnutls?( >=net-libs/gnutls-1.0.17:= )
+ !gnutls? ( >=dev-libs/openssl-0.9.6:0= )
+ )
+
+ nls? ( virtual/libintl )
+ sasl? (
+ gsasl? ( >=net-misc/gsasl-2.0.0 )
+ !gsasl?( >=dev-libs/cyrus-sasl-2 )
+ )
+ kerberos? ( virtual/krb5 )
+ idn? ( net-dns/libidn2 )
+ gpgme? ( >=app-crypt/gpgme-0.9.0:= )
+ autocrypt? ( >=dev-db/sqlite-3 )
+ slang? ( sys-libs/slang )
+ !slang?( >=sys-libs/ncurses-5.2:0= )
+"
+DEPEND="${CDEPEND}
+ net-mail/mailbase
+ doc? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ || ( www-client/lynx www-client/w3m www-
[gentoo-commits] repo/gentoo:master commit in: app-metrics/carbonapi-web/
commit: 4fbc67a6178f3d9513d46d98155a4715506b7ad0
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Mar 16 20:34:38 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Mar 16 20:35:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fbc67a6
app-metrics/carbonapi-web-1.1: version bump
Signed-off-by: Fabian Groffen gentoo.org>
app-metrics/carbonapi-web/Manifest | 2 +-
.../{carbonapi-web-1.0.ebuild => carbonapi-web-1.1.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-metrics/carbonapi-web/Manifest
b/app-metrics/carbonapi-web/Manifest
index a61f570231b9..9e84439323d9 100644
--- a/app-metrics/carbonapi-web/Manifest
+++ b/app-metrics/carbonapi-web/Manifest
@@ -1 +1 @@
-DIST carbonapi-web-1.0.tar.gz 1026954 BLAKE2B
e482565b103b7afcfb7e2d778e57b24610713568f7ec079247b8dbd9f1f46668f0487eefef6d34e27bb0985bf5bc9bb6edb1a1d22652ff0db575b32099586c5f
SHA512
56a048d414aae2db99a29aca46ebe0c58e738acdae44ffa0b82478559dd0e2327767682941e69d5cda0c716cf7121c2f90d40b9866943b735d424c4b5b283e5c
+DIST carbonapi-web-1.1.tar.gz 1027235 BLAKE2B
be56d94b680282618c74b3b332cbd85de2e7430831c1de3242b99e061f6232f404c15045b3e4990e51b20f3193564a9fa9c324774ee46abeecad084b4dc9fc79
SHA512
b60ba3d23d84051f9b5e6445117a425f36a5740e3758555c08dfe0c6b1bebb06ad665e057c570a55f6d3ab9073930026b614740cde4fe57b15b06f56f33cc042
diff --git a/app-metrics/carbonapi-web/carbonapi-web-1.0.ebuild
b/app-metrics/carbonapi-web/carbonapi-web-1.1.ebuild
similarity index 100%
rename from app-metrics/carbonapi-web/carbonapi-web-1.0.ebuild
rename to app-metrics/carbonapi-web/carbonapi-web-1.1.ebuild
[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/, sys-devel/gcc/files/
commit: bf8c6e96498309932dbdc975462ef93eb0c1c347
Author: Fabian Groffen gentoo org>
AuthorDate: Sun Mar 10 18:59:51 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun Mar 10 18:59:51 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=bf8c6e96
sys-devel/gcc-13.2.0: fix bootstrap using CLT 15.3 on macOS
Signed-off-by: Fabian Groffen gentoo.org>
.../gcc/files/gcc-13-darwin14-bootstrap.patch | 40 ++
sys-devel/gcc/gcc-13.2.0.ebuild| 4 +++
2 files changed, 44 insertions(+)
diff --git a/sys-devel/gcc/files/gcc-13-darwin14-bootstrap.patch
b/sys-devel/gcc/files/gcc-13-darwin14-bootstrap.patch
new file mode 100644
index 00..98a92c103e
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-13-darwin14-bootstrap.patch
@@ -0,0 +1,40 @@
+disable some code-sanity checks/hacks because while bootstapping we use
+a compiler and its c++ library that does not necessarily comply
+
+This is an issue since macOS Sonoma 14.4 and/or CLT 15.3.
+
+--- a/include/safe-ctype.h
b/include/safe-ctype.h
+@@ -120,6 +120,7 @@
+So we include ctype.h here and then immediately redefine its macros. */
+
+ #include
++#if 0
+ #undef isalpha
+ #define isalpha(c) do_not_use_isalpha_with_safe_ctype
+ #undef isalnum
+@@ -146,5 +147,6 @@
+ #define toupper(c) do_not_use_toupper_with_safe_ctype
+ #undef tolower
+ #define tolower(c) do_not_use_tolower_with_safe_ctype
++#endif
+
+ #endif /* SAFE_CTYPE_H */
+--- a/gcc/system.h
b/gcc/system.h
+@@ -917,6 +917,7 @@
+
+ #if (GCC_VERSION >= 3000)
+
++#if 0
+ /* Note autoconf checks for prototype declarations and includes
+system.h while doing so. Only poison these tokens if actually
+compiling gcc, so that the autoconf declaration tests for malloc
+@@ -933,6 +934,7 @@
+ #undef realloc
+ #pragma GCC poison malloc realloc
+ #endif
++#endif
+
+ /* The %m format should be used when GCC's main diagnostic functions
+supporting %m are available, and xstrerror from libiberty
diff --git a/sys-devel/gcc/gcc-13.2.0.ebuild b/sys-devel/gcc/gcc-13.2.0.ebuild
index 65b51e7dcc..41160a6ef9 100644
--- a/sys-devel/gcc/gcc-13.2.0.ebuild
+++ b/sys-devel/gcc/gcc-13.2.0.ebuild
@@ -21,6 +21,8 @@ IANSGCCVER="gcc-13.2-darwin-r0"
SRC_URI+=" elibc_Darwin? (
https://github.com/iains/gcc-13-branch/archive/refs/tags/${IANSGCCVER}.tar.gz
)"
+IUSE+="bootstrap"
+
# Technically only if USE=hardened *too* right now, but no point in
complicating it further.
# If GCC is enabling CET by default, we need glibc to be built with support
for it.
# bug #830454
@@ -76,6 +78,8 @@ src_prepare() {
fi
if [[ ${CHOST} == *-darwin* ]] ; then
+ use bootstrap && eapply
"${FILESDIR}"/${PN}-13-darwin14-bootstrap.patch
+
# our ld64 is a slight bit different, so tweak expression to not
# get confused and break the build
sed -i -e 's/grep ld64/grep :ld64/' gcc/configure || die
[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/
commit: 294ac693f187e17e568400199f4edd1d74e277eb
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Mar 9 15:53:35 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Mar 9 15:53:35 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=294ac693
sys-devel/gcc-14.0.1: dekeyword, better not to use it (yet)
Signed-off-by: Fabian Groffen gentoo.org>
sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild
b/sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild
index 65946e6d92..a1b9fee8c4 100644
--- a/sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild
+++ b/sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild
@@ -13,7 +13,9 @@ inherit toolchain
# Don't keyword live ebuilds
if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
- KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos
~x64-solaris"
+ #KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos
~x64-solaris"
+ # can't bootstrap from this using clang's libc++, better not use it
+ KEYWORDS=""
fi
# use alternate source for Apple M1 (also works for x86_64)
[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/binutils-config/, sys-devel/binutils-config/files/
commit: 81985363c3e3d01321ab75291d7c8274dcab
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Mar 8 16:03:27 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Mar 8 21:13:17 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=81985363
sys-devel/binutils-config: revbump for CLT 15.3 ld fix
Possibly this problem existed longer before, but it's a bit shady when
what ld is used.
Signed-off-by: Fabian Groffen gentoo.org>
...utils-config-5.1-r9.ebuild => binutils-config-5.1-r10.ebuild} | 0
sys-devel/binutils-config/files/ldwrapper.c | 9 ++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/sys-devel/binutils-config/binutils-config-5.1-r9.ebuild
b/sys-devel/binutils-config/binutils-config-5.1-r10.ebuild
similarity index 100%
rename from sys-devel/binutils-config/binutils-config-5.1-r9.ebuild
rename to sys-devel/binutils-config/binutils-config-5.1-r10.ebuild
diff --git a/sys-devel/binutils-config/files/ldwrapper.c
b/sys-devel/binutils-config/files/ldwrapper.c
index 00d4a69f73..c799b4cdd9 100644
--- a/sys-devel/binutils-config/files/ldwrapper.c
+++ b/sys-devel/binutils-config/files/ldwrapper.c
@@ -405,8 +405,9 @@ main(int argc, char *argv[])
* 14.2: 820.1
* 14.3.1: 857.1
* 15.0: 907 1022.1 Sanoma 23, platform_version iso
sdk_version
+* 15.31053.12 called ld
* all to be found from the PROJECT:ld64-650.9 or
-* PROJECT:dyld-1022.1 bit from the first line
+* PROJECT:dyld-1022.1 or PROJECT:ld-1053.12 bit from the first
line
* NOTE: e.g. my Sanoma mac with CommandLineTools has 650.9
* which is not a version from any Developer Tools ?!?
* Currently we need to distinguish XCode 15 according to
@@ -423,11 +424,13 @@ main(int argc, char *argv[])
long comp;
if (fgets(target, sizeof(target), ld64out) != 0 &&
((proj = strstr(target, "PROJECT:ld64-")) !=
NULL ||
-(proj = strstr(target, "PROJECT:dyld-")) !=
NULL))
+(proj = strstr(target, "PROJECT:dyld-")) !=
NULL ||
+(proj = strstr(target, "PROJECT:ld-")) !=
NULL))
{
/* we don't distinguish between ld64 and dyld
here, for
* now it seems the numbers line up for our
logic */
- proj += sizeof("PROJECT:ld64-") - 1;
+ proj += sizeof("PROJECT:ld") - 1;
+ proj += *proj == '-' ? 1 : 3;
comp = strtol(proj, , 10);
/* we currently have no need to parse
fractions, the
* major version is significant enough, so just
stop */
[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/
commit: 2f452f48ef4c4c94d6999d3c4555399816f9f5fa
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Mar 8 21:10:55 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Mar 8 21:13:19 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2f452f48
sys-devel/gcc-14.0.1: add pre-release for macOS
Seems like CLT15.3 broke something on GCC-13 wrt the headers which are
not understood. GCC-14 might fix this (at least it compiles using
GCC-12/13).
Signed-off-by: Fabian Groffen gentoo.org>
sys-devel/gcc/Manifest | 4 +
sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild | 148
2 files changed, 152 insertions(+)
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 6173450b30..889fc273b5 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -10,3 +10,7 @@ DIST gcc-13.2-darwin-r0.tar.gz 137958605 BLAKE2B
b6777b76baf2dc007c4080c0b7a6d44
DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B
c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb
SHA512
a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
DIST gcc-13.2.0-patches-7.tar.xz 37064 BLAKE2B
4a8700a8d44bfaa84926f8bfd0da4c5b0c0377f47fc0679456e909f7c9029b9cf1b72c0ba0bc505d9035d5c38e27f7e5b029727eaf2bc7aca417a6be966b2f43
SHA512
f440c97e6782ecb8581d41608e31a648ac426e2d870bc1d171da7794cdeff2fd0546cae0c7214e72fd3a00ead8a5c66f3f633b670b74553a2f3a40378b51f20c
DIST gcc-13.2.0.tar.xz 87858592 BLAKE2B
0034b29d3d6cc05821f0c4253ce077805943aff7b370729dd203bda57d89c107edd657eeddc2fb1e69ea15c7b0323b961f46516c7f4af89a3ccf7fea84701be2
SHA512
d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2
+DIST gcc-14-20240225.tar.xz 87651536 BLAKE2B
01283581b8684e0dce73b2d9a586e473f3c87753435d905e193816911edc06f9bd2a8d542a95d69f47f1c884124349520f410925b13b7bb51b913e603000d32f
SHA512
f424b0935d8fdcf9ff55067467eac20a518a11c2cb14928a47e1a218cde1f4238091f25861daf417d1125c5d5d5465d32fc1b3cb04504b3ca99fe27a7a7d5792
+DIST gcc-14.0.0-musl-patches-1.tar.xz 3576 BLAKE2B
692baee8a7709905d53aeb150d73a3721c4ba47ee5f397cfb1b5be905cf003ca02b60c94ee294d90ac39645cd5cdf186c7a3aa950c47d8cf680c128ed705b807
SHA512
0592ab98a7142e404623a6511c67dff61e9ade32c3fb2c0e75b456306e0af3799ad13252b50b3d2fdd31e5815d7f0b16b0ad63ab8386fe4d78729fc9c182d617
+DIST gcc-14.0.0-patches-24.tar.xz 14280 BLAKE2B
f5594e07f91a7871fc4470d84ecbf6576f53620c92f60821d2fdcf140869827d27a323d535af11b74f4b671ee7308e501f24841ceb0607ca3ebc032bd97d85b4
SHA512
d887b53a0849246bc79ee2510d7deffabc58fe7598e9e147e4a97fc3714341017627df3dae9a39ae5d3185946cb6e11d01a28aa1287958c401e641fa4312f48b
+DIST gcc-darwin-arm64-14.0.1_pre20240225.tar.gz 143722125 BLAKE2B
23bc15e1243d10e897c6bd78cc0459c4163e767867d29a354aa51335703d3cee669b550816f2dad3becbade5a604a269bb52c8518e0f58338a61433d378d0a3c
SHA512
a83c9764a7525a0768c871ef75915ad8dd5169873b29dc7c7b2413f2e7ab03c8c64888df4dbd74d0e82163cc760c01cec750e729b6df4ead03f23d6065b114d6
diff --git a/sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild
b/sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild
new file mode 100644
index 00..65946e6d92
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.0.1_pre20240225.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="14.0.0"
+PATCH_VER="24"
+MUSL_VER="1"
+MUSL_GCC_VER="14.0.0"
+
+inherit toolchain
+
+# Don't keyword live ebuilds
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+ KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos
~x64-solaris"
+fi
+
+# use alternate source for Apple M1 (also works for x86_64)
+IANSGCCVER="9bc66f9b11baf1c291b2afac429cb12bf8461f91"
+SRC_URI+=" elibc_Darwin? (
https://github.com/iains/gcc-darwin-arm64/archive/${IANSGCCVER}.tar.gz ->
gcc-darwin-arm64-${PV}.tar.gz )"
+
+# Technically only if USE=hardened *too* right now, but no point in
complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support
for it.
+# bug #830454
+RDEPEND="!prefix-guest? ( elibc_glibc? ( sys-libs/glibc[cet(-)?] ) )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ kernel_linux? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )
+ kernel_Darwin? (
+ || ( ${CATEGORY}/binutils-apple ${CATEGORY}/native-cctools )
+ )"
+
+src_unpack() {
+ if use elibc_Darwin ; then
+ # just use Ian's source, not the main one
+ S="${WORKDIR}/gcc-darwin-arm64-${IANSGCCVER}"
+ fi
+ default
+}
+
+src_prepare() {
+ # make sure 6
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/, profiles/prefix/darwin/macos/arch/ppc/
commit: 9bf960c92f48961d4e81ab0bdf7b7b20d9f65ae6 Author: Fabian Groffen gentoo org> AuthorDate: Fri Mar 8 19:52:42 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Fri Mar 8 19:55:21 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf960c9 profiles/prefix/darwin/macos: mask USE=pie default-znow where appropriate -z,now doesn't work with Darwin linkers pie mode doesn't work on PowerPC (where we find -mdynamic-no-pic code) Signed-off-by: Fabian Groffen gentoo.org> profiles/prefix/darwin/macos/arch/ppc/package.use.force | 6 +- profiles/prefix/darwin/macos/arch/ppc/package.use.mask | 5 - profiles/prefix/darwin/macos/package.use.force | 6 +- profiles/prefix/darwin/macos/package.use.mask | 6 +- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.use.force b/profiles/prefix/darwin/macos/arch/ppc/package.use.force index 6a8082838a01..8b8c4b921435 100644 --- a/profiles/prefix/darwin/macos/arch/ppc/package.use.force +++ b/profiles/prefix/darwin/macos/arch/ppc/package.use.force @@ -1,6 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Fabian Groffen (2024-03-08) +# un-force pie, won't work on this arch +sys-devel/gcc -pie + # Fabian Groffen (2016-12-20) # Force the host target to avoid dependency hell dev-ml/llvm-ocaml llvm_targets_PowerPC diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.use.mask b/profiles/prefix/darwin/macos/arch/ppc/package.use.mask index 9c83518aa275..49efca95022e 100644 --- a/profiles/prefix/darwin/macos/arch/ppc/package.use.mask +++ b/profiles/prefix/darwin/macos/arch/ppc/package.use.mask @@ -1,9 +1,12 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # The 32-bits profile is inherited by the 64-bits one! # All the Mac OS X profiles inherit from their matching arch profile here. +# Fabian Groffen (2024-03-08) +# mask pie, won't work on this arch +sys-devel/gcc pie # Elias Pipping (2007-09-01) # imlib2 does not compile with USE=mmx diff --git a/profiles/prefix/darwin/macos/package.use.force b/profiles/prefix/darwin/macos/package.use.force index 12147203082c..e5acd2f939e7 100644 --- a/profiles/prefix/darwin/macos/package.use.force +++ b/profiles/prefix/darwin/macos/package.use.force @@ -1,6 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Fabian Groffen (2024-03-08) +# -z,now is not something Darwin linkers understand +sys-devel/gcc -default-znow + # Jacob Floyd (2020-12-20) # Make sure we always use libcxxabi on macos prefix sys-libs/libcxx libcxxabi diff --git a/profiles/prefix/darwin/macos/package.use.mask b/profiles/prefix/darwin/macos/package.use.mask index fb4617ec5e85..752f5b30f15f 100644 --- a/profiles/prefix/darwin/macos/package.use.mask +++ b/profiles/prefix/darwin/macos/package.use.mask @@ -1,6 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Fabian Groffen (2024-03-08) +# -z,now is not something Darwin linkers understand +sys-devel/gcc default-znow + # Benda Xu (2023-08-18) # strlcpy and other BSD functions are available in the libc of macOS. # Should not use libbsd.
[gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/
commit: 2389f54d75dab39a49fe530736081b0cf2b54972
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Mar 2 12:56:59 2024 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Mar 2 12:57:48 2024 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2389f54d
scripts/auto-bootstraps: deprecate x86-darwin9, fix CHOST reporting
Signed-off-by: Fabian Groffen gentoo.org>
scripts/auto-bootstraps/analyse_result.py | 1 +
scripts/auto-bootstraps/dobootstrap | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/auto-bootstraps/analyse_result.py
b/scripts/auto-bootstraps/analyse_result.py
index 094462a1dc..5314d66593 100755
--- a/scripts/auto-bootstraps/analyse_result.py
+++ b/scripts/auto-bootstraps/analyse_result.py
@@ -10,6 +10,7 @@ from functools import cmp_to_key
resultsdir='./results'
deprecated_archs = (
+'i386-apple-darwin9',
'x86_64-pc-cygwin',
'i386-pc-solaris2.11',
'sparc-sun-solaris2.10',
diff --git a/scripts/auto-bootstraps/dobootstrap
b/scripts/auto-bootstraps/dobootstrap
index 45b37c5211..14cc137a0d 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -146,7 +146,8 @@ do_prepare() {
echo $((endtime - starttime)) > elapsedtime
# get identification of host that includes Linux distro, RAP,
...
- chost=$(${BASH} ./bootstrap-prefix.sh chost.identify x)
+ chost=$(env CHOST=${chost} \
+ ${BASH} ./bootstrap-prefix.sh chost.identify x)
rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/
rsync -q /dev/null ${UPLOAD}/${HOSTNAME}-$$/${chost}/
