sys-apps/systemd: restore DEPEND="${COMMON_DEPEND}"

Closes: https://bugs.gentoo.org/686536
Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/sys-apps/systemd/systemd-242-r6.ebuild b/sys-apps/systemd/systemd-242-r6.ebuild
index 15408cfe976ad74d4499dbb58341c115e0fa40d8..a898e6357a1480f3fd44544799da2745c61d2378 100644 (file)
--- a/sys-apps/systemd/systemd-242-r6.ebuild
+++ b/sys-apps/systemd/systemd-242-r6.ebuild
@@ -64,6 +64,12 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
        selinux? ( sys-libs/libselinux:0= )
        xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
 
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+       >=sys-kernel/linux-headers-${MINKV}
+       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
        >=sys-apps/baselayout-2.2
@@ -88,12 +94,6 @@ PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
        policykit? ( sys-auth/polkit )
        !vanilla? ( sys-apps/gentoo-systemd-integration )"
 
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="
-       >=sys-kernel/linux-headers-${MINKV}
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
 BDEPEND="
        app-arch/xz-utils:0
        dev-util/gperf
@@ -244,7 +244,7 @@ multilib_src_configure() {
                -Delfutils=$(meson_multilib_native_use elfutils)
                -Dgcrypt=$(meson_use gcrypt)
                -Dgnu-efi=$(meson_multilib_native_use gnuefi)
-               -Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+               -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
                -Dmicrohttpd=$(meson_multilib_native_use http)
                -Dimportd=$(meson_multilib_native_use importd)
                -Dbzip2=$(meson_multilib_native_use importd)

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 7769725c2c29f39d103e84a098b4db5d37a78957..27de1bc2e194aeb9f97508eafc7f358844ac30d4 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -64,6 +64,12 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
        selinux? ( sys-libs/libselinux:0= )
        xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
 
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+       >=sys-kernel/linux-headers-${MINKV}
+       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}
        >=sys-apps/baselayout-2.2
@@ -88,12 +94,6 @@ PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
        policykit? ( sys-auth/polkit )
        !vanilla? ( sys-apps/gentoo-systemd-integration )"
 
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="
-       >=sys-kernel/linux-headers-${MINKV}
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
 BDEPEND="
        app-arch/xz-utils:0
        dev-util/gperf
@@ -237,7 +237,7 @@ multilib_src_configure() {
                -Delfutils=$(meson_multilib_native_use elfutils)
                -Dgcrypt=$(meson_use gcrypt)
                -Dgnu-efi=$(meson_multilib_native_use gnuefi)
-               -Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+               -Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
                -Dmicrohttpd=$(meson_multilib_native_use http)
                -Dimportd=$(meson_multilib_native_use importd)
                -Dbzip2=$(meson_multilib_native_use importd)