Change "tcltk" USE flag to "tcl", bug #17808

(Portage version: 2.1.2_rc1-r3)

4 files changed, 33 insertions, 26 deletions

diff --git a/games-mud/gMOO/ChangeLog b/games-mud/gMOO/ChangeLog
index f9e191bcba35..54ad7c583462 100644
--- a/games-mud/gMOO/ChangeLog
+++ b/games-mud/gMOO/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-mud/gMOO
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/gMOO/ChangeLog,v 1.12 2006/01/29 00:20:11 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/gMOO/ChangeLog,v 1.13 2006/11/05 02:16:27 nyhm Exp $
+
+  05 Nov 2006; Tristan Heaven <nyhm@gentoo.org> files/gMOO.patch,
+  gMOO-0.4.8-r1.ebuild:
+  Change "tcltk" USE flag to "tcl", bug #17808
 
   29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   gMOO-0.4.8-r1.ebuild:
diff --git a/games-mud/gMOO/files/digest-gMOO-0.4.8-r1 b/games-mud/gMOO/files/digest-gMOO-0.4.8-r1
index 8adac9fa5b0e..ee9ca92441e7 100644
--- a/games-mud/gMOO/files/digest-gMOO-0.4.8-r1
+++ b/games-mud/gMOO/files/digest-gMOO-0.4.8-r1
@@ -1 +1,3 @@
 MD5 140074888bbcddae4e0a0732c85d7dc1 gMOO-0.4.8.tar.bz2 221934
+RMD160 9aa34df38acaac08ac26f2ea6c601ee58110f799 gMOO-0.4.8.tar.bz2 221934
+SHA256 bced044a1a7c4ebacd6a3f564c5c964773d6621b206169953251698522eede34 gMOO-0.4.8.tar.bz2 221934
diff --git a/games-mud/gMOO/files/gMOO.patch b/games-mud/gMOO/files/gMOO.patch
index 64fa987017a5..d691acb70c66 100644
--- a/games-mud/gMOO/files/gMOO.patch
+++ b/games-mud/gMOO/files/gMOO.patch
@@ -1,23 +1,22 @@
---- po/Makefile.in.in.orig Mon Jul 29 17:55:32 2002
-+++ po/Makefile.in.in      Mon Jul 29 17:55:50 2002
+--- po/Makefile.in.in
++++ po/Makefile.in.in
 @@ -12,6 +12,8 @@
  SHELL = /bin/sh
  @SET_MAKE@
-
+ 
 +DESTDIR =
 +
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
 @@ -119,8 +121,8 @@
-        for cat in $$catalogs; do \
-          cat=`basename $$cat`; \
-          case "$$cat" in \
--           *.gmo) destdir=$(gnulocaledir);; \
--           *)     destdir=$(localedir);; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \
+-	    *.gmo) destdir=$(gnulocaledir);; \
+-	    *)     destdir=$(localedir);; \
 +           *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
 +           *)     destdir=$(DESTDIR)$(localedir);; \
-          esac; \
-          lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-          dir=$$destdir/$$lang/LC_MESSAGES; \
-
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ 	  dir=$$destdir/$$lang/LC_MESSAGES; \
diff --git a/games-mud/gMOO/gMOO-0.4.8-r1.ebuild b/games-mud/gMOO/gMOO-0.4.8-r1.ebuild
index 3090a0e6ca29..189faa068515 100644
--- a/games-mud/gMOO/gMOO-0.4.8-r1.ebuild
+++ b/games-mud/gMOO/gMOO-0.4.8-r1.ebuild
@@ -1,41 +1,43 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/gMOO/gMOO-0.4.8-r1.ebuild,v 1.11 2006/01/29 00:20:11 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/gMOO/gMOO-0.4.8-r1.ebuild,v 1.12 2006/11/05 02:16:27 nyhm Exp $
+
+inherit eutils
 
 DESCRIPTION="GTK+ Based MOO client"
 HOMEPAGE="http://www.nowmoo.demon.nl/"
 SRC_URI="http://www.nowmoo.demon.nl/packages/${P}.tar.bz2"
 
-KEYWORDS="x86 ppc ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls tcltk"
+KEYWORDS="~amd64 x86 ppc"
+IUSE="nls tcl"
 
-RDEPEND="virtual/libc
-	|| ( x11-libs/libXi virtual/x11 )
+RDEPEND="x11-libs/libXi
 	=x11-libs/gtk+-1.2*
-	tcltk? ( dev-lang/tcl )"
+	nls? ( virtual/libintl )
+	tcl? ( dev-lang/tcl )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	use nls && patch -l -p0 <${FILESDIR}/gMOO.patch
+	cd "${S}"
+	use nls && epatch "${FILESDIR}"/gMOO.patch
 	sed -i \
 		-e "s/-ltcl8.0/-ltcl/" configure \
-			|| die "sed configure failed"
+		|| die "sed configure failed"
 }
 
 src_compile() {
 	econf \
 		$(use_enable nls) \
-		$(use_enable tcltk tcl) \
-			|| die "configure failed"
+		$(use_enable tcl) \
+		|| die
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc README VERSION NEWS TODO ChangeLog || die "dodoc failed"
 }