nls is not optional, and cannot be disabled in orbit-0.5.17, made the dependency...

diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index 4581f5dd93dd1fd71d4026c8d1ee3fb1036fcf8d..68171a4e633468b0a42b055255f414999d7098e8 100644 (file)
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/orbit
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.5 2004/10/01 07:04:23 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.6 2004/11/04 08:22:19 obz Exp $
+
+*orbit-0.5.17 (05 Nov 2004)
+
+  05 Nov 2004; Mike Gardiner <obz@gentoo.org> orbit-0.5.17.ebuild:
+  nls is not optional, and cannot be disabled in orbit-0.5.17, made the
+  dependency on gettext permanent and fixed. see bug #69473
 
 *orbit-2.10.3 (01 Oct 2004)
 

diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index 6617bda1d47ebfef4920375cf5f2e4715fcf3ad7..aee088b125b0af59768e5bd9d828ed6cf5e939b7 100644 (file)
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -1,9 +1,9 @@
 MD5 10e942e2cc0d3e73a9fc623a2740f877 orbit-2.10.3.ebuild 1029
-MD5 7c10b22e3f8ec7b478447123d7d66965 orbit-0.5.17.ebuild 1576
+MD5 f56c9fcc3969eb8dc8cc213c1d1778e4 orbit-0.5.17.ebuild 1501
 MD5 9f961ff41d1dc88e842c2d942ad3663a orbit-2.10.0.ebuild 985
 MD5 a3e74b771d7a1ddabf24939368f75ad7 orbit-2.10.2.ebuild 1393
 MD5 e1a5cb8c2c0eabf2e0a4c03f3e0eb476 orbit-2.10.4.ebuild 1015
-MD5 d48409111393d052d9fd31d0edd4eb40 ChangeLog 820
+MD5 7426d090822ad1a26688ad8a87b06429 ChangeLog 1046
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 a6c6d08bbd65f048d7f812c3af84f79b orbit-2.12.0.ebuild 1033
 MD5 51bfc1efb763de186ee1b1f1e594891a files/digest-orbit-0.5.17 66

diff --git a/gnome-base/orbit/orbit-0.5.17.ebuild b/gnome-base/orbit/orbit-0.5.17.ebuild
index be29ee9203199a5702624e2713603a8864c29eac..9f4e1d490148e9f144d71e677c81c3659bc1d3d5 100644 (file)
--- a/gnome-base/orbit/orbit-0.5.17.ebuild
+++ b/gnome-base/orbit/orbit-0.5.17.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-0.5.17.ebuild,v 1.2 2004/08/24 13:16:28 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-0.5.17.ebuild,v 1.3 2004/11/04 08:22:19 obz Exp $
 
 inherit gnome.org libtool gnuconfig
 
-IUSE="nls"
+IUSE=""
 
 MY_P="ORBit-${PV}"
 PVP=(${PV//[-\._]/ })
@@ -14,7 +14,7 @@ DESCRIPTION="A high-performance, lightweight CORBA ORB aiming for CORBA 2.2 comp
 HOMEPAGE="http://www.labs.redhat.com/orbit/"
 SRC_URI="mirror://gnome/sources/ORBit/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
 
-DEPEND="nls? ( sys-devel/gettext )
+DEPEND="sys-devel/gettext
        >=sys-apps/tcp-wrappers-7.6
        =dev-libs/glib-1.2*"
 
@@ -25,10 +25,6 @@ LICENSE="GPL-2"
 KEYWORDS="x86 sparc alpha mips hppa amd64 ppc ia64 ppc64"
 
 src_compile() {
-       if ! use nls ; then
-               myconf="--disable-nls"
-       fi
-
        # Detect mips systems properly
        gnuconfig_update
 
@@ -41,7 +37,7 @@ src_compile() {
                --infodir=/usr/share/info \
                --sysconfdir=/etc \
                --localstatedir=/var/lib \
-               ${myconf} || die
+               || die
 
        make || die # Doesn't work with -j 4 (hallski)
 }