version bump with patch from Michael (kensington) (bug #395583)

Package-Manager: portage-2.1.10.41/cvs/Linux i686

5 files changed, 93 insertions, 10 deletions

diff --git a/games-puzzle/tanglet/ChangeLog b/games-puzzle/tanglet/ChangeLog
index b358dc1684af..7790372e835b 100644
--- a/games-puzzle/tanglet/ChangeLog
+++ b/games-puzzle/tanglet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-puzzle/tanglet
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tanglet/ChangeLog,v 1.8 2010/06/01 07:55:25 phajdan.jr Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tanglet/ChangeLog,v 1.9 2011/12/22 01:19:06 mr_bones_ Exp $
+
+*tanglet-1.2.0 (22 Dec 2011)
+
+  22 Dec 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  files/tanglet-1.1.0-datadir.patch, +tanglet-1.2.0.ebuild,
+  +files/tanglet-1.2.0-datadir.patch:
+  version bump with patch from Michael (kensington) (bug #395583)
 
   01 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> tanglet-1.1.0.ebuild:
   x86 stable wrt bug #320821
diff --git a/games-puzzle/tanglet/Manifest b/games-puzzle/tanglet/Manifest
index 5528f3f3849e..f71001570b05 100644
--- a/games-puzzle/tanglet/Manifest
+++ b/games-puzzle/tanglet/Manifest
@@ -1,5 +1,8 @@
-AUX tanglet-1.1.0-datadir.patch 778 RMD160 167201bde723c9891df9399d7e013db9261cd718 SHA1 5eff6b651fdc9f2fa9c4ad273075405ca90651e4 SHA256 7bce4d177b168a0fc5701d2123db278ea5d31e06739d73f76175feb9f9d533b2
+AUX tanglet-1.1.0-datadir.patch 500 RMD160 ad95bd75b93d87022630641b32169220bb69c52e SHA1 0c5441d88061779ab2d9f11c3a5671d9f0e746aa SHA256 bf6867e9ced278315eb838dead6625bfe39f465e1f6099ce7a2cf177155e9745
+AUX tanglet-1.2.0-datadir.patch 500 RMD160 ad95bd75b93d87022630641b32169220bb69c52e SHA1 0c5441d88061779ab2d9f11c3a5671d9f0e746aa SHA256 bf6867e9ced278315eb838dead6625bfe39f465e1f6099ce7a2cf177155e9745
 DIST tanglet-1.1.0-src.tar.bz2 1283979 RMD160 71742fc7b6feee6eeeb954c9da9c9459853816c7 SHA1 f2dfd10dc67d0a5656956232f01fbb78922ecc69 SHA256 1ca847577cc90c3a4900940a64fee151cfc5ac5c77891137bb233691fcfcde65
+DIST tanglet-1.2.0-src.tar.bz2 4291176 RMD160 6a34f19f28ee9faf3fab223905235d431639451a SHA1 09b74a7d6ec48c9ca7d76d6fcd7d550d1d4b1d05 SHA256 ef610c008439dbeb5c71d904ad71176ed1b67f4f55c85bab460e64d4b816c36b
 EBUILD tanglet-1.1.0.ebuild 1092 RMD160 70db37a164f7daf8c1dbdfe7fe9a9edfe4becbfc SHA1 44c44397950978041cd29bc1c7a6df8fd0ddc4fc SHA256 7c4bff2284b21fa6037ce3be22834f45394a4f8550fe3cd87f40dbbde9182b46
-MISC ChangeLog 1187 RMD160 477a699bb9cdedf23a99b79409fcd7f758fa887c SHA1 e00b37237f5b4553e826d6543c2fe8fa9075312b SHA256 e678944e43f7d99240c7cf86b9fd4b87e5f88ee456c55aaf1d9fa8501d56391d
+EBUILD tanglet-1.2.0.ebuild 1139 RMD160 0b6cb9152a336ada513094b1ad26262dc2b84936 SHA1 8e1777398dd97e1ee503891fcf8c5c076b151237 SHA256 22bcdc9e32d81d7084998c3c8768f3119a0ce7ca7a9da80f17842cde65efcb51
+MISC ChangeLog 1436 RMD160 191cbe30ab70f033d71c961f064d24fe9a37f115 SHA1 ad4906bb9f563e2957f2611541dcda57f58a2f8d SHA256 09fbc8c17fc167b4d688dd34ce8983539e532fcb3979fdec67fecbb2cb0696d5
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/tanglet/files/tanglet-1.1.0-datadir.patch b/games-puzzle/tanglet/files/tanglet-1.1.0-datadir.patch
index 7f94934d0493..af9dedc24918 100644
--- a/games-puzzle/tanglet/files/tanglet-1.1.0-datadir.patch
+++ b/games-puzzle/tanglet/files/tanglet-1.1.0-datadir.patch
@@ -1,6 +1,5 @@
-diff -ru tanglet-1.0.1.orig/src/main.cpp tanglet-1.0.1/src/main.cpp
---- tanglet-1.0.1.orig/src/main.cpp	2010-01-11 20:23:45.000000000 -0500
-+++ tanglet-1.0.1/src/main.cpp	2010-02-27 13:54:16.915177582 -0500
+--- tanglet-1.0.1.orig/src/main.cpp
++++ tanglet-1.0.1/src/main.cpp
 @@ -36,6 +36,7 @@
  
  	QString path = app.applicationDirPath();
@@ -9,9 +8,8 @@ diff -ru tanglet-1.0.1.orig/src/main.cpp tanglet-1.0.1/src/main.cpp
  	paths.append(path + "/data/");
  	paths.append(path + "/../share/tanglet/data/");
  	paths.append(path + "/../Resources/");
-diff -ru tanglet-1.0.1.orig/tanglet.pro tanglet-1.0.1/tanglet.pro
---- tanglet-1.0.1.orig/tanglet.pro	2010-01-11 18:25:54.000000000 -0500
-+++ tanglet-1.0.1/tanglet.pro	2010-02-27 13:53:13.104184583 -0500
+--- tanglet-1.0.1.orig/tanglet.pro
++++ tanglet-1.0.1/tanglet.pro
 @@ -48,7 +48,7 @@
  
  unix:!macx {
diff --git a/games-puzzle/tanglet/files/tanglet-1.2.0-datadir.patch b/games-puzzle/tanglet/files/tanglet-1.2.0-datadir.patch
new file mode 100644
index 000000000000..af9dedc24918
--- /dev/null
+++ b/games-puzzle/tanglet/files/tanglet-1.2.0-datadir.patch
@@ -0,0 +1,21 @@
+--- tanglet-1.0.1.orig/src/main.cpp
++++ tanglet-1.0.1/src/main.cpp
+@@ -36,6 +36,7 @@
+ 
+ 	QString path = app.applicationDirPath();
+ 	QStringList paths;
++	paths.append("GENTOO_DIR");
+ 	paths.append(path + "/data/");
+ 	paths.append(path + "/../share/tanglet/data/");
+ 	paths.append(path + "/../Resources/");
+--- tanglet-1.0.1.orig/tanglet.pro
++++ tanglet-1.0.1/tanglet.pro
+@@ -48,7 +48,7 @@
+ 
+ unix:!macx {
+ 	isEmpty(PREFIX) {
+-		PREFIX = /usr/local
++		PREFIX = /usr
+ 	}
+ 
+ 	target.path = $$PREFIX/bin/
diff --git a/games-puzzle/tanglet/tanglet-1.2.0.ebuild b/games-puzzle/tanglet/tanglet-1.2.0.ebuild
new file mode 100644
index 000000000000..ac76ad24e8ea
--- /dev/null
+++ b/games-puzzle/tanglet/tanglet-1.2.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tanglet/tanglet-1.2.0.ebuild,v 1.1 2011/12/22 01:19:06 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils gnome2-utils qt4-r2 games
+
+DESCRIPTION="A single player word finding game based on Boggle"
+HOMEPAGE="http://gottcode.org/tanglet/"
+SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-datadir.patch
+	sed -i \
+		-e "/target.path/s:\$\$PREFIX/bin:${GAMES_BINDIR}:" \
+		-e "/data_/s:\$\$PREFIX/share:${GAMES_DATADIR}:g" \
+		tanglet.pro || die
+	sed -i \
+		-e "s:GENTOO_DIR:${GAMES_DATADIR}/${PN}/data:g" \
+		src/main.cpp || die
+}
+
+src_configure() {
+	eqmake4
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die
+	dodoc ChangeLog CREDITS
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	games_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	games_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}