diff options
29 files changed, 243 insertions, 26 deletions
diff --git a/app-arch/tar/tar-1.34-r3.ebuild b/app-arch/tar/tar-1.34-r3.ebuild index 8e3fc53e5d28..93ce4ad2e631 100644 --- a/app-arch/tar/tar-1.34-r3.ebuild +++ b/app-arch/tar/tar-1.34-r3.ebuild @@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? ( LICENSE="GPL-3+" SLOT="0" if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi IUSE="acl minimal nls selinux xattr" diff --git a/app-crypt/gcr/gcr-4.1.0.ebuild b/app-crypt/gcr/gcr-4.1.0.ebuild index d08607d8ba2c..0f243f0b1205 100644 --- a/app-crypt/gcr/gcr-4.1.0.ebuild +++ b/app-crypt/gcr/gcr-4.1.0.ebuild @@ -19,7 +19,7 @@ REQUIRED_USE=" " RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" DEPEND=" >=dev-libs/glib-2.68.0:2 diff --git a/app-office/calcurse/calcurse-4.8.0.ebuild b/app-office/calcurse/calcurse-4.8.0.ebuild index 1b3a331cd35c..c39f332da483 100644 --- a/app-office/calcurse/calcurse-4.8.0.ebuild +++ b/app-office/calcurse/calcurse-4.8.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://calcurse.org/files/${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc ppc64 ~x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" IUSE="caldav doc" diff --git a/app-text/blahtexml/blahtexml-1.0.ebuild b/app-text/blahtexml/blahtexml-1.0.ebuild index 6e6ac194f3ce..bb3d444f98f4 100644 --- a/app-text/blahtexml/blahtexml-1.0.ebuild +++ b/app-text/blahtexml/blahtexml-1.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/gvanas/blahtexml/archive/refs/tags/v${PV}.tar.gz -> LICENSE="BSD CC-BY-3.0 ZLIB" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86" +KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86" IUSE="doc" RDEPEND="dev-libs/xerces-c" diff --git a/app-text/iso-codes/iso-codes-4.15.0.ebuild b/app-text/iso-codes/iso-codes-4.15.0.ebuild index 0db2efc3ab90..98d9f0ff1f29 100644 --- a/app-text/iso-codes/iso-codes-4.15.0.ebuild +++ b/app-text/iso-codes/iso-codes-4.15.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV} LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" BDEPEND="${PYTHON_DEPS} sys-devel/gettext diff --git a/dev-cpp/glibmm/glibmm-2.66.6.ebuild b/dev-cpp/glibmm/glibmm-2.66.6.ebuild index 1f0b2d1e7803..44114415a1cd 100644 --- a/dev-cpp/glibmm/glibmm-2.66.6.ebuild +++ b/dev-cpp/glibmm/glibmm-2.66.6.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm" LICENSE="LGPL-2.1+" SLOT="2" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="gtk-doc debug test" RESTRICT="!test? ( test )" diff --git a/dev-libs/gjs/gjs-1.76.0.ebuild b/dev-libs/gjs/gjs-1.76.0.ebuild index 4fabb825582c..b3ccfb226004 100644 --- a/dev-libs/gjs/gjs-1.76.0.ebuild +++ b/dev-libs/gjs/gjs-1.76.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" SLOT="0" IUSE="+cairo examples readline sysprof test" -KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86" RESTRICT="!test? ( test )" RDEPEND=" diff --git a/dev-libs/glib/glib-2.76.2.ebuild b/dev-libs/glib/glib-2.76.2.ebuild index a53d2dfd3c87..82c17d96b107 100644 --- a/dev-libs/glib/glib-2.76.2.ebuild +++ b/dev-libs/glib/glib-2.76.2.ebuild @@ -16,7 +16,7 @@ IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test u RESTRICT="!test? ( test )" REQUIRED_USE="gtk-doc? ( test )" # Bug #777636 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" # * elfutils (via libelf) does not build on Windows. gresources are not embedded # within ELF binaries on that platform anyway and inspecting ELF binaries from diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild index 7362abb83315..620b2fe41248 100644 --- a/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild +++ b/dev-libs/gobject-introspection/gobject-introspection-1.76.1.ebuild @@ -15,7 +15,7 @@ SLOT="0" IUSE="doctool gtk-doc test" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # virtual/pkgconfig needed at runtime, bug #505408 RDEPEND=" diff --git a/dev-libs/vala-common/vala-common-0.56.7.ebuild b/dev-libs/vala-common/vala-common-0.56.7.ebuild index 7a1272520259..69cb9a8932f6 100644 --- a/dev-libs/vala-common/vala-common-0.56.7.ebuild +++ b/dev-libs/vala-common/vala-common-0.56.7.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/va LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" RDEPEND="" DEPEND="" diff --git a/dev-python/pkgcraft/pkgcraft-9999.ebuild b/dev-python/pkgcraft/pkgcraft-9999.ebuild index 8ffd087568b0..5a3929c9bc02 100644 --- a/dev-python/pkgcraft/pkgcraft-9999.ebuild +++ b/dev-python/pkgcraft/pkgcraft-9999.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft-python" inherit git-r3 - PKGCRAFT_VERSION_MAX="9999" + PKGCRAFT_VERSION_MAX="99999" PKGCRAFT_VERSION_MIN="9999" else SRC_URI="https://github.com/pkgcraft/pkgcraft-python/releases/download/v${PV}/${P/-python}.tar.gz" diff --git a/dev-python/pyfakefs/pyfakefs-5.2.2.ebuild b/dev-python/pyfakefs/pyfakefs-5.2.2.ebuild index 876026d4079f..bd296d0b3f4b 100644 --- a/dev-python/pyfakefs/pyfakefs-5.2.2.ebuild +++ b/dev-python/pyfakefs/pyfakefs-5.2.2.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" distutils_enable_tests pytest diff --git a/dev-util/blueprint-compiler/blueprint-compiler-0.6.0-r1.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-0.6.0-r1.ebuild index 26026e99abb1..852b7a270164 100644 --- a/dev-util/blueprint-compiler/blueprint-compiler-0.6.0-r1.ebuild +++ b/dev-util/blueprint-compiler/blueprint-compiler-0.6.0-r1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then else SRC_URI="https://gitlab.gnome.org/jwestman/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" S="${WORKDIR}"/${PN}-v${PV} - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="LGPL-3+" diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 4346a86c2097..57c0548e28ff 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1305,6 +1305,7 @@ distutils_pep517_install() { fi local root=${1} + export BUILD_DIR local -x WHEEL_BUILD_DIR=${BUILD_DIR}/wheel mkdir -p "${WHEEL_BUILD_DIR}" || die @@ -1326,6 +1327,7 @@ distutils_pep517_install() { ninjaopts = shlex.split(os.environ["NINJAOPTS"]) print(json.dumps({ + "builddir": "${BUILD_DIR}", "setup-args": sys.argv[1:], "compile-args": ["-v"] + ninjaopts, })) @@ -1341,6 +1343,7 @@ distutils_pep517_install() { ninjaopts = shlex.split(os.environ["NINJAOPTS"]) print(json.dumps({ + "builddir": "${BUILD_DIR}", "setup-args": sys.argv[1:], "compile-args": [ "-v", diff --git a/games-board/gnome-chess/gnome-chess-43.2.ebuild b/games-board/gnome-chess/gnome-chess-43.2.ebuild index 1dd91eb94c0c..a22599f8170b 100644 --- a/games-board/gnome-chess/gnome-chess-43.2.ebuild +++ b/games-board/gnome-chess/gnome-chess-43.2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Chess https://gitlab.gnome.org/GNOME/gnome LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 arm64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~riscv x86" RDEPEND=" >=dev-libs/glib-2.44:2 diff --git a/gnome-extra/gnome-boxes/gnome-boxes-44.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-44.1.ebuild index fe0ddd039b58..2500e1a81584 100644 --- a/gnome-extra/gnome-boxes/gnome-boxes-44.1.ebuild +++ b/gnome-extra/gnome-boxes/gnome-boxes-44.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Boxes" LICENSE="LGPL-2+ CC-BY-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" # FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice # FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements diff --git a/gnome-extra/gnome-weather/gnome-weather-44.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-44.0.ebuild index 2b4e8d9271d0..fd2ee5e451bc 100644 --- a/gnome-extra/gnome-weather/gnome-weather-44.0.ebuild +++ b/gnome-extra/gnome-weather/gnome-weather-44.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather" LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~amd64 arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" DEPEND=" >=dev-libs/glib-2.32:2 diff --git a/gui-libs/vte-common/vte-common-0.72.1.ebuild b/gui-libs/vte-common/vte-common-0.72.1.ebuild index b4c9736f8f2e..a94f16a8fe95 100644 --- a/gui-libs/vte-common/vte-common-0.72.1.ebuild +++ b/gui-libs/vte-common/vte-common-0.72.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE" LICENSE="LGPL-3+ GPL-3+" SLOT="2.91" # vte_api_version in meson.build IUSE="systemd" -KEYWORDS="~amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc ~x86" +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc ~x86" # Upstream is hostile and refuses to upload tarballs. SRC_URI="https://gitlab.gnome.org/GNOME/vte/-/archive/${PV}/vte-${PV}.tar.bz2" diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-44.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-44.0.ebuild index 7e16ff6a03c1..acb39307cb19 100644 --- a/media-gfx/gnome-font-viewer/gnome-font-viewer-44.0.ebuild +++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-44.0.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" DEPEND=" >=dev-libs/glib-2.56.0:2 diff --git a/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild b/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild index 451c24940a8e..d87aaaf94214 100644 --- a/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild +++ b/media-gfx/gphoto2/gphoto2-2.5.28-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86" IUSE="aalib ncurses nls readline" # aalib -> needs libjpeg diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild index 2b6f9396e544..f7af824d63f1 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.12.84.ebuild @@ -14,7 +14,7 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi S="${WORKDIR}/${MY_P}" diff --git a/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild b/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild index af2f06173c2b..d082b29eab97 100644 --- a/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.1.6.ebuild @@ -14,7 +14,7 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi S="${WORKDIR}/${MY_P}" diff --git a/media-gfx/shotwell/shotwell-0.32.0.ebuild b/media-gfx/shotwell/shotwell-0.32.0.ebuild index b6d3b9b8aa99..3fdc2549adac 100644 --- a/media-gfx/shotwell/shotwell-0.32.0.ebuild +++ b/media-gfx/shotwell/shotwell-0.32.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86" IUSE="opencv udev" DEPEND=" diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.48.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.48.0.ebuild index 98e756112dc6..ce83d599874d 100644 --- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.48.0.ebuild +++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.48.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts" LICENSE="LGPL-2+" SLOT="0/1" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86" IUSE="debug gnome gtk-doc +introspection kerberos man +vala" REQUIRED_USE="vala? ( introspection )" diff --git a/net-misc/networkmanager/networkmanager-1.42.6-r1.ebuild b/net-misc/networkmanager/networkmanager-1.42.6-r1.ebuild index 0736bfba9a6b..a09e74b249f4 100644 --- a/net-misc/networkmanager/networkmanager-1.42.6-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-1.42.6-r1.ebuild @@ -32,7 +32,7 @@ REQUIRED_USE=" ?? ( syslog systemd ) " -KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" COMMON_DEPEND=" sys-apps/util-linux[${MULTILIB_USEDEP}] diff --git a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-44.1.ebuild b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-44.1.ebuild index afe822786fe9..0a8b19e953a4 100644 --- a/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-44.1.ebuild +++ b/sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-44.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" IUSE="wayland X" DEPEND=" diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest index 29797d2e272d..b6ee312fa2ae 100644 --- a/sys-libs/musl/Manifest +++ b/sys-libs/musl/Manifest @@ -2,4 +2,6 @@ DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf DIST musl-1.2.3.tar.gz 1058642 BLAKE2B b7f667eeb6b9f612c086cb44e69b34da4361b8cb76819fb65f10ef7dd55f48d2f37a32d698dcada965c7c76c3c1cd5621447c4240b6ab2e5b39b2d214e7e302b SHA512 9332f713d3eb7de4369bc0327d99252275ee52abf523ee34b894b24a387f67579787f7c72a46cf652e090cffdb0bc3719a4e7b84dca66890b6a37f12e8ad089c DIST musl-1.2.3.tar.gz.asc 490 BLAKE2B 4de3d2b2f4e748795b71e144df3ac073c68b0b1b5d40c7a4c3507cc3700c1f47a4ec745f644fa78d82de4cd1915b80be7ac1071fdfd6d468e01361c49ded065d SHA512 01a857dbc3981c90244d4d1d883efe51986652ca5734a741c9d1a4d06c5a22831e85520ac67212268b70c22049317a8f39b3219be182e7e67741add428ac5bc6 +DIST musl-1.2.4.tar.gz 1063758 BLAKE2B 7b5c5e335c55248789bca26084a744152f1128dd39159bcf46456ce1a4438c50097c75c7b84aa2980dccf2156f45de41e446ee39c7b3a43d80592c2b9ce75d98 SHA512 498ec5d7941194a8806f4d42f0f6d218c862996ef1398b737d0d06995e0b7a6574b240a48088f6b84016b14b2776fe463f829dcb11149cdfc1023d496b235c55 +DIST musl-1.2.4.tar.gz.asc 490 BLAKE2B 2133cff9ae2c8f69213fb72a256533d0686fd118012bddf0880d444fdfa456c6b448681838fcf3effa5403fd1bfbef7274cac548fecca3ec2f2e4e217ef74409 SHA512 5a3362ef1e60ae021a2c56ecde202a9dfd71914f3631ab498c8b751c38b217010997c8b28e31ebb6d1a8fb2663165a35943615825e2c220eb48ce66908ea1a9e DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee diff --git a/sys-libs/musl/musl-1.2.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild new file mode 100644 index 000000000000..fae3ec67b201 --- /dev/null +++ b/sys-libs/musl/musl-1.2.4.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs prefix +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.musl-libc.org/musl" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/musl.asc + inherit verify-sig + + SRC_URI="https://musl.libc.org/releases/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )" +fi +GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab" +GETENT_FILE="musl-getent-${GETENT_COMMIT}.c" +SRC_URI+=" + https://dev.gentoo.org/~blueness/musl-misc/getconf.c + https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE} + https://dev.gentoo.org/~blueness/musl-misc/iconv.c +" + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety" +HOMEPAGE="https://musl.libc.org" + +LICENSE="MIT LGPL-2 GPL-2" +SLOT="0" +IUSE="crypt headers-only split-usr" + +QA_SONAME="usr/lib/libc.so" +QA_DT_NEEDED="usr/lib/libc.so" +# bug #830213 +QA_PRESTRIPPED="usr/lib/crtn.o" + +# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?) +# built as part as crossdev. Also, elide the blockers when in cross-*, +# as it doesn't make sense to block the normal CBUILD libxcrypt at all +# there when we're installing into /usr/${CHOST} anyway. +if [[ ${CATEGORY} == cross-* ]] ; then + IUSE="${IUSE/crypt/+crypt}" +else + RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )" + PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )" +fi + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} + +just_headers() { + use headers-only && is_crosscompile +} + +pkg_setup() { + if [ ${CTARGET} == ${CHOST} ] ; then + case ${CHOST} in + *-musl*) ;; + *) die "Use sys-devel/crossdev to build a musl toolchain" ;; + esac + fi + + # fix for #667126, copied from glibc ebuild + # make sure host make.conf doesn't pollute us + if is_crosscompile || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # We only verify the release; not the additional (fixed, safe) files + # we download. + # (Seem to get IPC error on verifying in cross?) + ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + +src_prepare() { + default + + mkdir "${WORKDIR}"/misc || die + cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die + cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die + cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die +} + +src_configure() { + strip-flags # Prevent issues caused by aggressive optimizations & bug #877343 + tc-getCC ${CTARGET} + + just_headers && export CC=true + + local sysroot + is_crosscompile && sysroot=/usr/${CTARGET} + ./configure \ + --target=${CTARGET} \ + --prefix="${EPREFIX}${sysroot}/usr" \ + --syslibdir="${EPREFIX}${sysroot}/lib" \ + --disable-gcc-wrapper || die +} + +src_compile() { + emake obj/include/bits/alltypes.h + just_headers && return 0 + + emake + if [[ ${CATEGORY} != cross-* ]] ; then + emake -C "${T}" getconf getent iconv \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + VPATH="${WORKDIR}/misc" + fi + + $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die + $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die +} + +src_install() { + local target="install" + just_headers && target="install-headers" + emake DESTDIR="${D}" ${target} + just_headers && return 0 + + # musl provides ldd via a sym link to its ld.so + local sysroot= + is_crosscompile && sysroot=/usr/${CTARGET} + local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*) + dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd" + + if ! use crypt ; then + # Allow sys-libs/libxcrypt[system] to provide it instead + rm "${ED}/usr/include/crypt.h" || die + rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die + fi + + if [[ ${CATEGORY} != cross-* ]] ; then + # Fish out of config: + # ARCH = ... + # SUBARCH = ... + # and print $(ARCH)$(SUBARCH). + local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak) + + # The musl build system seems to create a symlink: + # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute) + # During cross or within prefix, there's no guarantee that the host is + # using musl so that file may not exist. Use a relative symlink within + # ${D} instead. + rm "${ED}"/lib/ld-musl-${arch}.so.1 || die + if use split-usr; then + dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1 + # If it's still a dead symlnk, OK, we really do need to abort. + [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die + else + dosym libc.so /usr/lib/ld-musl-${arch}.so.1 + [[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die + fi + + cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die + sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die + eprefixify "${T}"/ldconfig + into / + dosbin "${T}"/ldconfig + into /usr + dobin "${T}"/getconf + dobin "${T}"/getent + dobin "${T}"/iconv + echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die + doenvd "${T}"/00musl + fi + + if is_crosscompile ; then + into /usr/${CTARGET} + dolib.a libssp_nonshared.a + else + dolib.a libssp_nonshared.a + fi +} + +pkg_preinst() { + # nothing to do if just installing headers + just_headers && return + + # prepare /etc/ld.so.conf.d/ for files + mkdir -p "${EROOT}"/etc/ld.so.conf.d +} + +pkg_postinst() { + is_crosscompile && return 0 + + [ -n "${ROOT}" ] && return 0 + + ldconfig || die +} diff --git a/www-client/tangram/tangram-2.0.ebuild b/www-client/tangram/tangram-2.0.ebuild index 22985cb29ff6..a598bc3ef0b4 100644 --- a/www-client/tangram/tangram-2.0.ebuild +++ b/www-client/tangram/tangram-2.0.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]] ; then EGIT_REPO_URI="https://github.com/sonnyp/${PN^}.git" else SRC_URI="https://dev.gentoo.org/~xgqt/distfiles/repackaged/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="GPL-3+" |