diff options
| -rw-r--r-- | games-engines/gargoyle/ChangeLog | 5 | ||||
| -rw-r--r-- | games-engines/gargoyle/Manifest | 18 | ||||
| -rw-r--r-- | games-engines/gargoyle/gargoyle-2011.1.ebuild | 62 |
3 files changed, 55 insertions, 30 deletions
diff --git a/games-engines/gargoyle/ChangeLog b/games-engines/gargoyle/ChangeLog index 2311a833f470..8cb9889c65ca 100644 --- a/games-engines/gargoyle/ChangeLog +++ b/games-engines/gargoyle/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-engines/gargoyle # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.19 2012/08/21 19:18:49 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.20 2012/08/22 16:29:24 hasufell Exp $ + + 22 Aug 2012; Julian Ospald <hasufell@gentoo.org> gargoyle-2011.1.ebuild: + rework ebuild, also fix #432304 and #432306 21 Aug 2012; Julian Ospald <hasufell@gentoo.org> gargoyle-2011.1.ebuild, +files/gargoyle-2011.1-desktopfile.patch: diff --git a/games-engines/gargoyle/Manifest b/games-engines/gargoyle/Manifest index 9962007b84ac..5ebfe39b509b 100644 --- a/games-engines/gargoyle/Manifest +++ b/games-engines/gargoyle/Manifest @@ -5,17 +5,17 @@ AUX gargoyle-2011.1-desktopfile.patch 1265 SHA256 b9f0eba5af34a7703c2d3bd38e216f DIST gargoyle-2010.1-sources.zip 10771623 SHA256 1646565625cf963bf27f0cbe91735523e1c83ea2d49bef9ff534c1ac78aa7e1d SHA512 45a24eae5b02864e8e0df2833ff53cc8aad28aed8e404bb6dd95caa48c9522989196b60b9d70702af4d5e0f7bc06af48e8067dc0580fd23d8612513305b72079 WHIRLPOOL 5cc4e2018c58b1080c5338981ea3543b45adc8bff6b7e3e6546387ad29c63dec978eddd048ccd484628645d274394ca3735c1bb1c617e691dd05787c0cb7b248 DIST gargoyle-2011.1-sources.zip 11291660 SHA256 8642ac38add31d47bfd531d4121dc1e956d06895a9352ce573b5007e9cae4634 SHA512 65159580cf3494944f841c44320135580557258e37ad5523ae3ea30555c19834a2793231a8e42c217e5c1d055d50ed6a20d372d6302e880a2818bc4ea59b226f WHIRLPOOL 19e572d52ec6436c5b41d767e45d509bd965a0d4009b4445db08e79125eabb20636374bbb818ef7115a1ca9ac983a29cb2eaa3848a22e17d5e7d26284200b86f EBUILD gargoyle-2010.1.ebuild 3253 SHA256 8fdd51a82daf4243e5bac795f7f0c8e3cf5b0c1a52b8cf0f5f1f8284e6a3fee6 SHA512 3edd73646cd9a33bdc919a3bc3cef6e1fae814955cc8c9d9618582f3a4e7edabd56907d7e42b5c934a1fbdd9981516add5ca2046eb5de5caffed39ed3910bc5f WHIRLPOOL 7e23dfa4cd8d7b305a4f144c500c2814d9ec100893dabb19d6f7074dfbdfe7ea570022fead48f12330ec9d6708281e2246d272c1f01da487f16638624f343cd6 -EBUILD gargoyle-2011.1.ebuild 2862 SHA256 cc4f1996920b2cdeb2a76fe7ad67b1122fbaf885a2f59d44bc807858cef84a2b SHA512 9e37153053f6678aaefd1ee837599ee5297c0b3b450da82eeda294dd9eb20abc5d1b56f5abf8848c30d83b06eba28d5e1154a9b61c839d48bc77db11ce56594e WHIRLPOOL acf6a7c0840af8cef36a8f1208d205da1de10a8f960217cf765408eba85545d51e3e9b2a4473212ed5d71db6f03a198eb9c94602da5d1cf60edff04902d6e698 -MISC ChangeLog 3342 SHA256 221298364f475a3488cc2c4cda586bbb221246d37b99f82dc78e418a3b456046 SHA512 ddaf41baebfa62cf2ceb77bf016087fe2f73568b1c592745be2d3527400c2eb44293ae8448c84d926e34bb378d904cdf94cc27c86d73b31e58804acbc62cb509 WHIRLPOOL a5d44db0329a78958e0c3742f95aa66576234815e8f7609ad3c9cad2a92623c2ad53e9a1e61d26ab533f713b62f4e9cd1783f9b4ae8ccb214b382848abeccbfe +EBUILD gargoyle-2011.1.ebuild 3269 SHA256 e524fc6439e1101b968bede1b2cbe0976f23a9fac5a440973d324665da411e94 SHA512 53457e65c3bec94518fcac23f082ce769623c660a72dcfc6ad63effb373cf52c8139a4a7dc4f17923e53c4c16b5159979e212aa59c44a82f060a0d9f5d75aab7 WHIRLPOOL 387ece6429f4d035a8a28c607af25f05669a00cc059c3680a9583794ea13dc001f7d293eeafa6d5d621564cf9bfd197d01610714ad7f758c8cf6e15a00eb7ea0 +MISC ChangeLog 3464 SHA256 39febe0cc54397c0e74f22b5c0aa76828c979e182a76e1ba6c461ccd1a2eda0a SHA512 e9513297ac5751b2d8b9b2ec689c6a68ef27279d71cdeb1b9c865fd7928334d6b801a9b0d2d551e49c2f7f9b99643f1c4036f3a1654000c57d6e9b8359aa7745 WHIRLPOOL 030fdbe40fdb43e7c66c02cce5fb9107d201a898946310518476348fa72c95762bc931b99753f22db9a2d0cbc340c4bf848c37fcf3e90faaf90a4254e19c5ee3 MISC metadata.xml 331 SHA256 51cc1262568afa65da7057a6ff1799d5e09251f97eb7d15c4708b8140aa5993d SHA512 d7dd2d4155c4c41730c9e03d51239c275458d82e0ca3448aa54078937cbaef3256f599ef47fb5ee50c6f2cb3734270de9dc0face1e7444bd7c67a459ce4c41f1 WHIRLPOOL 0c2e76db27725d24fd24685f56305949a1fef04f87c5e0db8ebe5bd88e16a73b4d16b9109d3237a1968f466d36d3bc7660e03cecc2f9f8d479e4138ed38ee8f9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQM93vAAoJEFpvPKfnPDWzc3MIAKqzWbAVJyYtjFgCslYYJa5K -fVLETvGMIyGzTUX5hxw6bXEyPvOdxw1Gz0CMPvXovQS+eGtdXx1UvF9qC0h+R29g -wggoF+YPBRLkWCz4vo0Rww/LKYws+QlYI0uCuS8yhVYJWBNybYdQ41xi6zDqpbWf -eBgeZ6Z13Ul/iN/fHbL+Uv7Bnfv6nvnQq8vNJklkuq0uJd4P3QtiX9Cv7+uNURCp -iI24uMNqxe65BW/CeEn8wwn6RKmQhkyNw4w9I+VYDNw3JhjDpSYGj93mJ6vWvR5N -5eW26DL26cvlXKS4qsx65L4O8IiJBq+BX9uFK/NWyUR5eEhE98PcUS00BTbFX/8= -=dOcX +iQEcBAEBCAAGBQJQNQe4AAoJEFpvPKfnPDWzjNMH/3wImChBF0O28QxHWqdcCeSn +aRYqgMW2ZABuV8lzvBYlsSbrkVSGGj3oiAKU2Hxuu95a4loAq5BwIXijwWh7xDz7 +RXJDR+GvTgKnS4UdNnnNh1iMVVDdO+VrEEhkS9lwCtFV5vGVSFd4m5s2EVsDXOO/ +a1L0SU9cHUozycNCulSAdrcHRg5B6RgTrABtid/BeQWoY5OD5g3LAH4kmIy25Om7 +MhW0KcFl52m2X3Bi7SIM6bymjrEFc0s7fd8goMIp2sI2on06/YUrlbLqj+bjKOFf +GiFYszz0m4WAYqS/pDlYGdnbNbBlHn8IAu4NBBsx4rnTaoBpxEZkFN/6KEZ4xwk= +=scZ1 -----END PGP SIGNATURE----- diff --git a/games-engines/gargoyle/gargoyle-2011.1.ebuild b/games-engines/gargoyle/gargoyle-2011.1.ebuild index 2255b3c62325..374ca40591cd 100644 --- a/games-engines/gargoyle/gargoyle-2011.1.ebuild +++ b/games-engines/gargoyle/gargoyle-2011.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.4 2012/08/21 19:18:49 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.5 2012/08/22 16:29:24 hasufell Exp $ # Regarding licenses: libgarglk is licensed under the GPLv2. Bundled # interpreters are licensed under GPLv2, BSD or MIT license, except: @@ -9,8 +9,8 @@ # Since we don't compile or install any of the bundled fonts, their licenses # don't apply. (Fonts are installed through dependencies instead.) -EAPI=3 -inherit eutils multiprocessing toolchain-funcs games +EAPI=4 +inherit eutils multiprocessing toolchain-funcs gnome2-utils games DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats" HOMEPAGE="http://ccxvii.net/gargoyle/" @@ -21,45 +21,54 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="media-libs/freetype:2 - virtual/jpeg - media-libs/libpng - media-fonts/liberation-fonts +RDEPEND=" >=media-fonts/libertine-ttf-5 - sys-libs/zlib - x11-libs/gtk+:2 + media-fonts/liberation-fonts + media-libs/freetype:2 + media-libs/libpng:0 media-libs/sdl-mixer - media-libs/sdl-sound[modplug,mp3,vorbis]" - + media-libs/sdl-sound[modplug,mp3,vorbis] + sys-libs/zlib + virtual/jpeg + x11-libs/gtk+:2" DEPEND="${RDEPEND} app-arch/unzip dev-util/ftjam virtual/pkgconfig" +S=${WORKDIR} + src_prepare() { # Substitute custom CFLAGS/LDFLAGS. sed -i -e \ "/^\s*OPTIM = / { - s/ \(-O.*\)\? ;/ ${CFLAGS} ;/ + s/ \(-O.*\)\? ;/ ;/ a LINKFLAGS = ${LDFLAGS} ; a SHRLINKFLAGS = ${LDFLAGS} ; }" Jamrules || die # Don't link against libraries used indirectly through SDL_sound. - sed -i -e "/GARGLKLIBS/s/-lsmpeg -lvorbisfile//g" Jamrules + sed -i -e "/GARGLKLIBS/s/-lsmpeg -lvorbisfile//g" Jamrules || die # Convert garglk.ini to UNIX format. edos2unix garglk/garglk.ini # The font name of Linux Libertine changed in version 5. - sed -i -e 's/Linux Libertine O/Linux Libertine/g' garglk/garglk.ini + sed -i -e 's/Linux Libertine O/Linux Libertine/g' garglk/garglk.ini || die epatch "${FILESDIR}"/${P}-desktopfile.patch } src_compile() { + # build system messes up flags and toolchain completely + # append flags to compiler commands to have consistent behavior jam \ -sAR="$(tc-getAR) cru" \ + -sCC="$(tc-getCC) ${CFLAGS}" \ + -sCCFLAGS="" \ + -sC++="$(tc-getCXX) ${CXXFLAGS}" \ + -sCXX="$(tc-getCXX) ${CXXFLAGS}" \ + -sC++FLAGS="" \ -sGARGLKINI="${GAMES_SYSCONFDIR}/garglk.ini" \ -sUSESDL=yes \ -sBUNDLEFONTS=no \ @@ -78,24 +87,37 @@ src_install() { # Install config file. insinto "${GAMES_SYSCONFDIR}" - newins garglk/garglk.ini garglk.ini || die + newins garglk/garglk.ini garglk.ini # Install application entry and icon. - insinto /usr/share/applications - doins garglk/${PN}.desktop || die - doicon garglk/${PN}-house.png || die + domenu garglk/${PN}.desktop + doicon -s 32 garglk/${PN}-house.png # Symlink binaries to avoid name clashes. for terp in advsys agility alan2 alan3 frotz geas git glulxe hugo jacl \ level9 magnetic nitfol scare tadsr do dosym "${GAMES_PREFIX}/libexec/${PN}/${terp}" \ - "${GAMES_BINDIR}/${PN}-${terp}" || die + "${GAMES_BINDIR}/${PN}-${terp}" done # Also symlink the main binary since it resides in libexec. dosym "${GAMES_PREFIX}/libexec/${PN}/${PN}" \ - "${GAMES_BINDIR}/${PN}" || die + "${GAMES_BINDIR}/${PN}" prepgamesdirs } + +pkg_preinst() { + games_pkg_preinst + gnome2_icon_savelist +} + +pkg_postinst() { + games_pkg_postinst + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} |