gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2026-03-15 23:00:58 +00:00
parent 8d8e72d526 cddb2e7adf
commit 4d1b592f21
13 changed files with 40 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app-misc/screen/files/screen-4.9.1-add-missing-pty.h-header.patch
View File

@@ -10,7 +10,7 @@ not-Linux, so add guard to only apply on Linux.
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#if defined(__linux__) || defined(__linux) || defined(linux)
+#if defined(__linux__) || defined(__linux) || defined(linux) || defined(__GNU__)
+#include <pty.h>
+#endif
#include <signal.h>

5
dev-lang/perl/perl-5.42.0.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -173,7 +173,8 @@ pkg_setup() {
case ${CHOST} in
*-darwin*) osname="darwin" ;;
*-solaris*) osname="solaris" ;;
*) osname="linux" ;;
*-linux*) osname="linux" ;;
*-gnu) osname="gnu" ;;
esac
myarch="${CHOST%%-*}-${osname}"

1
dev-util/mig/Manifest
View File

@@ -1,2 +1 @@
DIST mig-1.8.tar.bz2 205004 BLAKE2B a7f6998003d040d10a5c32e571272753d5699293ce761a65824f6d1f4417037e4f9663c379eadb62b6b9a19a99fe4ac486c88f453f923d362935398e7e3ac1fa SHA512 7a8853f80f0d7084244ff0c4f0fa48949216568fddc4fd3702995d04d4d29383087a846eb00443b35133ac38959dad5a085c230b926d9d69010c6031eaa3a0c3
DIST mig_1.8+git20231217.orig.tar.xz 197664 BLAKE2B 95a87684e1295bfcfb137ef2e7d9352c939daedd86cc95c4c4e06f4cd7caebc4fb02c8192ec9a9bd84ee49c5b15dd9d9ce6bcda584e50cf41c0d18fa99bbbcea SHA512 80cf8abae100231093507770c7de71f90c3dea656d06e676eab6670fbc7a743a1d85768783cbb7174ee06846d42ec4b079985c607cc87cd73de5a13742ba402c

46
dev-util/mig/mig-1.8.ebuild
View File

@@ -1,46 +0,0 @@
# Copyright 2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit crossdev
DESCRIPTION="GNU Mach 3.0 interface generator (IDL compiler)"
HOMEPAGE="https://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html"
if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/hurd/mig.git"
inherit autotools git-r3
BDEPEND="
sys-devel/bison
sys-devel/flex
"
else
SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
KEYWORDS="~x86"
fi
LICENSE="GPL-2 BSD-2"
SLOT="0"
if is_crosspkg ; then
DEPEND+=" cross-${CTARGET}/gnumach"
fi
src_prepare() {
default
[[ ${PV} == 9999 ]] && eautoreconf
}
src_configure() {
# Needs bison and flex
unset YACC LEX
local myeconfargs=(
--prefix="${EPREFIX}${sysroot}/usr"
)
econf "${myeconfargs[@]}"
}

1
eclass/meson.eclass
View File

@@ -122,6 +122,7 @@ _meson_get_machine_info() {
*-linux*) system=linux ;;
mingw*|*-mingw*) system=windows ;;
*-solaris*) system=sunos ;;
*-gnu) system=gnu ;;
esac
cpu_family=$(tc-arch "${tuple}")

15
sys-apps/util-linux/util-linux-2.41.3.ebuild
View File

@@ -341,6 +341,21 @@ multilib_src_configure() {
)
fi
if [[ ${CTARGET} == *-gnu ]] ; then
# Disable Linux-specific features
myeconfargs+=(
--disable-partx
--disable-rfkill
--disable-schedutils
--disable-fsck
)
# This is explicitly needed for some reason? TODO
myeconfargs+=(
--enable-agetty
)
fi
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
if multilib_is_native_abi && use python ; then

1
sys-kernel/gnumach/Manifest
View File

