Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Update profiles and fix some fallout #268

Merged
merged 11 commits into from
Jan 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions app-arch/xz-utils/xz-utils-5.2.5-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ HOMEPAGE="https://tukaani.org/xz/"
# See top-level COPYING file as it outlines the various pieces and their licenses.
LICENSE="public-domain LGPL-2.1+ GPL-2+"
SLOT="0"
IUSE="elibc_FreeBSD +extra-filters nls static-libs"
IUSE="+extra-filters nls static-libs"

RDEPEND="!<app-arch/lzma-4.63
!<app-arch/p7zip-4.57
Expand Down Expand Up @@ -73,7 +73,6 @@ multilib_src_configure() {
export gl_cv_posix_shell=${EPREFIX}/bin/sh
fi

use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
ECONF_SOURCE="${S}" econf "${myconf[@]}"
}

Expand Down
3 changes: 1 addition & 2 deletions app-arch/xz-utils/xz-utils-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ HOMEPAGE="https://tukaani.org/xz/"
# See top-level COPYING file as it outlines the various pieces and their licenses.
LICENSE="public-domain LGPL-2.1+ GPL-2+"
SLOT="0"
IUSE="elibc_FreeBSD +extra-filters nls static-libs"
IUSE="+extra-filters nls static-libs"

RDEPEND="!<app-arch/lzma-4.63
!<app-arch/p7zip-4.57
Expand Down Expand Up @@ -73,7 +73,6 @@ multilib_src_configure() {
export gl_cv_posix_shell=${EPREFIX}/bin/sh
fi

use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
ECONF_SOURCE="${S}" econf "${myconf[@]}"
}

