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

Package-Manager: portage-2.1.2_rc1-r3

5 files changed, 60 insertions, 38 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/Manifest b/games-mud/gMOO/Manifest
index ab510b47ad79..0e51e3fa3196 100644
--- a/games-mud/gMOO/Manifest
+++ b/games-mud/gMOO/Manifest
@@ -1,15 +1,30 @@
-MD5 dbbebd6ddaed5cd84cca01096b23dc1a ChangeLog 1840
-RMD160 996d89a29a8f15280c8211e84050ebac9c6a6410 ChangeLog 1840
-SHA256 8c6db52410b44bcc53aee96e6fcc7f98afdcc9e37134f99c7915808a9a611866 ChangeLog 1840
-MD5 f79b318d3e11bbb23cbca40061dbba43 files/digest-gMOO-0.4.8-r1 63
-RMD160 045c0bd1ea4246a4792daf714961381576019bdc files/digest-gMOO-0.4.8-r1 63
-SHA256 68b42b63c26495f9edd5c7fc76a03e4a006e75f500f2b2c526fa63d139d26a89 files/digest-gMOO-0.4.8-r1 63
-MD5 0a3b114c5c7635cc2abf16eb6bbd0c99 files/gMOO.patch 673
-RMD160 600b940f7181f1df0c8d0f9d188abc028e3bf494 files/gMOO.patch 673
-SHA256 cf4d027f599f9eba99b331fac1635e26f424649982a33c63ec1f04204ffbe52c files/gMOO.patch 673
-MD5 e185f9e78ed3b2fa25a27832c4712671 gMOO-0.4.8-r1.ebuild 1018
-RMD160 d4cf0e219d1ddb5dbf56b8f610a216ec34fb9c5f gMOO-0.4.8-r1.ebuild 1018
-SHA256 fbb9c3b3fb86c50d6dc5a801a44499bcc62e9bbade519fbc815be530cf8e18b9 gMOO-0.4.8-r1.ebuild 1018
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gMOO.patch 565 RMD160 7f6543d6705e05efc26d1471642a2ea4c2be087d SHA1 76040e0ae5f0ea06a412beeb21a227d72a801e62 SHA256 1dcf8d2c45f8d6b4e6c0e3ac152b602d18e51c90ddc56dbdf0582cffe05181df
+MD5 def890f7238203c71b06ad7d1799f2c5 files/gMOO.patch 565
+RMD160 7f6543d6705e05efc26d1471642a2ea4c2be087d files/gMOO.patch 565
+SHA256 1dcf8d2c45f8d6b4e6c0e3ac152b602d18e51c90ddc56dbdf0582cffe05181df files/gMOO.patch 565
+DIST gMOO-0.4.8.tar.bz2 221934 RMD160 9aa34df38acaac08ac26f2ea6c601ee58110f799 SHA1 9873b524967062435b51b6ca1d25c047b73dd22b SHA256 bced044a1a7c4ebacd6a3f564c5c964773d6621b206169953251698522eede34
+EBUILD gMOO-0.4.8-r1.ebuild 996 RMD160 24348378d97cda2760bf56ff97e5d9eaaf17d521 SHA1 d77de6316304097cf9f286a8504b741d13cbd389 SHA256 226ac52f405e18cc9b22d3bed261575e83c6484da44e2496c197ff4a6a2170bd
+MD5 b9c3de84ed0513cb0c5688692c1d166c gMOO-0.4.8-r1.ebuild 996
+RMD160 24348378d97cda2760bf56ff97e5d9eaaf17d521 gMOO-0.4.8-r1.ebuild 996
+SHA256 226ac52f405e18cc9b22d3bed261575e83c6484da44e2496c197ff4a6a2170bd gMOO-0.4.8-r1.ebuild 996
+MISC ChangeLog 1969 RMD160 8f9167dee11f226d72c4c2156e6ac5cef41a9f47 SHA1 845910ed22d6e1ef8284dede45f034d92274c2f4 SHA256 03c99d54538a5d1292ece491a160859e474947a247aeb762c694330bebd358b8
+MD5 5613f9f41b196b5a28ff7cc85531e7c3 ChangeLog 1969
+RMD160 8f9167dee11f226d72c4c2156e6ac5cef41a9f47 ChangeLog 1969
+SHA256 03c99d54538a5d1292ece491a160859e474947a247aeb762c694330bebd358b8 ChangeLog 1969
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 e930ad0083a7ccc9d7eea819ae5510e8 files/digest-gMOO-0.4.8-r1 235
+RMD160 2fe0f1a386558a23c441a056a4bb5eef845a4af8 files/digest-gMOO-0.4.8-r1 235
+SHA256 a14b35c526001e9c521533e51a58a8b813e46ce6788f8f445b27847c5e8ac526 files/digest-gMOO-0.4.8-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFTUmBdz7hIScOURERAtOmAKCbbShDSiKF6Ua82r0Ezo20jJRW8wCdHYs7
+g8NIwLGAyqwrBqReFDiNpZA=
+=bBJ7
+-----END PGP SIGNATURE-----
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"
 }