@@ -1,2 +1 @@
DIST gnumach-1.8.tar.gz 4053816 BLAKE2B 575d8cd1941739391e74263026ecd8a0dcdcd598ba02e930dbe7d5d65b09dba1c46d437eea15f7918e256f075b0f7b19c10f65c5dbbddcc9d2d7bcd67f1a27ea SHA512 05a4d1219e94bd3a4fc01d1fea81f0b0c39069a609eff6ba8081859401da621133110cf8f92e30f2a73293c60115b60937326e76ed48fb666ed67636929490f1
DIST gnumach_1.8+git20260224.orig.tar.xz 2951432 BLAKE2B 8f0bda1736aeebbb917fcf9f1d79b51a8a4d6315b170495ee10a81a787fe4bad15f17ebfd4bf1802b9cde0313ecbeee2b413a8954e69e7d23c6832fb4ec1f8c0 SHA512 aaea1653862a7d6fdcc741257a245e0f3d7dd177fdd78ed443f6c85ee6057e0effe27fb16f00d7ac64012664c1411907fbcf7bb330ca4f202da975a2d28afd6a

88
sys-kernel/gnumach/gnumach-1.8.ebuild
View File

@@ -1,88 +0,0 @@
# Copyright 2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit crossdev flag-o-matic toolchain-funcs
DESCRIPTION="GNU Mach Kernel"
HOMEPAGE="https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html"
if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/hurd/gnumach.git"
inherit autotools git-r3
else
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
KEYWORDS="~x86"
fi
LICENSE="GPL-2 BSD-2"
SLOT="0"
IUSE="headers-only"
if is_crosspkg ; then
DEPEND="
!headers-only? ( cross-${CTARGET}/mig )
"
else
DEPEND="
dev-util/mig
"
fi
src_prepare() {
default
[[ ${PV} == 9999 ]] && eautoreconf
}
src_configure() {
if target_is_not_host ; then
local sysroot=/usr/${CTARGET}
if use headers-only ; then
# Assume we don't have working cross-compiler
export CC=$(tc-getBUILD_CC)
else
export MIG="${CTARGET}-mig"
fi
fi
local myeconfargs=(
# MIG machinery relies on this!
--enable-dependency-tracking
--prefix="${EPREFIX}${sysroot}/usr"
--datadir="${EPREFIX}${sysroot}/usr/share"
--host=${CTARGET}
)
export LDFLAGS="$(raw-ldflags)"
econf "${myeconfargs[@]}"
}
src_compile() {
use headers-only && return
default
}
src_test() {
use headers-only && return
default
}
src_install() {
emake DESTDIR="${D}" $(usex headers-only install-data install)
if target_is_not_host ; then
# TODO: Is this needed?
# On hurd gcc expects system headers to be in /include, not /usr/include
dosym usr/include /usr/${CTARGET}/include
# Avoid installing manpages into common location to allow
# multiple Hurd targets.
# TODO: autoconf var?
rm -rfv "${ED}"/usr/share/info
rmdir "${ED}"/usr/share || die
fi
}

1
sys-kernel/hurd/Manifest
View File

@@ -1,2 +1 @@
DIST hurd-0.9.tar.bz2 2464800 BLAKE2B 71421acbe9a42b4c7c3b1af9a19fe6973510e9afd8a98569868521d3678d8cf75f0169a15f98d17de11729bbbaf4a667952fef4b2dc9cc864ffa48f5e62aa016 SHA512 715915c9bcb8f1f2102131e38931c2e151737ab7a2199f2e335f8e0b17439fde1fd1e6b6d681546391251043ba2c6ff3913cd80e9bb9f7bb83a93ef9afcb31b0
DIST hurd_0.9.git20251029.orig.tar.bz2 2047762 BLAKE2B a349bb475e966ed824b1a31b8f76edd72bef5a3c149ec810de140462893eca9d01f45784645f996b75b6277da49f75f2db524cc548febbcb46c2621ba024db3e SHA512 7322236abdea9bea0885983580890f3ed6393e567b6c1a5c52ffe40e76694e887eb22c1da5743e215a2c74b0e22af1457cd95fc517a6371e564da412378c2736

