Make gettext dependencies optional based on the nls use flag (bug #387615 by Ed Wildgoose).

(Portage version: 2.2.0_alpha67/cvs/Linux x86_64)

4 files changed, 16 insertions, 11 deletions

diff --git a/app-misc/realpath/ChangeLog b/app-misc/realpath/ChangeLog
index 2f361403776b..627e7f3374f1 100644
--- a/app-misc/realpath/ChangeLog
+++ b/app-misc/realpath/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/realpath
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/ChangeLog,v 1.17 2011/10/17 19:52:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/ChangeLog,v 1.18 2011/10/19 03:53:28 radhermit Exp $
+
+  19 Oct 2011; Tim Harder <radhermit@gentoo.org> realpath-1.15-r1.ebuild,
+  realpath-1.15-r3.ebuild, realpath-1.16.ebuild:
+  Make gettext dependencies optional based on the nls use flag (bug #387615 by
+  Ed Wildgoose).
 
   17 Oct 2011; Justin Lecher <jlec@gentoo.org> +files/realpath-1.16-nonls.patch,
   metadata.xml, realpath-1.16.ebuild:
diff --git a/app-misc/realpath/realpath-1.15-r1.ebuild b/app-misc/realpath/realpath-1.15-r1.ebuild
index da1160f084b6..8480b92ba279 100644
--- a/app-misc/realpath/realpath-1.15-r1.ebuild
+++ b/app-misc/realpath/realpath-1.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.15-r1.ebuild,v 1.8 2011/01/01 08:44:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.15-r1.ebuild,v 1.9 2011/10/19 03:53:28 radhermit Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls"
 
-DEPEND="sys-devel/gettext"
+DEPEND="nls? ( sys-devel/gettext )"
 RDEPEND="!sys-freebsd/freebsd-bin"
 
 src_unpack() {
diff --git a/app-misc/realpath/realpath-1.15-r3.ebuild b/app-misc/realpath/realpath-1.15-r3.ebuild
index db92238d674a..bdb3436bcd9b 100644
--- a/app-misc/realpath/realpath-1.15-r3.ebuild
+++ b/app-misc/realpath/realpath-1.15-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.15-r3.ebuild,v 1.2 2011/01/01 08:44:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.15-r3.ebuild,v 1.3 2011/10/19 03:53:28 radhermit Exp $
 
 EAPI="3"
 inherit eutils toolchain-funcs flag-o-matic prefix
@@ -15,10 +15,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
-RDEPEND="!sys-freebsd/freebsd-bin"
+RDEPEND="!sys-freebsd/freebsd-bin
+	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/libintl
+	nls? ( sys-devel/gettext )
 	elibc_IRIX? ( dev-libs/gnulib )
 	x86-interix? ( dev-libs/gnulib )
 	elibc_mintlib? ( virtual/libiconv )"
diff --git a/app-misc/realpath/realpath-1.16.ebuild b/app-misc/realpath/realpath-1.16.ebuild
index 7acb7d609f72..6e50ebae689c 100644
--- a/app-misc/realpath/realpath-1.16.ebuild
+++ b/app-misc/realpath/realpath-1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.16.ebuild,v 1.2 2011/10/17 19:52:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.16.ebuild,v 1.3 2011/10/19 03:53:28 radhermit Exp $
 
 EAPI="3"
 inherit eutils toolchain-funcs flag-o-matic prefix
@@ -16,10 +16,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
-RDEPEND="!sys-freebsd/freebsd-bin"
+RDEPEND="!sys-freebsd/freebsd-bin
+	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/libintl
+	nls? ( sys-devel/gettext )
 	elibc_IRIX? ( dev-libs/gnulib )
 	x86-interix? ( dev-libs/gnulib )
 	elibc_mintlib? ( virtual/libiconv )"