[gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/

[Mike Gilbert]

commit:     6df30c1c432832ceee6eed94f2ed263499b52035
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 21:15:15 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 21:15:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df30c1c

sys-fs/udev: drop dependency on chrpath

Setting linked-udev-shared=false makes this unnecessary.

Package-Manager: Portage-2.3.6_p16, Repoman-2.3.2_p84

 sys-fs/udev/udev-234.ebuild  | 10 ----------
 sys-fs/udev/udev-9999.ebuild | 10 ----------
 2 files changed, 20 deletions(-)

diff --git a/sys-fs/udev/udev-234.ebuild b/sys-fs/udev/udev-234.ebuild
index 4c503363030..b7834ccec24 100644
--- a/sys-fs/udev/udev-234.ebuild
+++ b/sys-fs/udev/udev-234.ebuild
@@ -41,7 +41,6 @@ 
COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}]
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
        )"
 DEPEND="${COMMON_DEPEND}
-       app-admin/chrpath
        dev-util/gperf
        >=dev-util/intltool-0.50
        >=dev-util/meson-0.40.0
@@ -170,16 +169,10 @@ multilib_src_compile() {
        eninja "${targets[@]}"
 }
 
-# meson uses an private python script for this
-strip_rpath() {
-       chrpath -d "$@" || die
-}
-
 multilib_src_install() {
        local libudev=$(readlink src/libudev/libudev.so.1)
 
        into /
-       strip_rpath src/libudev/${libudev}
        dolib.so src/libudev/{${libudev},libudev.so.1,libudev.so}
 
        insinto "/usr/$(get_libdir)/pkgconfig"
@@ -187,15 +180,12 @@ multilib_src_install() {
 
        if multilib_is_native_abi; then
                into /
-               strip_rpath udevadm
                dobin udevadm
 
                exeinto /lib/systemd
-               strip_rpath systemd-udevd
                doexe systemd-udevd
 
                exeinto /lib/udev
-               strip_rpath 
src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id}
                doexe 
src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id}
 
                rm rules/99-systemd.rules || die

diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 4c503363030..b7834ccec24 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -41,7 +41,6 @@ 
COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}]
                !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
        )"
 DEPEND="${COMMON_DEPEND}
-       app-admin/chrpath
        dev-util/gperf
        >=dev-util/intltool-0.50
        >=dev-util/meson-0.40.0
@@ -170,16 +169,10 @@ multilib_src_compile() {
        eninja "${targets[@]}"
 }
 
-# meson uses an private python script for this
-strip_rpath() {
-       chrpath -d "$@" || die
-}
-
 multilib_src_install() {
        local libudev=$(readlink src/libudev/libudev.so.1)
 
        into /
-       strip_rpath src/libudev/${libudev}
        dolib.so src/libudev/{${libudev},libudev.so.1,libudev.so}
 
        insinto "/usr/$(get_libdir)/pkgconfig"
@@ -187,15 +180,12 @@ multilib_src_install() {
 
        if multilib_is_native_abi; then
                into /
-               strip_rpath udevadm
                dobin udevadm
 
                exeinto /lib/systemd
-               strip_rpath systemd-udevd
                doexe systemd-udevd
 
                exeinto /lib/udev
-               strip_rpath 
src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id}
                doexe 
src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id}
 
                rm rules/99-systemd.rules || die