From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-839946-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 9E26C138BED
for <garchives@archives.gentoo.org>; Tue, 13 Oct 2015 00:20:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 32628E07FA;
Tue, 13 Oct 2015 00:20:39 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5186CE07D6
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Oct 2015 00:20:38 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9CE2F34058A
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Oct 2015 00:20:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FC70F6C
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Oct 2015 00:20:33 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <1444695268.5c19e7e48a5a5771376abaa42acd1275afd3c8ad.vapier@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-devel/gettext/gettext-0.19.4.ebuild sys-devel/gettext/gettext-0.19.5.1-r1.ebuild sys-devel/gettext/gettext-0.19.5.ebuild sys-devel/gettext/gettext-0.19.6.ebuild
X-VCS-Directories: sys-devel/gettext/
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: 5c19e7e48a5a5771376abaa42acd1275afd3c8ad
X-VCS-Branch: master
Date: Tue, 13 Oct 2015 00:20:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 2d6f38ab-4f54-4bb5-9bc3-ede601ea0e39
X-Archives-Hash: 7a939e9046a5e78e1bf37c57fafe320f
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