From 58e313d9261f2c5440a130dd2e191a52fb315414 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 13 Feb 2020 20:18:54 +0100 Subject: [PATCH] sys-apps/util-linux: Don't RDEPEND on virtual/os-headers Reported-by: Arfrever Frehtes Taifersar Arahesis Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Lars Wendler --- sys-apps/util-linux/util-linux-2.34-r3.ebuild | 9 ++++++--- sys-apps/util-linux/util-linux-2.35.1.ebuild | 9 ++++++--- sys-apps/util-linux/util-linux-2.35.ebuild | 9 ++++++--- sys-apps/util-linux/util-linux-9999.ebuild | 9 ++++++--- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.34-r3.ebuild b/sys-apps/util-linux/util-linux-2.34-r3.ebuild index 4d5ccc838f43..60611bb1505d 100644 --- a/sys-apps/util-linux/util-linux-2.34-r3.ebuild +++ b/sys-apps/util-linux/util-linux-2.34-r3.ebuild @@ -29,8 +29,7 @@ IUSE="build caps +cramfs fdformat hardlink kill +logger ncurses nls pam python + # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. -DEPEND=" - virtual/os-headers +RDEPEND=" caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) @@ -47,7 +46,11 @@ BDEPEND=" nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) " -RDEPEND="${DEPEND} +DEPEND=" + ${RDEPEND} + virtual/os-headers +" +RDEPEND+=" hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( diff --git a/sys-apps/util-linux/util-linux-2.35.1.ebuild b/sys-apps/util-linux/util-linux-2.35.1.ebuild index a09fd2b785ae..c3759ac85c74 100644 --- a/sys-apps/util-linux/util-linux-2.35.1.ebuild +++ b/sys-apps/util-linux/util-linux-2.35.1.ebuild @@ -29,9 +29,8 @@ IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls p # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. -DEPEND=" +RDEPEND=" virtual/libcrypt:= - virtual/os-headers caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) @@ -49,7 +48,11 @@ BDEPEND=" nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) " -RDEPEND="${DEPEND} +DEPEND=" + ${RDEPEND} + virtual/os-headers +" +RDEPEND+=" hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( diff --git a/sys-apps/util-linux/util-linux-2.35.ebuild b/sys-apps/util-linux/util-linux-2.35.ebuild index 49603139afba..07268ccec448 100644 --- a/sys-apps/util-linux/util-linux-2.35.ebuild +++ b/sys-apps/util-linux/util-linux-2.35.ebuild @@ -29,8 +29,7 @@ IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls p # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. -DEPEND=" - virtual/os-headers +RDEPEND=" caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) @@ -48,7 +47,11 @@ BDEPEND=" nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) " -RDEPEND="${DEPEND} +DEPEND=" + ${RDEPEND} + virtual/os-headers +" +RDEPEND+=" hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index a1318667ad6c..66feb7a972f4 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -29,9 +29,8 @@ IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls p # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. -DEPEND=" +RDEPEND=" virtual/libcrypt:= - virtual/os-headers caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( sys-fs/cryptsetup ) @@ -49,7 +48,11 @@ BDEPEND=" nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) " -RDEPEND="${DEPEND} +DEPEND=" + ${RDEPEND} + virtual/os-headers +" +RDEPEND+=" hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( -- 2.26.2