Fix for tclx-8.4

Package-Manager: portage-2.1.2.3

6 files changed, 85 insertions, 51 deletions

diff --git a/games-puzzle/penguzzle/ChangeLog b/games-puzzle/penguzzle/ChangeLog
index 06860fa49e74..513599613be6 100644
--- a/games-puzzle/penguzzle/ChangeLog
+++ b/games-puzzle/penguzzle/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-puzzle/penguzzle
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/penguzzle/ChangeLog,v 1.6 2007/02/08 21:18:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/penguzzle/ChangeLog,v 1.7 2007/04/04 19:09:49 nyhm Exp $
+
+*penguzzle-1.0-r1 (04 Apr 2007)
+
+  04 Apr 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/penguzzle-1.0-tclx.patch, +penguzzle-1.0-r1.ebuild:
+  Fix for tclx-8.4
 
   08 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/games-puzzle/penguzzle/Manifest b/games-puzzle/penguzzle/Manifest
index e1e0a15e45ec..69ba38f3b390 100644
--- a/games-puzzle/penguzzle/Manifest
+++ b/games-puzzle/penguzzle/Manifest
@@ -1,26 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX penguzzle-1.0-tclx.patch 157 RMD160 b7a9ee85213dbbcb7ff6e2b03d954a07f927b3e0 SHA1 601052117c6f5011eb2a9c5ed9e5a2e1d4cb3f42 SHA256 c0daf589d7e6c7b8e079cb3d6002312f6717ad6ebe4fe154c61505e7ec730025
+MD5 de30a951c86c494b27b0867eb6e4ab2b files/penguzzle-1.0-tclx.patch 157
+RMD160 b7a9ee85213dbbcb7ff6e2b03d954a07f927b3e0 files/penguzzle-1.0-tclx.patch 157
+SHA256 c0daf589d7e6c7b8e079cb3d6002312f6717ad6ebe4fe154c61505e7ec730025 files/penguzzle-1.0-tclx.patch 157
 DIST penguzzle.zip 21542 RMD160 b6f7a190c4e2e3ab23c41de915d6a7a39ac0a962 SHA1 a337f7cb674ba0065db097f1029a94c1b8e714d0 SHA256 f3c2a4bc94fcd3d00cd8be9bf748bd3b0aa6d4251e64620fe92524e65fb951cd
-EBUILD penguzzle-1.0.ebuild 896 RMD160 8e8317671fd1fbfc15ddf32da5bef1506a2db172 SHA1 e75b47bea57addf60c206d0754f0763388e9d373 SHA256 1f4d4b49527194641ff2693cfbd9e883f1391e7ca7a8291dd57ef4032b74a268
-MD5 e8f054206d9e8cbf3790c0531cc58bb3 penguzzle-1.0.ebuild 896
-RMD160 8e8317671fd1fbfc15ddf32da5bef1506a2db172 penguzzle-1.0.ebuild 896
-SHA256 1f4d4b49527194641ff2693cfbd9e883f1391e7ca7a8291dd57ef4032b74a268 penguzzle-1.0.ebuild 896
-MISC ChangeLog 670 RMD160 11ed14258680f6e318c89bbb51dde2eab1ac93ca SHA1 4862c71f4b8c550ae41f9098620a08452bc43571 SHA256 92f62e21dd103a3691d3d286dfc3deb0615d0f363a5328aacda6002f05cd45bb
-MD5 bd2b7d8734ce9287e8d000b5325e0464 ChangeLog 670
-RMD160 11ed14258680f6e318c89bbb51dde2eab1ac93ca ChangeLog 670
-SHA256 92f62e21dd103a3691d3d286dfc3deb0615d0f363a5328aacda6002f05cd45bb ChangeLog 670
+EBUILD penguzzle-1.0-r1.ebuild 1126 RMD160 ab97d7a061d32e2528f8ac0ec5d6cc6098fb3a54 SHA1 fd116664e6d77bfc6e03b0639c1fec6bde6fb8ef SHA256 14cc1f38fc6ad07d3c883f41febe6de52ba2954fd5009ec54f29d298bc439103
+MD5 eadeceb803e09453de0b47d3f62f470b penguzzle-1.0-r1.ebuild 1126
+RMD160 ab97d7a061d32e2528f8ac0ec5d6cc6098fb3a54 penguzzle-1.0-r1.ebuild 1126
+SHA256 14cc1f38fc6ad07d3c883f41febe6de52ba2954fd5009ec54f29d298bc439103 penguzzle-1.0-r1.ebuild 1126
+MISC ChangeLog 828 RMD160 e0bca3b6ab94559290f7c0fb90942a1e6a2dfc13 SHA1 69369c369c669e1e241f96414d3aee8c3646336f SHA256 ce3d733382e3bd3bfa8fe1ae1c2e03342f9bf0d99308f9fd96767f694744df91
+MD5 2629f0b518c3023e02cc96d4339dba08 ChangeLog 828
+RMD160 e0bca3b6ab94559290f7c0fb90942a1e6a2dfc13 ChangeLog 828
+SHA256 ce3d733382e3bd3bfa8fe1ae1c2e03342f9bf0d99308f9fd96767f694744df91 ChangeLog 828
 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 1efc948b6923557a1e7b55f6008f25e9 files/digest-penguzzle-1.0 217
