| 1 |
hasufell 12/08/22 16:29:25 |
| 2 |
|
| 3 |
Modified: gargoyle-2011.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
rework ebuild, also fix #432304 and #432306 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 games-engines/gargoyle/gargoyle-2011.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: gargoyle-2011.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- gargoyle-2011.1.ebuild 21 Aug 2012 19:18:49 -0000 1.4 |
| 23 |
+++ gargoyle-2011.1.ebuild 22 Aug 2012 16:29:24 -0000 1.5 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.4 2012/08/21 19:18:49 hasufell Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.5 2012/08/22 16:29:24 hasufell Exp $ |
| 29 |
|
| 30 |
# Regarding licenses: libgarglk is licensed under the GPLv2. Bundled |
| 31 |
# interpreters are licensed under GPLv2, BSD or MIT license, except: |
| 32 |
@@ -9,8 +9,8 @@ |
| 33 |
# Since we don't compile or install any of the bundled fonts, their licenses |
| 34 |
# don't apply. (Fonts are installed through dependencies instead.) |
| 35 |
|
| 36 |
-EAPI=3 |
| 37 |
-inherit eutils multiprocessing toolchain-funcs games |
| 38 |
+EAPI=4 |
| 39 |
+inherit eutils multiprocessing toolchain-funcs gnome2-utils games |
| 40 |
|
| 41 |
DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats" |
| 42 |
HOMEPAGE="http://ccxvii.net/gargoyle/" |
| 43 |
@@ -21,45 +21,54 @@ |
| 44 |
KEYWORDS="~amd64 ~x86" |
| 45 |
IUSE="" |
| 46 |
|
| 47 |
-RDEPEND="media-libs/freetype:2 |
| 48 |
- virtual/jpeg |
| 49 |
- media-libs/libpng |
| 50 |
- media-fonts/liberation-fonts |
| 51 |
+RDEPEND=" |
| 52 |
>=media-fonts/libertine-ttf-5 |
| 53 |
- sys-libs/zlib |
| 54 |
- x11-libs/gtk+:2 |
| 55 |
+ media-fonts/liberation-fonts |
| 56 |
+ media-libs/freetype:2 |
| 57 |
+ media-libs/libpng:0 |
| 58 |
media-libs/sdl-mixer |
| 59 |
- media-libs/sdl-sound[modplug,mp3,vorbis]" |
| 60 |
- |
| 61 |
+ media-libs/sdl-sound[modplug,mp3,vorbis] |
| 62 |
+ sys-libs/zlib |
| 63 |
+ virtual/jpeg |
| 64 |
+ x11-libs/gtk+:2" |
| 65 |
DEPEND="${RDEPEND} |
| 66 |
app-arch/unzip |
| 67 |
dev-util/ftjam |
| 68 |
virtual/pkgconfig" |
| 69 |
|
| 70 |
+S=${WORKDIR} |
| 71 |
+ |
| 72 |
src_prepare() { |
| 73 |
# Substitute custom CFLAGS/LDFLAGS. |
| 74 |
sed -i -e \ |
| 75 |
"/^\s*OPTIM = / { |
| 76 |
- s/ \(-O.*\)\? ;/ ${CFLAGS} ;/ |
| 77 |
+ s/ \(-O.*\)\? ;/ ;/ |
| 78 |
a LINKFLAGS = ${LDFLAGS} ; |
| 79 |
a SHRLINKFLAGS = ${LDFLAGS} ; |
| 80 |
}" Jamrules || die |
| 81 |
|
| 82 |
# Don't link against libraries used indirectly through SDL_sound. |
| 83 |
- sed -i -e "/GARGLKLIBS/s/-lsmpeg -lvorbisfile//g" Jamrules |
| 84 |
+ sed -i -e "/GARGLKLIBS/s/-lsmpeg -lvorbisfile//g" Jamrules || die |
| 85 |
|
| 86 |
# Convert garglk.ini to UNIX format. |
| 87 |
edos2unix garglk/garglk.ini |
| 88 |
|
| 89 |
# The font name of Linux Libertine changed in version 5. |
| 90 |
- sed -i -e 's/Linux Libertine O/Linux Libertine/g' garglk/garglk.ini |
| 91 |
+ sed -i -e 's/Linux Libertine O/Linux Libertine/g' garglk/garglk.ini || die |
| 92 |
|
| 93 |
epatch "${FILESDIR}"/${P}-desktopfile.patch |
| 94 |
} |
| 95 |
|
| 96 |
src_compile() { |
| 97 |
+ # build system messes up flags and toolchain completely |
| 98 |
+ # append flags to compiler commands to have consistent behavior |
| 99 |
jam \ |
| 100 |
-sAR="$(tc-getAR) cru" \ |
| 101 |
+ -sCC="$(tc-getCC) ${CFLAGS}" \ |
| 102 |
+ -sCCFLAGS="" \ |
| 103 |
+ -sC++="$(tc-getCXX) ${CXXFLAGS}" \ |
| 104 |
+ -sCXX="$(tc-getCXX) ${CXXFLAGS}" \ |
| 105 |
+ -sC++FLAGS="" \ |
| 106 |
-sGARGLKINI="${GAMES_SYSCONFDIR}/garglk.ini" \ |
| 107 |
-sUSESDL=yes \ |
| 108 |
-sBUNDLEFONTS=no \ |
| 109 |
@@ -78,24 +87,37 @@ |
| 110 |
|
| 111 |
# Install config file. |
| 112 |
insinto "${GAMES_SYSCONFDIR}" |
| 113 |
- newins garglk/garglk.ini garglk.ini || die |
| 114 |
+ newins garglk/garglk.ini garglk.ini |
| 115 |
|
| 116 |
# Install application entry and icon. |
| 117 |
- insinto /usr/share/applications |
| 118 |
- doins garglk/${PN}.desktop || die |
| 119 |
- doicon garglk/${PN}-house.png || die |
| 120 |
+ domenu garglk/${PN}.desktop |
| 121 |
+ doicon -s 32 garglk/${PN}-house.png |
| 122 |
|
| 123 |
# Symlink binaries to avoid name clashes. |
| 124 |
for terp in advsys agility alan2 alan3 frotz geas git glulxe hugo jacl \ |
| 125 |
level9 magnetic nitfol scare tadsr |
| 126 |
do |
| 127 |
dosym "${GAMES_PREFIX}/libexec/${PN}/${terp}" \ |
| 128 |
- "${GAMES_BINDIR}/${PN}-${terp}" || die |
| 129 |
+ "${GAMES_BINDIR}/${PN}-${terp}" |
| 130 |
done |
| 131 |
|
| 132 |
# Also symlink the main binary since it resides in libexec. |
| 133 |
dosym "${GAMES_PREFIX}/libexec/${PN}/${PN}" \ |
| 134 |
- "${GAMES_BINDIR}/${PN}" || die |
| 135 |
+ "${GAMES_BINDIR}/${PN}" |
| 136 |
|
| 137 |
prepgamesdirs |
| 138 |
} |
| 139 |
+ |
| 140 |
+pkg_preinst() { |
| 141 |
+ games_pkg_preinst |
| 142 |
+ gnome2_icon_savelist |
| 143 |
+} |
| 144 |
+ |
| 145 |
+pkg_postinst() { |
| 146 |
+ games_pkg_postinst |
| 147 |
+ gnome2_icon_cache_update |
| 148 |
+} |
| 149 |
+ |
| 150 |
+pkg_postrm() { |
| 151 |
+ gnome2_icon_cache_update |
| 152 |
+} |
| 153 |
|
| 154 |
|
| 155 |
|
| 156 |
1.20 games-engines/gargoyle/ChangeLog |
| 157 |
|
| 158 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/gargoyle/ChangeLog?rev=1.20&view=markup |
| 159 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/gargoyle/ChangeLog?rev=1.20&content-type=text/plain |
| 160 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/gargoyle/ChangeLog?r1=1.19&r2=1.20 |
| 161 |
|
| 162 |
Index: ChangeLog |
| 163 |
=================================================================== |
| 164 |
RCS file: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v |
| 165 |
retrieving revision 1.19 |
| 166 |
retrieving revision 1.20 |
| 167 |
diff -u -r1.19 -r1.20 |
| 168 |
--- ChangeLog 21 Aug 2012 19:18:49 -0000 1.19 |
| 169 |
+++ ChangeLog 22 Aug 2012 16:29:24 -0000 1.20 |
| 170 |
@@ -1,6 +1,9 @@ |
| 171 |
# ChangeLog for games-engines/gargoyle |
| 172 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 173 |
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.19 2012/08/21 19:18:49 hasufell Exp $ |
| 174 |
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.20 2012/08/22 16:29:24 hasufell Exp $ |
| 175 |
+ |
| 176 |
+ 22 Aug 2012; Julian Ospald <hasufell@g.o> gargoyle-2011.1.ebuild: |
| 177 |
+ rework ebuild, also fix #432304 and #432306 |
| 178 |
|
| 179 |
21 Aug 2012; Julian Ospald <hasufell@g.o> gargoyle-2011.1.ebuild, |
| 180 |
+files/gargoyle-2011.1-desktopfile.patch: |
Archives