Expand Down
1 change: 0 additions & 1 deletion app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ src_prepare() {
# going to include this so let's try to carry it forward.
# Contact me if it needs updating. Bug #486782.
# Anthony G. Basile <[email protected]>.
use elibc_uclibc && epatch "${FILESDIR}"/${PN}-fix-clone-uclibc.patch

# Remove profiled make files.
find -name '*_p.mk' -delete
Expand Down
2 changes: 1 addition & 1 deletion app-crypt/rhash/rhash-1.3.5.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ multilib_src_compile() {
$(use ssl && echo -ldl)
)

use elibc_Darwin || use elibc_DragonFly || use elibc_FreeBSD ||
use elibc_Darwin || use elibc_DragonFly ||
use elibc_NetBSD || use elibc_OpenBSD || use elibc_SunOS &&
ADDLDFLAGS+=( $(use nls && echo -lintl) )

Expand Down
2 changes: 2 additions & 0 deletions changelog/updates/2022-01-11-profiles-update.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- pciutils ([3.7.0](https://github.com/pciutils/pciutils/commit/864aecdea9c7db626856d8d452f6c784316a878c))
- usbutils ([014](https://github.com/gregkh/usbutils/commit/57fb18e59cce31a50a1ca62d1e192512c905ba00))
tormath1 marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 1 addition & 2 deletions dev-lang/perl/perl-5.32.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ src_configure() {
[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091

# Perl has problems compiling with -Os in your flags with glibc
use elibc_uclibc || replace-flags "-Os" "-O2"
replace-flags "-Os" "-O2"

# xlocale.h is going away in glibc-2.26, so it's counterproductive
# if we use it and include it in CORE/perl.h ... Perl builds just
Expand Down Expand Up @@ -737,7 +737,6 @@ src_test() {
ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
return 0
fi
use elibc_uclibc && export MAKEOPTS+=" -j1"
TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
}

Expand Down
3 changes: 1 addition & 2 deletions dev-lang/perl/perl-5.34.0-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ src_configure() {
[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091

# Perl has problems compiling with -Os in your flags with glibc
use elibc_uclibc || replace-flags "-Os" "-O2"
replace-flags "-Os" "-O2"

# xlocale.h is going away in glibc-2.26, so it's counterproductive
# if we use it and include it in CORE/perl.h ... Perl builds just
Expand Down Expand Up @@ -737,7 +737,6 @@ src_test() {
ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
return 0
fi
use elibc_uclibc && export MAKEOPTS+=" -j1"
TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
}

Expand Down
3 changes: 1 addition & 2 deletions dev-lang/perl/perl-5.34.0-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ src_configure() {
[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091

# Perl has problems compiling with -Os in your flags with glibc
use elibc_uclibc || replace-flags "-Os" "-O2"
replace-flags "-Os" "-O2"

# xlocale.h is going away in glibc-2.26, so it's counterproductive
# if we use it and include it in CORE/perl.h ... Perl builds just
Expand Down Expand Up @@ -738,7 +738,6 @@ src_test() {
ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
return 0
fi
use elibc_uclibc && export MAKEOPTS+=" -j1"
TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
}

Expand Down
3 changes: 1 addition & 2 deletions dev-lang/perl/perl-5.34.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ src_configure() {
[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091

# Perl has problems compiling with -Os in your flags with glibc
use elibc_uclibc || replace-flags "-Os" "-O2"
replace-flags "-Os" "-O2"

# xlocale.h is going away in glibc-2.26, so it's counterproductive
# if we use it and include it in CORE/perl.h ... Perl builds just
Expand Down Expand Up @@ -734,7 +734,6 @@ src_test() {
ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
return 0
fi
use elibc_uclibc && export MAKEOPTS+=" -j1"
TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
}

Expand Down
3 changes: 1 addition & 2 deletions dev-lang/python/python-2.7.18_p13.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="berkdb bluetooth build elibc_uclibc examples gdbm hardened +ncurses +readline +sqlite +ssl tk wininst +xml"
IUSE="berkdb bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl tk wininst +xml"

# Do not add a dependency on dev-lang/python to this ebuild.
# If you need to apply a patch which requires python for bootstrapping, please
Expand Down Expand Up @@ -292,7 +292,6 @@ src_install() {
use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py*,test/test_bsddb*} || die
use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,lib-tk} || die
use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}

use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die

Expand Down
8 changes: 1 addition & 7 deletions dev-libs/expat/expat-2.4.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="elibc_FreeBSD examples static-libs unicode"
IUSE="examples static-libs unicode"
BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"

DOCS=( README.md )
Expand Down Expand Up @@ -73,12 +73,6 @@ multilib_src_install() {
sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
popd >/dev/null
fi

if multilib_is_native_abi ; then
# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
use elibc_FreeBSD && gen_usr_ldscript -a expat
fi
}

multilib_src_install_all() {
Expand Down
3 changes: 1 addition & 2 deletions eclass/java-utils-2.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Keep versionator inheritance in case consumers are using it implicitly.
[[ ${EAPI} == [0123456] ]] && inherit eapi7-ver eutils multilib versionator

IUSE="elibc_FreeBSD"
IUSE=""

# Make sure we use java-config-2
export WANT_JAVA_CONFIG="2"
Expand Down Expand Up @@ -1688,7 +1688,6 @@ java-pkg_get-jni-cflags() {
local flags="-I${JAVA_HOME}/include"

local platform="linux"
use elibc_FreeBSD && platform="freebsd"

# TODO do a check that the directories are valid
flags="${flags} -I${JAVA_HOME}/include/${platform}"
Expand Down
3 changes: 0 additions & 3 deletions net-nds/openldap/openldap-2.4.57.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,6 @@ build_contrib_module() {
}

src_configure() {
# Bug 408001
use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync

# connectionless ldap per bug #342439
append-cppflags -DLDAP_CONNECTIONLESS

Expand Down
3 changes: 0 additions & 3 deletions net-nds/openldap/openldap-2.4.58.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,6 @@ build_contrib_module() {
}

src_configure() {
# Bug 408001
use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync

# connectionless ldap per bug #342439
append-cppflags -DLDAP_CONNECTIONLESS

Expand Down
7 changes: 1 addition & 6 deletions profiles/arch/alpha/make.defaults
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

ARCH="alpha"
Expand All @@ -23,11 +23,6 @@ LIBDIR_alpha="lib"
# Defaults for video drivers
VIDEO_CARDS="fbdev glint mga nv r128 radeon"

# Chris Gianelloni <[email protected]> (2007-02-05)
# Defaults for audio drivers. These are copied from x86 (minus modems), since
# Alpha supports the same busses.
ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 maestro3 trident usb-audio via82xx ymfpci"

# Tobias Klausmann <[email protected]> (2018-06-25)
# Enable USE=libtirpc by default, to ease dependency resolution during
# the stabilization of glibc-2.26. Bug 657148
Expand Down
113 changes: 93 additions & 20 deletions profiles/arch/alpha/package.use.mask
Original file line number Diff line number Diff line change
@@ -1,6 +1,96 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# Michał Górny <[email protected]> (2021-12-30)
# Don't apply stable masks to python-exec since we're forcing every
# impl there anyway. Please keep this in sync with use.mask.
dev-lang/python-exec -python_targets_python3_10

# Vadim Misbakh-Soloviov <[email protected]> (2021-12-09)
# ts-cli requires rust to be built, and rust is unavailable here ATM.
dev-libs/tree-sitter ts-cli

# Sam James <[email protected]> (2021-11-05)
# Avoid keywording unnecessary depenencies for now, bug #804115
dev-python/scipy pythran

# Sam James <[email protected]> (2021-11-05)
# Test suite is very fragile and doesn't even run on amd64.
# No real point in running it here right now, bug #804115.
dev-cpp/eigen test

# Arthur Zamarin <[email protected]> (2021-10-24)
# dev-ruby/furo isn't keyworded here
dev-python/argon2-cffi doc

# Sam James <[email protected]> (2021-09-12)
# dev-ruby/asciidoctor isn't keyworded here
dev-util/ccache doc

# David Seifert <[email protected]> (2021-09-04)
# dev-lang/go not keyworded here
sys-libs/libcap tools

# Marek Szuba <[email protected]> (2021-08-17)
# net-wireless/rtl-sdr not keyworded here
sys-apps/rng-tools rtlsdr

# Marek Szuba <[email protected]> (2021-08-11)
# dev-ruby/thor not keyworded here
app-text/htmltidy test

# Matt Turner <[email protected]> (2021-07-23)
# gui-libs/gtk is not keyworded
net-libs/gssdp gtk

# Lars Wendler <[email protected]> (2021-07-09)
# dev-libs/libbpf is not keyworded for alpha (yet?)
sys-apps/iproute2 bpf

# Matt Turner <[email protected]> (2021-06-10)
# dev-python/django is not keyworded here
dev-python/diskcache test

# Miroslav Šulc <[email protected]> (2021-03-13)
# virtual/jdk isn't keyworded here
media-libs/rubberband jni

# Sam James <[email protected]> (2021-03-11)
# media-libs/libheif isn't keyworded here
# media-libs/libavif isn't keyworded here
media-libs/gd avif heif

# Sam James <[email protected]> (2021-02-26)
# dev-libs/efl not keyworded here
# and is a desktop application mainly
# bug #773178
app-crypt/pinentry efl

# Andreas Sturmlechner <[email protected]> (2021-02-14)
# sci-libs/cholmod is not keyworded.
sci-libs/umfpack cholmod

# Sam James <[email protected]> (2021-02-22)
# media-sound/sndio is not yet keyworded here
# bug #769098, bug #769122
media-libs/openal sndio
media-video/ffmpeg sndio
media-sound/moc sndio
media-sound/mpd sndio
media-libs/libsdl2 sndio
media-libs/libao sndio

# Sam James <[email protected]> (2021-01-19)
# Avoid pulling in a large unkeyworded dep
# which is largely a desktop application
# bug #766186
app-text/dblatex inkscape

# Sam James <[email protected]> (2021-01-19)
# app-text/dblatex not yet keyworded
# bug #766186
dev-util/ragel doc

# Joonas Niilola <[email protected]> (2021-01-15)
# Dependency not keyworded on this arch.
app-text/enchant voikko
Expand Down Expand Up @@ -147,7 +237,7 @@ app-arch/rpm test

# Tomáš Mózes <[email protected]> (2018-06-05)
# Unkeyworded dependencies.
app-admin/syslog-ng amqp kafka
app-admin/syslog-ng amqp kafka mongodb

# Thomas Deutschmann <[email protected]> (2018-06-02)
# Needs dev-ruby/asciidoctor which has a lot of unstable deps
Expand Down Expand Up @@ -182,7 +272,7 @@ x11-themes/qtcurve plasma
dev-db/mariadb numa

# Gilles Dartiguelongue <[email protected]> (2017-08-16)
# missing keyword on dev-python/dbusmock, bug #620024
# missing keyword on dev-python/python-dbusmock, bug #620024
>=gnome-base/gnome-settings-daemon-3.24 test

# Michał Górny <[email protected]> (2017-08-08)
Expand All @@ -193,11 +283,6 @@ net-libs/gnutls test-full
# Requires USE=bluetooth that is masked in this profile.
media-sound/pulseaudio native-headset

# Robin H. Johnson <[email protected]> (2017-08-05)
# Upstream Git is switching to PCRE2 w/ JIT.
# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
dev-vcs/git pcre-jit

# Tobias Klausmann <[email protected]> (2017-05-18)
# Stack protector code is not ported to alpha (and may not ever be)
>=sys-devel/gcc-6 ssp
Expand Down Expand Up @@ -256,10 +341,6 @@ media-video/ffmpeg openh264
# sys-cluster/ceph is not broken per se, but a maintenance burden.
net-analyzer/rrdtool rados

# James Le Cuirot <[email protected]> (2016-01-30)
# scrollview requires Java, which is unsupported on Alpha.
app-text/tesseract scrollview

# Matt Turner <[email protected]> (2015-11-15)
# Missing keywords
dev-util/perf numa
Expand Down Expand Up @@ -288,10 +369,6 @@ net-misc/networkmanager wext
# dev-lua/lgi lacks alpha keyword, bug #551540
dev-libs/libpeas lua

# Michał Górny <[email protected]> (2015-02-22)
# Dependency not keyworded for some reason.
media-libs/gegl umfpack

# Johannes Huber <[email protected]> (2015-01-28)
# Missing keyword on dev-libs/botan
app-crypt/qca botan
Expand Down Expand Up @@ -319,10 +396,6 @@ app-accessibility/orca braille
# media-libs/x265 doesn't work on alpha (bug 519046)
media-video/ffmpeg x265

# Tobias Klausmann <[email protected] (2014-07-16)
# neither dietlibc nor klibc will likely ever build/work on alpha, bug #487672
>=sys-fs/dmraid-1.0.0_rc16-r3 dietlibc klibc

# Pacho Ramos <[email protected]> (2014-02-22)
# Missing keywords, bug #495250
>=gnome-base/gnome-extra-apps-3.10 tracker
Expand Down
Loading