-RMD160 59f0ddf6991275829d63cd404a97aa13046f696f files/digest-penguzzle-1.0 217
-SHA256 b384eb8566944a7ad673e1393c7b7e00802be33e15dd0f3d3b25bfc2fd4667be files/digest-penguzzle-1.0 217
+MD5 1efc948b6923557a1e7b55f6008f25e9 files/digest-penguzzle-1.0-r1 217
+RMD160 59f0ddf6991275829d63cd404a97aa13046f696f files/digest-penguzzle-1.0-r1 217
+SHA256 b384eb8566944a7ad673e1393c7b7e00802be33e15dd0f3d3b25bfc2fd4667be files/digest-penguzzle-1.0-r1 217
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFy5OokT4lNIS36YERApOxAKCwaNo82Hj1LmpyOvRdh7b/kfoeeACeKbbL
-ihRELykgxB9DQLWaTZCoCzw=
-=s88g
+iD8DBQFGE/gDdz7hIScOURERAmsqAKCiTKOzzGcEkyMb/Kxm9evGB2WiPwCeIAVJ
+1IeoSTxlIvU8TuWhxsk/DRs=
+=o/ir
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/penguzzle/files/digest-penguzzle-1.0 b/games-puzzle/penguzzle/files/digest-penguzzle-1.0-r1
index 9254009638b1..9254009638b1 100644
--- a/games-puzzle/penguzzle/files/digest-penguzzle-1.0
+++ b/games-puzzle/penguzzle/files/digest-penguzzle-1.0-r1
diff --git a/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch b/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch
new file mode 100644
index 000000000000..d8c078de6a91
--- /dev/null
+++ b/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch
@@ -0,0 +1,10 @@
+--- bin/penguzzle
++++ bin/penguzzle
+@@ -1,4 +1,6 @@
+-#!/usr/bin/wishx
++#!/usr/bin/wish
++package require Tk
++package require Tclx
+ 
+ source ~/puzz/lib/init
+ 
diff --git a/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild b/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild
new file mode 100644
index 000000000000..cf8e71067077
--- /dev/null
+++ b/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild,v 1.1 2007/04/04 19:09:49 nyhm Exp $
+
+inherit games
+
+DESCRIPTION="Tcl/Tk variant of the well-known 15-puzzle game"
+HOMEPAGE="http://www.naskita.com/linux/penguzzle/penguzzle.shtml"
+SRC_URI="http://www.naskita.com/linux/${PN}/${PN}.zip"
+
+LICENSE="penguzzle"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="dev-lang/tk
+	dev-tcltk/tclx"
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e "s:~/puzz/images:${GAMES_DATADIR}/${PN}:" \
+		lib/init \
+		|| die "sed init failed"
+	sed -i \
+		-e "s:~/puzz/lib:$(games_get_libdir)/${PN}:" \
+		bin/${PN} \
+		|| die "sed ${PN} failed"
+
+	epatch "${FILESDIR}"/${P}-tclx.patch
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins images/img0.gif || die "doins img0.gif failed"
+
+	insinto "$(games_get_libdir)"/${PN}
+	doins lib/init || die "doins init failed"
+
+	dogamesbin bin/${PN} || die "dogamesbin failed"
+
+	dodoc README
+	prepgamesdirs
+}
diff --git a/games-puzzle/penguzzle/penguzzle-1.0.ebuild b/games-puzzle/penguzzle/penguzzle-1.0.ebuild
deleted file mode 100644
index 3462bfc28b3e..000000000000
--- a/games-puzzle/penguzzle/penguzzle-1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/penguzzle/penguzzle-1.0.ebuild,v 1.8 2004/12/28 16:17:16 josejx Exp $
-
-inherit games
-
-DESCRIPTION="Tcl/Tk variant of the well-known 15-puzzle game"
-HOMEPAGE="http://www.naskita.com/linux/penguzzle/penguzzle.shtml"
-SRC_URI="http://www.naskita.com/linux/penguzzle/${PN}.zip"
-
-LICENSE="penguzzle"
-SLOT="0"
-KEYWORDS="amd64 x86 ppc"
-IUSE=""
-
-RDEPEND="dev-tcltk/tclx"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}${PV}"
-
-src_install() {
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins images/*
-
-	insinto "${GAMES_LIBDIR}/${PN}"
-	doins lib/*
-	dosed "s:~/puzz/images:${GAMES_DATADIR}/${PN}:" "${GAMES_LIBDIR}/${PN}/init"
-
-	dogamesbin bin/*
-	dosed "s:~/puzz/lib:${GAMES_LIBDIR}/${PN}:" "${GAMES_BINDIR}/penguzzle"
-
-	dodoc README
-	prepgamesdirs
-}