From 5c19e7e48a5a5771376abaa42acd1275afd3c8ad Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 12 Oct 2015 18:33:04 -0400 Subject: [PATCH] sys-devel/gettext: fix mono/java eclass interaction w/pkg_setup Both of these eclasses export pkg_setup, but gettext doesn't, so only one of them ends up being run. Make sure we explicitly execute both. --- sys-devel/gettext/gettext-0.19.4.ebuild | 5 +++++ sys-devel/gettext/gettext-0.19.5.1-r1.ebuild | 5 +++++ sys-devel/gettext/gettext-0.19.5.ebuild | 5 +++++ sys-devel/gettext/gettext-0.19.6.ebuild | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/sys-devel/gettext/gettext-0.19.4.ebuild b/sys-devel/gettext/gettext-0.19.4.ebuild index 9578f27b6d69..200eba88743e 100644 --- a/sys-devel/gettext/gettext-0.19.4.ebuild +++ b/sys-devel/gettext/gettext-0.19.4.ebuild @@ -37,6 +37,11 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/gettext-po.h ) +pkg_setup() { + mono-env_pkg_setup + java-pkg-opt-2_pkg_setup +} + src_prepare() { java-pkg-opt-2_src_prepare epunt_cxx diff --git a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild b/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild index 795bad9b3254..3e112e38c113 100644 --- a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild +++ b/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild @@ -37,6 +37,11 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/gettext-po.h ) +pkg_setup() { + mono-env_pkg_setup + java-pkg-opt-2_pkg_setup +} + src_prepare() { java-pkg-opt-2_src_prepare diff --git a/sys-devel/gettext/gettext-0.19.5.ebuild b/sys-devel/gettext/gettext-0.19.5.ebuild index dd9fda909f09..fffdf0bccab5 100644 --- a/sys-devel/gettext/gettext-0.19.5.ebuild +++ b/sys-devel/gettext/gettext-0.19.5.ebuild @@ -37,6 +37,11 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/gettext-po.h ) +pkg_setup() { + mono-env_pkg_setup + java-pkg-opt-2_pkg_setup +} + src_prepare() { java-pkg-opt-2_src_prepare epunt_cxx diff --git a/sys-devel/gettext/gettext-0.19.6.ebuild b/sys-devel/gettext/gettext-0.19.6.ebuild index 3973e08c4e8a..29acbbeeb338 100644 --- a/sys-devel/gettext/gettext-0.19.6.ebuild +++ b/sys-devel/gettext/gettext-0.19.6.ebuild @@ -37,6 +37,11 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/gettext-po.h ) +pkg_setup() { + mono-env_pkg_setup + java-pkg-opt-2_pkg_setup +} + src_prepare() { java-pkg-opt-2_src_prepare -- 2.26.2