| 1 |
nyhm 08/06/30 15:44:10 |
| 2 |
|
| 3 |
Modified: attal-0.10.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add split qt-4 dependencies, bug #217170 |
| 6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.9 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.5 games-strategy/attal/attal-0.10.1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild?rev=1.5&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild?rev=1.5&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild?r1=1.4&r2=1.5 |
| 14 |
|
| 15 |
Index: attal-0.10.1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild,v |
| 18 |
retrieving revision 1.4 |
| 19 |
retrieving revision 1.5 |
| 20 |
diff -u -r1.4 -r1.5 |
| 21 |
--- attal-0.10.1.ebuild 23 Jan 2008 18:26:18 -0000 1.4 |
| 22 |
+++ attal-0.10.1.ebuild 30 Jun 2008 15:44:09 -0000 1.5 |
| 23 |
@@ -1,8 +1,9 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild,v 1.4 2008/01/23 18:26:18 mr_bones_ Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild,v 1.5 2008/06/30 15:44:09 nyhm Exp $ |
| 28 |
|
| 29 |
-inherit eutils toolchain-funcs qt4 games |
| 30 |
+EAPI=1 |
| 31 |
+inherit eutils qt4 games |
| 32 |
|
| 33 |
MY_P="${PN}-src-${PV}" |
| 34 |
DESCRIPTION="turn-based strategy game project" |
| 35 |
@@ -15,47 +16,46 @@ |
| 36 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 37 |
IUSE="" |
| 38 |
|
| 39 |
-DEPEND="$(qt4_min_version 4) |
| 40 |
+DEPEND="|| ( |
| 41 |
+ ( x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 ) |
| 42 |
+ x11-libs/qt:4 |
| 43 |
+ ) |
| 44 |
+ media-libs/libsdl |
| 45 |
media-libs/sdl-mixer" |
| 46 |
|
| 47 |
S=${WORKDIR}/${MY_P} |
| 48 |
|
| 49 |
-QT4_BUILT_WITH_USE_CHECK="qt3support" |
| 50 |
+pkg_setup() { |
| 51 |
+ QT4_BUILT_WITH_USE_CHECK="qt3support" qt4_pkg_setup |
| 52 |
+ games_pkg_setup |
| 53 |
+} |
| 54 |
|
| 55 |
src_unpack() { |
| 56 |
unpack ${A} |
| 57 |
cd "${S}" |
| 58 |
mv ../themes . |
| 59 |
- find . -name .cvsignore -print0 | xargs -0 rm -f |
| 60 |
- epatch "${FILESDIR}"/${P}-{gcc41,gentoo}.patch |
| 61 |
+ ecvs_clean |
| 62 |
+ epatch \ |
| 63 |
+ "${FILESDIR}"/${P}-gcc41.patch \ |
| 64 |
+ "${FILESDIR}"/${P}-gentoo.patch |
| 65 |
sed -i \ |
| 66 |
-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \ |
| 67 |
libCommon/displayHelp.cpp \ |
| 68 |
libCommon/attalCommon.cpp \ |
| 69 |
server/duel.cpp \ |
| 70 |
|| die "sed failed" |
| 71 |
- |
| 72 |
- sed -i \ |
| 73 |
- -e "1i QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}" \ |
| 74 |
- -e "1i QMAKE_LFLAGS_RELEASE=${LDFLAGS}" \ |
| 75 |
- $(find . -type f -name '*.pro') \ |
| 76 |
- || die "sed failed" |
| 77 |
- qmake -o Makefile Makefile.pro || die "qmake failed" |
| 78 |
} |
| 79 |
|
| 80 |
src_compile() { |
| 81 |
- emake -j1 \ |
| 82 |
- CXX=$(tc-getCXX) \ |
| 83 |
- LINK=$(tc-getCXX) \ |
| 84 |
- || die "emake failed" |
| 85 |
+ eqmake4 Makefile.pro |
| 86 |
+ emake -j1 || die "emake failed" |
| 87 |
} |
| 88 |
|
| 89 |
src_install() { |
| 90 |
dogamesbin attal-* || die "dogamesbin failed" |
| 91 |
dogameslib.so lib*.so* || die "dogameslib.so failed" |
| 92 |
insinto "${GAMES_DATADIR}"/${PN} |
| 93 |
- doins HOWTOPLAY.html |
| 94 |
- doins -r themes || die "doins themes failed" |
| 95 |
+ doins -r themes HOWTOPLAY.html || die "doins failed" |
| 96 |
dodoc AUTHORS NEWS README TODO |
| 97 |
prepgamesdirs |
| 98 |
} |
| 99 |
|
| 100 |
|
| 101 |
|
| 102 |
1.24 games-strategy/attal/ChangeLog |
| 103 |
|
| 104 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/attal/ChangeLog?rev=1.24&view=markup |
| 105 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/attal/ChangeLog?rev=1.24&content-type=text/plain |
| 106 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/attal/ChangeLog?r1=1.23&r2=1.24 |
| 107 |
|
| 108 |
Index: ChangeLog |
| 109 |
=================================================================== |
| 110 |
RCS file: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v |
| 111 |
retrieving revision 1.23 |
| 112 |
retrieving revision 1.24 |
| 113 |
diff -u -r1.23 -r1.24 |
| 114 |
--- ChangeLog 23 Jan 2008 18:26:18 -0000 1.23 |
| 115 |
+++ ChangeLog 30 Jun 2008 15:44:09 -0000 1.24 |
| 116 |
@@ -1,6 +1,9 @@ |
| 117 |
# ChangeLog for games-strategy/attal |
| 118 |
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 119 |
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v 1.23 2008/01/23 18:26:18 mr_bones_ Exp $ |
| 120 |
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v 1.24 2008/06/30 15:44:09 nyhm Exp $ |
| 121 |
+ |
| 122 |
+ 30 Jun 2008; Tristan Heaven <nyhm@g.o> attal-0.10.1.ebuild: |
| 123 |
+ Add split qt-4 dependencies, bug #217170 |
| 124 |
|
| 125 |
23 Jan 2008; Michael Sterrett <mr_bones_@g.o> attal-0.10.1.ebuild: |
| 126 |
add QT4_BUILT_WITH_USE_CHECK for bug #206420 |
| 127 |
|
| 128 |
|
| 129 |
|
| 130 |
-- |
| 131 |
gentoo-commits@l.g.o mailing list |
Archives