summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-10-12 18:33:04 -0400
committerMike Frysinger <vapier@gentoo.org>2015-10-12 20:14:28 -0400
commit5c19e7e48a5a5771376abaa42acd1275afd3c8ad (patch)
treecea362534ba36362ac8ea5b6d8bfa3cf0ba502dd
parentsys-devel/gettext: drop unused flag-o-matic/multilib inherits (diff)
downloadgentoo-5c19e7e48a5a5771376abaa42acd1275afd3c8ad.tar.gz
gentoo-5c19e7e48a5a5771376abaa42acd1275afd3c8ad.tar.bz2
gentoo-5c19e7e48a5a5771376abaa42acd1275afd3c8ad.zip
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.
-rw-r--r--sys-devel/gettext/gettext-0.19.4.ebuild5
-rw-r--r--sys-devel/gettext/gettext-0.19.5.1-r1.ebuild5
-rw-r--r--sys-devel/gettext/gettext-0.19.5.ebuild5
-rw-r--r--sys-devel/gettext/gettext-0.19.6.ebuild5
4 files changed, 20 insertions, 0 deletions
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