[gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/

[Mike Frysinger]

commit:     5c19e7e48a5a5771376abaa42acd1275afd3c8ad
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 22:33:04 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 00:14:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c19e7e4

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 9578f27..200eba8 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 795bad9..3e112e3 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 dd9fda9..fffdf0b 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 3973e08..29acbbe 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