From 89f11c57a922ce1662a9053149161a589ced6645 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 17 Jan 2020 13:43:20 -0500 Subject: [PATCH] sys-apps/sed: require static-libs when USE=static is enabled Closes: https://bugs.gentoo.org/705580 Package-Manager: Portage-2.3.84_p2, Repoman-2.3.20_p24 Signed-off-by: Mike Gilbert --- sys-apps/sed/sed-4.5.ebuild | 18 ++++++++++++++---- sys-apps/sed/sed-4.7.ebuild | 18 ++++++++++++++---- sys-apps/sed/sed-4.8.ebuild | 18 ++++++++++++++---- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/sys-apps/sed/sed-4.5.ebuild b/sys-apps/sed/sed-4.5.ebuild index 0d105052fcd6..c6ede4cfc760 100644 --- a/sys-apps/sed/sed-4.5.ebuild +++ b/sys-apps/sed/sed-4.5.ebuild @@ -14,11 +14,21 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86" IUSE="acl nls selinux static" -RDEPEND="acl? ( virtual/acl ) - nls? ( virtual/libintl ) - selinux? ( sys-libs/libselinux )" +RDEPEND=" + !static? ( + acl? ( virtual/acl ) + nls? ( virtual/libintl ) + selinux? ( sys-libs/libselinux ) + ) +" DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) + static? ( + acl? ( virtual/acl[static-libs(+)] ) + nls? ( virtual/libintl[static-libs(+)] ) + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) +" src_configure() { local myconf=() diff --git a/sys-apps/sed/sed-4.7.ebuild b/sys-apps/sed/sed-4.7.ebuild index f57b47cb55a1..ebcf003708b4 100644 --- a/sys-apps/sed/sed-4.7.ebuild +++ b/sys-apps/sed/sed-4.7.ebuild @@ -14,11 +14,21 @@ SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86" IUSE="acl nls selinux static" -RDEPEND="acl? ( virtual/acl ) - nls? ( virtual/libintl ) - selinux? ( sys-libs/libselinux )" +RDEPEND=" + !static? ( + acl? ( virtual/acl ) + nls? ( virtual/libintl ) + selinux? ( sys-libs/libselinux ) + ) +" DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) + static? ( + acl? ( virtual/acl[static-libs(+)] ) + nls? ( virtual/libintl[static-libs(+)] ) + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) +" src_configure() { local myconf=() diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild index b2801d707f75..3cf0562a1777 100644 --- a/sys-apps/sed/sed-4.8.ebuild +++ b/sys-apps/sed/sed-4.8.ebuild @@ -14,11 +14,21 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" IUSE="acl nls selinux static" -RDEPEND="acl? ( virtual/acl ) - nls? ( virtual/libintl ) - selinux? ( sys-libs/libselinux )" +RDEPEND=" + !static? ( + acl? ( virtual/acl ) + nls? ( virtual/libintl ) + selinux? ( sys-libs/libselinux ) + ) +" DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) + static? ( + acl? ( virtual/acl[static-libs(+)] ) + nls? ( virtual/libintl[static-libs(+)] ) + selinux? ( sys-libs/libselinux[static-libs(+)] ) + ) +" src_configure() { local myconf=() -- 2.26.2