fix initial data locating
authorMichael Sterrett <mr_bones_@gentoo.org>
Sat, 27 Feb 2010 19:01:01 +0000 (19:01 +0000)
committerMichael Sterrett <mr_bones_@gentoo.org>
Sat, 27 Feb 2010 19:01:01 +0000 (19:01 +0000)
Package-Manager: portage-2.1.7.16/cvs/Linux i686

games-puzzle/tanglet/ChangeLog
games-puzzle/tanglet/Manifest
games-puzzle/tanglet/files/tanglet-1.0.1-datadir.patch [new file with mode: 0644]
games-puzzle/tanglet/tanglet-1.0.1.ebuild

index d5c1c6470e152fa000d4bc9414d397e1bf4d4288..6ec0ae96827eaf2d83f066b3e734571db8f1bd38 100644 (file)
@@ -1,6 +1,10 @@
 # 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.2 2010/01/14 18:12:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tanglet/ChangeLog,v 1.3 2010/02/27 19:01:00 mr_bones_ Exp $
+
+  27 Feb 2010; Michael Sterrett <mr_bones_@gentoo.org> tanglet-1.0.1.ebuild,
+  +files/tanglet-1.0.1-datadir.patch:
+  fix initial data locating
 
 *tanglet-1.0.1 (14 Jan 2010)
 
index d1beba529c91ffac2177a8c018dfaf0a3ac3f746..df5e9146004885f549075c0461ba4945f1d45158 100644 (file)
@@ -1,4 +1,5 @@
+AUX tanglet-1.0.1-datadir.patch 778 RMD160 167201bde723c9891df9399d7e013db9261cd718 SHA1 5eff6b651fdc9f2fa9c4ad273075405ca90651e4 SHA256 7bce4d177b168a0fc5701d2123db278ea5d31e06739d73f76175feb9f9d533b2
 DIST tanglet-1.0.1-src.tar.bz2 1384274 RMD160 c036c0143b633636d7939572ba64c29961c8ff50 SHA1 66e13e16dbb3eaf9ff7997f87114fafe6b4b0407 SHA256 8bc50a8cb61740770388e16daf742b5e28c3c483c759d952624116f03a134a45
-EBUILD tanglet-1.0.1.ebuild 995 RMD160 a752e3dfa79f5a73f7383200cfd6ea41eeeeb2e2 SHA1 28edb3512a7664d16e4d9f4aa7ed2aa9b41c4d5d SHA256 42f66c69f5dbfe28b2ab1685cdeb32e0b87795a5444aaafbb18defd571871a86
-MISC ChangeLog 466 RMD160 e53e242168bc65dfc7d302ea2dedf81c7b47d624 SHA1 c51110f92a60e6d7b9e9e8df4164d99523f718ce SHA256 805ddcc648cfc5ae38213491d6dc7e92014f198aa645c1e418f8d7dc1b8ab134
+EBUILD tanglet-1.0.1.ebuild 1093 RMD160 eee827e96d3b0bdca990a83055820c05c07f6747 SHA1 92a17f5363fe7a7629491dc1b166bfd9652512fa SHA256 106267ae0891d7849304d00986e208fde489d571d5a61a8c69f57a2a94d35cc6
+MISC ChangeLog 610 RMD160 b92f5274ba9312b8e43d9b64cf3b41ab14a86856 SHA1 8407b795efa7bc6dc95e303be6d762807d20e1ba SHA256 ae774e33437f051b2e898ddbf3fa99bf12bd81e5631faf5112bf100b552fa57b
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/tanglet/files/tanglet-1.0.1-datadir.patch b/games-puzzle/tanglet/files/tanglet-1.0.1-datadir.patch
new file mode 100644 (file)
index 0000000..7f94934
--- /dev/null
@@ -0,0 +1,23 @@
+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
+@@ -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/");
+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
+@@ -48,7 +48,7 @@
+ 
+ unix:!macx {
+       isEmpty(PREFIX) {
+-              PREFIX = /usr/local
++              PREFIX = /usr
+       }
+ 
+       target.path = $$PREFIX/bin/
index 6db8172d9ea638e72a83eaa60acadc307a02a07a..26710b264e845f0d49d21842f66f80b691bda14c 100644 (file)
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tanglet/tanglet-1.0.1.ebuild,v 1.1 2010/01/14 18:12:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tanglet/tanglet-1.0.1.ebuild,v 1.2 2010/02/27 19:01:00 mr_bones_ Exp $
 
 EAPI=2
-inherit gnome2-utils qt4 games
+inherit eutils gnome2-utils qt4 games
 
 DESCRIPTION="A single player word finding game based on Boggle"
 HOMEPAGE="http://gottcode.org/tanglet/"
@@ -17,11 +17,14 @@ IUSE=""
 DEPEND="x11-libs/qt-gui:4"
 
 src_prepare() {
+       epatch "${FILESDIR}"/${P}-datadir.patch
        sed -i \
-               -e "/PREFIX/s:/usr/local:/usr:" \
                -e "/target.path/s:\$\$PREFIX/bin:${GAMES_BINDIR}:" \
                -e "/data_/s:\$\$PREFIX/share:${GAMES_DATADIR}:g" \
-               ${PN}.pro || die
+               tanglet.pro || die
+       sed -i \
+               -e "s:GENTOO_DIR:${GAMES_DATADIR}/${PN}/data:g" \
+               src/main.cpp || die
 }
 
 src_configure() {