diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-02-27 19:01:01 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-02-27 19:01:01 +0000 |
| commit | 4e8d1fd7302b76bcf1a192a5f3bf4e280180547c (patch) | |
| tree | 41b1d34db4ce4be1fc19a3884aebfda97fc9485c /games-puzzle/tanglet | |
| parent | make netkit-fingerd cross compile happy (diff) | |
| download | gentoo-2-4e8d1fd7302b76bcf1a192a5f3bf4e280180547c.tar.gz gentoo-2-4e8d1fd7302b76bcf1a192a5f3bf4e280180547c.tar.bz2 gentoo-2-4e8d1fd7302b76bcf1a192a5f3bf4e280180547c.zip | |
fix initial data locating
(Portage version: 2.1.7.16/cvs/Linux i686)
Diffstat (limited to 'games-puzzle/tanglet')
| -rw-r--r-- | games-puzzle/tanglet/ChangeLog | 6 | ||||
| -rw-r--r-- | games-puzzle/tanglet/files/tanglet-1.0.1-datadir.patch | 23 | ||||
| -rw-r--r-- | games-puzzle/tanglet/tanglet-1.0.1.ebuild | 11 |
3 files changed, 35 insertions, 5 deletions
diff --git a/games-puzzle/tanglet/ChangeLog b/games-puzzle/tanglet/ChangeLog index d5c1c6470e15..6ec0ae96827e 100644 --- a/games-puzzle/tanglet/ChangeLog +++ b/games-puzzle/tanglet/ChangeLog @@ -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) 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 index 000000000000..7f94934d0493 --- /dev/null +++ b/games-puzzle/tanglet/files/tanglet-1.0.1-datadir.patch @@ -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/ diff --git a/games-puzzle/tanglet/tanglet-1.0.1.ebuild b/games-puzzle/tanglet/tanglet-1.0.1.ebuild index 6db8172d9ea6..26710b264e84 100644 --- a/games-puzzle/tanglet/tanglet-1.0.1.ebuild +++ b/games-puzzle/tanglet/tanglet-1.0.1.ebuild @@ -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() { |