diff options
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 12c1b7d4d19b..54169ee8da47 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1260 2014/05/21 20:39:20 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1261 2014/05/21 21:30:26 rhill Exp $ + + 21 May 2014; Ryan Hill <rhill@gentoo.org> toolchain.eclass: + Bug #499774, take 2. 21 May 2014; Ryan Hill <rhill@gentoo.org> toolchain.eclass: Revert libintl change. It turns out we need to depend on gettext anyways, so diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 62a1f32bde84..078470c4e687 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.629 2014/05/21 20:39:21 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.630 2014/05/21 21:30:26 rhill Exp $ # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -148,7 +148,7 @@ fi #---->> DEPEND <<---- RDEPEND="sys-libs/zlib - nls? ( sys-devel/gettext )" + nls? ( virtual/libintl )" tc_version_is_at_least 3 && RDEPEND+=" virtual/libiconv" @@ -182,6 +182,7 @@ fi DEPEND="${RDEPEND} >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 + nls? ( sys-devel/gettext ) regression-test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 |