diff options
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/Manifest.gz | bin | 202870 -> 202886 bytes | |||
| -rw-r--r-- | profiles/base/package.use | 6 | ||||
| -rw-r--r-- | profiles/default/linux/s390/23.0/split-usr/s390x/parent | 1 | ||||
| -rw-r--r-- | profiles/features/musl/package.mask | 4 | ||||
| -rw-r--r-- | profiles/package.mask | 11 | ||||
| -rw-r--r-- | profiles/releases/23.0/profile.bashrc | 43 | ||||
| -rw-r--r-- | profiles/updates/1Q-2024 | 7 |
7 files changed, 68 insertions, 4 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz Binary files differindex ea7478a98283..42a1e4695f72 100644 --- a/profiles/Manifest.gz +++ b/profiles/Manifest.gz diff --git a/profiles/base/package.use b/profiles/base/package.use index 687c16860467..cf646b56fb24 100644 --- a/profiles/base/package.use +++ b/profiles/base/package.use @@ -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 +# Arthur Zamarin <arthurzam@gentoo.org> (2024-03-23) +# Used by pkgcheck, so let's make it easier for all developers to install it +>=dev-libs/tree-sitter-bash-0.21.0 python + # Alfred Wingate <parona@protonmail.com> (2023-12-25) # Default to gbm on non-desktop with REQUIRED_USE: ^^ ( gbm wayland X ) >=media-tv/kodi-20.2 gbm udev diff --git a/profiles/default/linux/s390/23.0/split-usr/s390x/parent b/profiles/default/linux/s390/23.0/split-usr/s390x/parent index ced716045c37..1948cc43d59a 100644 --- a/profiles/default/linux/s390/23.0/split-usr/s390x/parent +++ b/profiles/default/linux/s390/23.0/split-usr/s390x/parent @@ -2,3 +2,4 @@ ../../../../../../releases/23.0 ../../../.. ../../../../../../arch/s390/s390x +../../../../../../features/split-usr diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask index 5258f32f66d3..6724b64dde31 100644 --- a/profiles/features/musl/package.mask +++ b/profiles/features/musl/package.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Maciej Barć <xgqt@gentoo.org> (2024-03-23) +# Binary package, which is compiled against glibc +www-apps/jellyfin-bin + # Arthur Zamarin <arthurzam@gentoo.org> (2024-03-15) # Needs ada sci-electronics/ghdl diff --git a/profiles/package.mask b/profiles/package.mask index 01d948a3b058..bb3183d7b1cd 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,17 @@ #--- END OF EXAMPLES --- +# Michał Górny <mgorny@gentoo.org> (2024-03-23) +# No maintainer. Broken tests. Not ported to PEP517 build. +# No release since 2020, little activity since. No revdeps. +# Removal on 2024-04-22. Bug #911780. +dev-python/prov + +# Michał Górny <mgorny@gentoo.org> (2024-03-23) +# Apparently broken. No tests. Last code change in 2016. No revdeps. +# Removal on 2024-04-22. Bug #892613. +dev-python/sphinxcontrib-asyncio + # Alexey Sokolov <alexey+gentoo@asokolov.org> (2023-03-23) # Source incompatible with mygui-3.4.1 # https://bugs.gentoo.org/927634 diff --git a/profiles/releases/23.0/profile.bashrc b/profiles/releases/23.0/profile.bashrc index 6c178b086158..ae82a4b3216e 100644 --- a/profiles/releases/23.0/profile.bashrc +++ b/profiles/releases/23.0/profile.bashrc @@ -1,5 +1,40 @@ -if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -e "${EROOT%/}/bin" ]] ; then - if [[ ! -h "${EROOT%/}/bin" ]] && [[ "${PROFILE_23_USRTYPE}" != "split-usr" ]] ; then + +__gentoo_get_disk_splitmerge() { + # does /bin exist? important for baselayout + if [[ -e "${EROOT%/}/bin" ]] ; then + # is /bin a symlink? + if [[ -h "${EROOT%/}/bin" ]] ; then + echo -n merged + else + echo -n split + fi + else + echo -n unknown + fi +} + +__gentoo_get_profile_splitmerge() { + # does /etc/portage/make.profile exist and is a symlink? + if [[ -h "${EROOT%/}/etc/portage/make.profile" ]] ; then + local linktarget=$(readlink "${EROOT%/}/etc/portage/make.profile") + + # 23.0 profile? + if [[ "${linktarget}" == */23.0* ]] ; then + if [[ "${linktarget}" == *split-usr* ]] ; then + echo -n split + else + echo -n merged + fi + else + echo -n unknown + fi + else + echo -n unknown + fi +} + +if [[ "${EBUILD_PHASE}" == "setup" ]] ; then + if [[ $(__gentoo_get_disk_splitmerge) == "split" ]] && [[ $(__gentoo_get_profile_splitmerge) == "merged" ]] ; then eerror "" eerror "Your profile is of type merged-usr, but your directories" eerror "on-disk are of type split-usr." @@ -8,7 +43,7 @@ if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -e "${EROOT%/}/bin" ]] ; then eerror "" die "ERROR: 23.0 merged-usr profile, but disk is split-usr" fi - if [[ -h "${EROOT%/}/bin" ]] && [[ "${PROFILE_23_USRTYPE}" == "split-usr" ]] ; then + if [[ $(__gentoo_get_disk_splitmerge) == "merged" ]] && [[ $(__gentoo_get_profile_splitmerge) == "split" ]] ; then eerror "" eerror "Your profile is of type split-usr, but your directories" eerror "on-disk are of type merged-usr." @@ -18,3 +53,5 @@ if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ -e "${EROOT%/}/bin" ]] ; then die "ERROR: 23.0 split-usr profile, but disk is merged-usr" fi fi + +unset -f __gentoo_get_disk_splitmerge __gentoo_get_profile_splitmerge diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024 index 9fbf3b9d261c..9c01fdc4d5ab 100644 --- a/profiles/updates/1Q-2024 +++ b/profiles/updates/1Q-2024 @@ -92,3 +92,10 @@ move sci-libs/scikit-learn dev-python/scikit-learn slotmove =dev-ruby/launchy-3.0.0 0 3 move dev-python/DBUtils dev-python/dbutils move dev-python/aiorpcX dev-python/aiorpcx +move www-apps/sonarr www-apps/sonarr-bin +move www-apps/jellyfin www-apps/jellyfin-bin +move www-apps/radarr www-apps/radarr-bin +move www-apps/lidarr www-apps/lidarr-bin +move www-apps/prowlarr www-apps/prowlarr-bin +move www-apps/radarr www-apps/radarr-bin +move www-apps/jackett www-apps/jackett-bin |