92
sys-kernel/hurd/hurd-0.9.ebuild
View File

@@ -1,92 +0,0 @@
# Copyright 2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit crossdev flag-o-matic
DESCRIPTION="GNU Hurd is the GNU project's replacement for UNIX"
HOMEPAGE="https://www.gnu.org/software/hurd/hurd.html"
if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/hurd/hurd.git"
inherit autotools git-r3
else
SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
KEYWORDS="~x86"
fi
LICENSE="GPL-2 BSD-2"
SLOT="0"
IUSE="headers-only"
if is_crosspkg ; then
BDEPEND="
!headers-only? ( cross-${CTARGET}/mig )
"
else
BDEPEND="
dev-util/mig
"
fi
src_prepare() {
default
[[ ${PV} == 9999 ]] && eautoreconf
}
src_configure() {
if target_is_not_host ; then
local sysroot=/usr/${CTARGET}
export MIG="${CTARGET}-mig"
fi
local myeconfargs=(
--prefix="${EPREFIX}${sysroot}/usr"
--datadir="${EPREFIX}${sysroot}/usr/share"
--host=${CTARGET}
)
if use headers-only ; then
myeconfargs+=(
ac_cv_func_file_exec_paths=no
ac_cv_func_exec_exec_paths=no
ac_cv_func__hurd_exec_paths=no
ac_cv_func__hurd_libc_proc_init=no
ac_cv_func_mach_port_set_ktype=no
ac_cv_func_file_utimens=no
# TODO: Wire these up to not be automagic for
# USE=-headers-only!
--without-libcrypt
--without-parted
--without-libbz2
--without-libz
--without-rump
--disable-ncursesw
)
fi
econf "${myeconfargs[@]}"
}
src_compile() {
use headers-only && return
default
}
src_test() {
use headers-only && return
default
}
src_install() {
emake DESTDIR="${D}" $(usex headers-only install-headers install) no_deps=t
if target_is_not_host ; then
# TODO: Is this needed?
# On Hurd, gcc expects system headers to be in /include, not /usr/include
dosym usr/include /usr/${CTARGET}/include
fi
}

6
sys-process/psmisc/psmisc-23.7.ebuild
View File

@@ -68,6 +68,8 @@ src_install() {
[[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
# fuser is needed by init.d scripts; use * wildcard for #458250
dodir /bin
mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
if use kernel_linux ; then
dodir /bin
mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
fi
}

3
virtual/logger/logger-0-r2.ebuild → virtual/logger/logger-0-r3.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,6 +17,7 @@ RDEPEND="
app-admin/socklog
app-admin/sysklogd
app-admin/syslog-ng
net-misc/inetutils[syslogd]
sys-apps/busybox[syslog]
) )
"

17
x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild
View File

@@ -1,14 +1,14 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
XORG_MULTILIB=yes
inherit xorg-3 meson-multilib
inherit dot-a xorg-3 meson-multilib
DESCRIPTION="Library providing generic access to the PCI bus and devices"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-solaris"
IUSE="zlib"
IUSE="zlib static-libs"
DEPEND="
zlib? ( >=virtual/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
@@ -19,10 +19,21 @@ src_prepare() {
default
}
src_configure() {
use static-libs && lto-guarantee-fat
multilib-minimal_src_configure
}
multilib_src_configure() {
local emesonargs=(
-Ddefault_library=$(multilib_native_usex static-libs both shared)
-Dpci-ids="${EPREFIX}"/usr/share/hwdata
$(meson_feature zlib)
)
meson_src_configure
}
multilib_src_install_all() {
einstalldocs
strip-lto-bytecode
}