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.

diff --git a/sys-devel/gettext/gettext-0.19.4.ebuild b/sys-devel/gettext/gettext-0.19.4.ebuild
index 9578f27b6d69cdd2a4da7432d7397f664eb24854..200eba88743e4b4cab75c3c78899ebe82497a0f0 100644 (file)
--- 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 795bad9b32549571a630501a62c17ef357cabeb7..3e112e38c113ae1ca06a2fd61512c5e16ae10412 100644 (file)
--- 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 dd9fda909f09ca52c562bb558506b4f63e807089..fffdf0bccab561df0ab88b76b346ab8c5b50041c 100644 (file)
--- 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 3973e08c4e8acec67821cf6e83027e2459cde309..29acbbeeb3381ab5ff8e15a28260489d06b9a423 100644 (file)
--- 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