From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1451527-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 0B482158020
for <garchives@archives.gentoo.org>; Sun, 30 Oct 2022 09:35:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1159FE0918;
Sun, 30 Oct 2022 09:35:06 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C36F2E0918
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Oct 2022 09:35:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E507C340D5C
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Oct 2022 09:35:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 757796E8
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Oct 2022 09:35:02 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1667122409.75b02a79f8717694050c317553e02fd25fdfd046.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/eudev/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-fs/eudev/eudev-3.2.11-r3.ebuild sys-fs/eudev/eudev-3.2.12_pre3.ebuild sys-fs/eudev/eudev-9999.ebuild
X-VCS-Directories: sys-fs/eudev/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 75b02a79f8717694050c317553e02fd25fdfd046
X-VCS-Branch: master
Date: Sun, 30 Oct 2022 09:35:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1f96b603-c134-4397-8c16-15f15ae8dff0
X-Archives-Hash: 6a290c4c8e3125023f45dbdc96c5cd1c
commit: 75b02a79f8717694050c317553e02fd25fdfd046
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 8 21:58:07 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 09:33:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b02a79
sys-fs/eudev: wire up 'split-usr' USE flag
Closes: https://bugs.gentoo.org/736080
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/27700
Signed-off-by: Sam James <sam <AT> gentoo.org>
...v-3.2.12_pre3.ebuild => eudev-3.2.11-r3.ebuild} | 98 +++++++++++-----------
sys-fs/eudev/eudev-3.2.12_pre3.ebuild | 25 ++++--
sys-fs/eudev/eudev-9999.ebuild | 25 ++++--
3 files changed, 82 insertions(+), 66 deletions(-)
diff --git a/sys-fs/eudev/eudev-3.2.12_pre3.ebuild b/sys-fs/eudev/eudev-3.2.11-r3.ebuild
similarity index 75%
copy from sys-fs/eudev/eudev-3.2.12_pre3.ebuild
copy to sys-fs/eudev/eudev-3.2.11-r3.ebuild
index d286cedd7a14..a1a0e698f4ca 100644
--- a/sys-fs/eudev/eudev-3.2.12_pre3.ebuild
+++ b/sys-fs/eudev/eudev-3.2.11-r3.ebuild
@@ -1,36 +1,32 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=8
+EAPI=7
KV_MIN=2.6.39
-inherit linux-info multilib-minimal toolchain-funcs udev
+inherit autotools linux-info multilib-minimal toolchain-funcs
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/eudev-project/eudev.git"
- inherit autotools git-r3
+ inherit git-r3
else
- MY_PV=${PV/_pre/-pre}
- SRC_URI="https://github.com/eudev-project/eudev/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz"
- S="${WORKDIR}"/${PN}-${MY_PV}
-
- if [[ ${PV} != *_pre* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
- fi
+ SRC_URI="https://github.com/eudev-project/eudev/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/eudev-project/eudev"
+HOMEPAGE="https://github.com/gentoo/eudev"
LICENSE="LGPL-2.1 MIT GPL-2"
SLOT="0"
-IUSE="+kmod rule-generator selinux static-libs test"
+IUSE="+kmod introspection rule-generator selinux split-usr static-libs test"
RESTRICT="!test? ( test )"
DEPEND=">=sys-apps/util-linux-2.20
>=sys-kernel/linux-headers-${KV_MIN}
virtual/libcrypt:=
+ introspection? ( >=dev-libs/gobject-introspection-1.38 )
kmod? ( >=sys-apps/kmod-16 )
selinux? ( >=sys-libs/libselinux-2.1.9 )
!sys-apps/gentoo-systemd-integration
@@ -46,10 +42,8 @@ RDEPEND="${DEPEND}
BDEPEND="dev-util/gperf
virtual/os-headers
virtual/pkgconfig
- test? (
- app-text/tree
- dev-lang/perl
- )"
+ >=sys-devel/make-3.82-r4
+ test? ( app-text/tree dev-lang/perl )"
PDEPEND=">=sys-fs/udev-init-scripts-26"
MULTILIB_WRAPPED_HEADERS=(
@@ -58,7 +52,7 @@ MULTILIB_WRAPPED_HEADERS=(
pkg_pretend() {
ewarn
- ewarn "As of 2013-01-29, ${PN} provides the new interface renaming functionality,"
+ ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
ewarn "as described in the URL below:"
ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
ewarn
@@ -85,15 +79,20 @@ pkg_setup() {
}
src_prepare() {
- default
-
- # Change rules back to group uucp instead of dialout for now
+ # change rules back to group uucp instead of dialout for now
sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
|| die "failed to change group dialout to uucp"
- if [[ ${PV} == 9999* ]] ; then
- eautoreconf
- fi
+ default
+ eautoreconf
+}
+
+rootprefix() {
+ usex split-usr '' /usr
+}
+
+sbindir() {
+ usex split-usr sbin bin
}
multilib_src_configure() {
@@ -102,37 +101,41 @@ multilib_src_configure() {
# bug #502950
export cc_cv_CFLAGS__flto=no
- local myeconfargs=(
+ # Keep sorted by ./configure --help and only pass --disable flags
+ # when *required* to avoid external deps or unnecessary compile
+ local econf_args
+ econf_args=(
ac_cv_search_cap_init=
ac_cv_header_sys_capability_h=yes
-
DBUS_CFLAGS=' '
DBUS_LIBS=' '
-
- --with-rootprefix=
+ --with-rootprefix="${EPREFIX}$(rootprefix)"
--with-rootrundir=/run
--exec-prefix="${EPREFIX}"
- --bindir="${EPREFIX}"/bin
+ --bindir="${EPREFIX}$(rootprefix)/bin"
+ --sbindir="${EPREFIX}$(rootprefix)/$(sbindir)"
--includedir="${EPREFIX}"/usr/include
- --libdir="${EPREFIX}"/usr/$(get_libdir)
- --with-rootlibexecdir="${EPREFIX}"/lib/udev
- --enable-split-usr
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ --with-rootlibexecdir="${EPREFIX}$(rootprefix)/lib/udev"
+ $(use_enable split-usr)
--enable-manpages
)
# Only build libudev for non-native_abi, and only install it to libdir,
# that means all options only apply to native_abi
- if multilib_is_native_abi ; then
- myeconfargs+=(
- --with-rootlibdir="${EPREFIX}"/$(get_libdir)
+ if multilib_is_native_abi; then
+ econf_args+=(
+ --with-rootlibdir="${EPREFIX}$(rootprefix)/$(get_libdir)"
+ $(use_enable introspection)
$(use_enable kmod)
$(use_enable static-libs static)
$(use_enable selinux)
$(use_enable rule-generator)
)
else
- myeconfargs+=(
+ econf_args+=(
--disable-static
+ --disable-introspection
--disable-kmod
--disable-selinux
--disable-rule-generator
@@ -140,11 +143,11 @@ multilib_src_configure() {
)
fi
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+ ECONF_SOURCE="${S}" econf "${econf_args[@]}"
}
multilib_src_compile() {
- if multilib_is_native_abi ; then
+ if multilib_is_native_abi; then
emake
else
emake -C src/shared
@@ -153,21 +156,22 @@ multilib_src_compile() {
}
multilib_src_test() {
- # Make sandbox get out of the way.
- # These are safe because there is a fake root filesystem put in place,
+ # make sandbox get out of the way
+ # these are safe because there is a fake root filesystem put in place,
# but sandbox seems to evaluate the paths of the test i/o instead of the
- # paths of the actual i/o that results. Also only test for native abi
- if multilib_is_native_abi ; then
+ # paths of the actual i/o that results.
+ # also only test for native abi
+ if multilib_is_native_abi; then
addread /sys
addwrite /dev
addwrite /run
- default
+ default_src_test
fi
}
multilib_src_install() {
- if multilib_is_native_abi ; then
+ if multilib_is_native_abi; then
emake DESTDIR="${D}" install
else
emake -C src/libudev DESTDIR="${D}" install
@@ -177,19 +181,13 @@ multilib_src_install() {
multilib_src_install_all() {
find "${ED}" -name '*.la' -delete || die
- insinto /lib/udev/rules.d
+ insinto "$(rootprefix)/lib/udev/rules.d"
doins "${FILESDIR}"/40-gentoo.rules
use rule-generator && doinitd "${FILESDIR}"/udev-postmount
}
-pkg_postrm() {
- udev_reload
-}
-
pkg_postinst() {
- udev_reload
-
mkdir -p "${EROOT}"/run
# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
diff --git a/sys-fs/eudev/eudev-3.2.12_pre3.ebuild b/sys-fs/eudev/eudev-3.2.12_pre3.ebuild
index d286cedd7a14..15d7e4a514a0 100644
--- a/sys-fs/eudev/eudev-3.2.12_pre3.ebuild
+++ b/sys-fs/eudev/eudev-3.2.12_pre3.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/eudev-project/eudev"
LICENSE="LGPL-2.1 MIT GPL-2"
SLOT="0"
-IUSE="+kmod rule-generator selinux static-libs test"
+IUSE="+kmod rule-generator selinux split-usr static-libs test"
RESTRICT="!test? ( test )"
DEPEND=">=sys-apps/util-linux-2.20
@@ -96,6 +96,14 @@ src_prepare() {
fi
}
+rootprefix() {
+ usex split-usr '' /usr
+}
+
+sbindir() {
+ usex split-usr sbin bin
+}
+
multilib_src_configure() {
# bug #463846
tc-export CC
@@ -109,14 +117,15 @@ multilib_src_configure() {
DBUS_CFLAGS=' '
DBUS_LIBS=' '
- --with-rootprefix=
+ --with-rootprefix="${EPREFIX}$(rootprefix)"
--with-rootrundir=/run
--exec-prefix="${EPREFIX}"
- --bindir="${EPREFIX}"/bin
+ --bindir="${EPREFIX}$(rootprefix)/bin"
+ --sbindir="${EPREFIX}$(rootprefix)/$(sbindir)"
--includedir="${EPREFIX}"/usr/include
- --libdir="${EPREFIX}"/usr/$(get_libdir)
- --with-rootlibexecdir="${EPREFIX}"/lib/udev
- --enable-split-usr
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ --with-rootlibexecdir="${EPREFIX}$(rootprefix)/lib/udev"
+ $(use_enable split-usr)
--enable-manpages
)
@@ -124,7 +133,7 @@ multilib_src_configure() {
# that means all options only apply to native_abi
if multilib_is_native_abi ; then
myeconfargs+=(
- --with-rootlibdir="${EPREFIX}"/$(get_libdir)
+ --with-rootlibdir="${EPREFIX}$(rootprefix)/$(get_libdir)"
$(use_enable kmod)
$(use_enable static-libs static)
$(use_enable selinux)
@@ -177,7 +186,7 @@ multilib_src_install() {
multilib_src_install_all() {
find "${ED}" -name '*.la' -delete || die
- insinto /lib/udev/rules.d
+ insinto "$(rootprefix)/lib/udev/rules.d"
doins "${FILESDIR}"/40-gentoo.rules
use rule-generator && doinitd "${FILESDIR}"/udev-postmount
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index d286cedd7a14..15d7e4a514a0 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/eudev-project/eudev"
LICENSE="LGPL-2.1 MIT GPL-2"
SLOT="0"
-IUSE="+kmod rule-generator selinux static-libs test"
+IUSE="+kmod rule-generator selinux split-usr static-libs test"
RESTRICT="!test? ( test )"
DEPEND=">=sys-apps/util-linux-2.20
@@ -96,6 +96,14 @@ src_prepare() {
fi
}
+rootprefix() {
+ usex split-usr '' /usr
+}
+
+sbindir() {
+ usex split-usr sbin bin
+}
+
multilib_src_configure() {
# bug #463846
tc-export CC
@@ -109,14 +117,15 @@ multilib_src_configure() {
DBUS_CFLAGS=' '
DBUS_LIBS=' '
- --with-rootprefix=
+ --with-rootprefix="${EPREFIX}$(rootprefix)"
--with-rootrundir=/run
--exec-prefix="${EPREFIX}"
- --bindir="${EPREFIX}"/bin
+ --bindir="${EPREFIX}$(rootprefix)/bin"
+ --sbindir="${EPREFIX}$(rootprefix)/$(sbindir)"
--includedir="${EPREFIX}"/usr/include
- --libdir="${EPREFIX}"/usr/$(get_libdir)
- --with-rootlibexecdir="${EPREFIX}"/lib/udev
- --enable-split-usr
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ --with-rootlibexecdir="${EPREFIX}$(rootprefix)/lib/udev"
+ $(use_enable split-usr)
--enable-manpages
)
@@ -124,7 +133,7 @@ multilib_src_configure() {
# that means all options only apply to native_abi
if multilib_is_native_abi ; then
myeconfargs+=(
- --with-rootlibdir="${EPREFIX}"/$(get_libdir)
+ --with-rootlibdir="${EPREFIX}$(rootprefix)/$(get_libdir)"
$(use_enable kmod)
$(use_enable static-libs static)
$(use_enable selinux)
@@ -177,7 +186,7 @@ multilib_src_install() {
multilib_src_install_all() {
find "${ED}" -name '*.la' -delete || die
- insinto /lib/udev/rules.d
+ insinto "$(rootprefix)/lib/udev/rules.d"
doins "${FILESDIR}"/40-gentoo.rules
use rule-generator && doinitd "${FILESDIR}"/udev-postmount