Version bump, with updated filename patch, fixed gtk+ detection and added missing sdl dependancies. Closes bug #157207. Wiped out previous version.

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

4 files changed, 16 insertions, 301 deletions

diff --git a/games-engines/gargoyle/Manifest b/games-engines/gargoyle/Manifest
index d55fe1a531a9..e271646438a9 100644
--- a/games-engines/gargoyle/Manifest
+++ b/games-engines/gargoyle/Manifest
@@ -1,20 +1,20 @@
-AUX filename-friendliness.patch 6428 RMD160 0322d83fc6208ca8dee070493a49d620251974c7 SHA1 a12a5f61d228e509131f02f6e04562c75ca44597 SHA256 555755a580fcc4ede9d279a56c65b439a439d72c4aa027adbea918c0d67b5913
-MD5 3fb2cf25d30813b3a728dfa6f93a5f82 files/filename-friendliness.patch 6428
-RMD160 0322d83fc6208ca8dee070493a49d620251974c7 files/filename-friendliness.patch 6428
-SHA256 555755a580fcc4ede9d279a56c65b439a439d72c4aa027adbea918c0d67b5913 files/filename-friendliness.patch 6428
-DIST gargoyle-2006-07-03-source.zip 7112485 RMD160 d083b3496c7ee3160231bf0779ac83cce436c593 SHA1 2c64171b3f11fbfbc3b91e062f6b1d34791374bc SHA256 98da573170d6b89d6522c435bff5d6ddfbdda86baaad14570a038925ed7e042c
-EBUILD gargoyle-20060703.ebuild 1427 RMD160 ecba04b99991c39395a492c635204afb53d89aeb SHA1 fa87c460b7fe18d7aed5fe0e3100d47867645c76 SHA256 362796d4328c0724b141a54a07c56e382a7612d8653c8051c02fff3183b80cea
-MD5 8ad9483ac1b58ab9953552f3043c9362 gargoyle-20060703.ebuild 1427
-RMD160 ecba04b99991c39395a492c635204afb53d89aeb gargoyle-20060703.ebuild 1427
-SHA256 362796d4328c0724b141a54a07c56e382a7612d8653c8051c02fff3183b80cea gargoyle-20060703.ebuild 1427
-MISC ChangeLog 869 RMD160 6e4821134c692a597e274ca75fbbc49a9482f296 SHA1 4a562471907cf9487f395263bd552edee85e88ee SHA256 2f5c8e872a9c52e34041a78deb601b4154ec8290eeec416f57f9f2778b30df88
-MD5 55beb3aa53d9b6d571586256f9377a16 ChangeLog 869
-RMD160 6e4821134c692a597e274ca75fbbc49a9482f296 ChangeLog 869
-SHA256 2f5c8e872a9c52e34041a78deb601b4154ec8290eeec416f57f9f2778b30df88 ChangeLog 869
+AUX filename-friendliness-20060917.patch 6215 RMD160 dd87f7631933ee8e903e986459f6215b525c13d1 SHA1 28bc89c84b12e4a4373ba31904d3f6ed3d485c50 SHA256 ee70e785ae62e9715dd081e669099153ed764af0a9d364bbac1aa285dee27dda
+MD5 f5a6119306806e97f46f95f307229ff8 files/filename-friendliness-20060917.patch 6215
+RMD160 dd87f7631933ee8e903e986459f6215b525c13d1 files/filename-friendliness-20060917.patch 6215
+SHA256 ee70e785ae62e9715dd081e669099153ed764af0a9d364bbac1aa285dee27dda files/filename-friendliness-20060917.patch 6215
+DIST gargoyle-2006-09-17-source.zip 9714916 RMD160 86e832323f8da96004460c7fa5b1054717817884 SHA1 2a1f4fa08444761ecc32c28770f0af6d24b4eeb8 SHA256 3a39e8e8809a8d942bb5ae71b8f64e4f4f4ecbf2cd1e7de0ed40fd58ea2f7ce0
+EBUILD gargoyle-20060917.ebuild 1639 RMD160 80b3c8b6356d629ec752c785881715bd8e309b0b SHA1 89f9b1e6cc542afdc19d878c5ab16b38d1a7b014 SHA256 72e3b0a90d755f22baefd6b5474b7639f41d69cc1d623aefdb6319c5e84e2d56
+MD5 009c0edcace87f762bb164797ffc7334 gargoyle-20060917.ebuild 1639
+RMD160 80b3c8b6356d629ec752c785881715bd8e309b0b gargoyle-20060917.ebuild 1639
+SHA256 72e3b0a90d755f22baefd6b5474b7639f41d69cc1d623aefdb6319c5e84e2d56 gargoyle-20060917.ebuild 1639
+MISC ChangeLog 1185 RMD160 ecbd684a433a6be46615bd0e1fb51bf462c94059 SHA1 b01af2f93fc88e481f7c3591085d4a27051fe881 SHA256 a72229f78411be7bc8abcd73c03518729dd7abee979e008c8ac43e69b0b4c22c
+MD5 81c1784703f60cd1d947a116aa9e72d0 ChangeLog 1185
+RMD160 ecbd684a433a6be46615bd0e1fb51bf462c94059 ChangeLog 1185
+SHA256 a72229f78411be7bc8abcd73c03518729dd7abee979e008c8ac43e69b0b4c22c ChangeLog 1185
 MISC metadata.xml 252 RMD160 8ce3795bac9d4960615a67c32fb3994bfece325f SHA1 dfce1ee8158b18adf66bfee2988b2b1c796443a8 SHA256 76446769792843475165db424def28271c1aabc5d695d29ad30858e8055c7acd
 MD5 954c9d9d89dbb19ec5308b091de981b0 metadata.xml 252
 RMD160 8ce3795bac9d4960615a67c32fb3994bfece325f metadata.xml 252
 SHA256 76446769792843475165db424def28271c1aabc5d695d29ad30858e8055c7acd metadata.xml 252
-MD5 6f79e4336479c6d6cdce7e2499fd5df8 files/digest-gargoyle-20060703 274
-RMD160 bee0a1c6205e162023a437c3d5f2a8523f2fe97d files/digest-gargoyle-20060703 274
-SHA256 3a12c9adcbbee6d5fa2884f6b0e681064a5e46487d024e57ed819c9bdb15d39e files/digest-gargoyle-20060703 274
+MD5 159afeacc933397c3fcefa6889c7df31 files/digest-gargoyle-20060917 274
+RMD160 cab5ab3ac9ddcd644776f69df761a9a0c0d0fe29 files/digest-gargoyle-20060917 274
+SHA256 7429b91f58b21d5ab9d8dbf625631ce519359e694fd8e097e0b2ab689b4c91ba files/digest-gargoyle-20060917 274
diff --git a/games-engines/gargoyle/files/digest-gargoyle-20060703 b/games-engines/gargoyle/files/digest-gargoyle-20060703
deleted file mode 100644
index 2e2882c82184..000000000000
--- a/games-engines/gargoyle/files/digest-gargoyle-20060703
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3ae027be29fc02a4bd8500b69f41af32 gargoyle-2006-07-03-source.zip 7112485
-RMD160 d083b3496c7ee3160231bf0779ac83cce436c593 gargoyle-2006-07-03-source.zip 7112485
-SHA256 98da573170d6b89d6522c435bff5d6ddfbdda86baaad14570a038925ed7e042c gargoyle-2006-07-03-source.zip 7112485
diff --git a/games-engines/gargoyle/files/filename-friendliness.patch b/games-engines/gargoyle/files/filename-friendliness.patch
deleted file mode 100644
index 9b916b07fcaa..000000000000
--- a/games-engines/gargoyle/files/filename-friendliness.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-diff -rU 2 gargoyle-2006-07-03-source-pre/garglk/launcher.sh gargoyle-2006-07-03-source/garglk/launcher.sh
---- gargoyle-2006-07-03-source-pre/garglk/launcher.sh	2006-07-02 13:21:10.000000000 -0400
-+++ gargoyle-2006-07-03-source/garglk/launcher.sh	2006-08-18 17:08:43.000000000 -0400
-@@ -45,25 +45,25 @@
- 
- case "$lowpath" in
--    *.taf ) $dirpath/scare "$1" ;;
--    *.dat ) $dirpath/advsys "$1" ;;
--    *.agx ) $dirpath/agility "$1" ;;
--    *.d\$\$ ) $dirpath/agility "$1" ;;
--    *.acd ) $dirpath/alan2 "$1" ;;
--    *.a3c ) $dirpath/alan3 "$1" ;;
--    *.ulx ) $dirpath/git "$1" ;;
--    *.hex ) $dirpath/hugo "$1" ;;
--    *.l9  ) $dirpath/level9 "$1" ;;
--    *.sna ) $dirpath/level9 "$1" ;;
--    *.mag ) $dirpath/magnetic "$1" ;;
--    *.gam ) $dirpath/tadsr "$1" ;;
--    *.t3  ) $dirpath/tadsr "$1" ;;
--    *.z?  ) $dirpath/frotz "$1" ;;
-+    *.taf ) $dirpath/gargoyle-scare "$1" ;;
-+    *.dat ) $dirpath/gargoyle-advsys "$1" ;;
-+    *.agx ) $dirpath/gargoyle-agility "$1" ;;
-+    *.d\$\$ ) $dirpath/gargoyle-agility "$1" ;;
-+    *.acd ) $dirpath/gargoyle-alan2 "$1" ;;
-+    *.a3c ) $dirpath/gargoyle-alan3 "$1" ;;
-+    *.ulx ) $dirpath/gargoyle-git "$1" ;;
-+    *.hex ) $dirpath/gargoyle-hugo "$1" ;;
-+    *.l9  ) $dirpath/gargoyle-level9 "$1" ;;
-+    *.sna ) $dirpath/gargoyle-level9 "$1" ;;
-+    *.mag ) $dirpath/gargoyle-magnetic "$1" ;;
-+    *.gam ) $dirpath/gargoyle-tadsr "$1" ;;
-+    *.t3  ) $dirpath/gargoyle-tadsr "$1" ;;
-+    *.z?  ) $dirpath/gargoyle-frotz "$1" ;;
- 
--    *.blb    ) $dirpath/git "$1" ;;
--    *.blorb  ) $dirpath/git "$1" ;;
--    *.glb    ) $dirpath/git "$1" ;;
--    *.gblorb ) $dirpath/git "$1" ;;
--    *.zlb    ) $dirpath/frotz "$1" ;;
--    *.zblorb ) $dirpath/frotz "$1" ;;
-+    *.blb    ) $dirpath/gargoyle-git "$1" ;;
-+    *.blorb  ) $dirpath/gargoyle-git "$1" ;;
-+    *.glb    ) $dirpath/gargoyle-git "$1" ;;
-+    *.gblorb ) $dirpath/gargoyle-git "$1" ;;
-+    *.zlb    ) $dirpath/gargoyle-frotz "$1" ;;
-+    *.zblorb ) $dirpath/gargoyle-frotz "$1" ;;
- 
-     * ) echo "gargoyle: Unknown file type: $1" ;;
-diff -rU 2 gargoyle-2006-07-03-source-pre/tads/Jamfile gargoyle-2006-07-03-source/tads/Jamfile
---- gargoyle-2006-07-03-source-pre/tads/Jamfile	2006-04-28 15:58:08.000000000 -0400
-+++ gargoyle-2006-07-03-source/tads/Jamfile	2006-08-18 17:57:53.000000000 -0400
-@@ -61,5 +61,5 @@
- SEARCH_SOURCE = $(SUBDIR) ;
- 
--Main tadsr :
-+Main gargoyle-tadsr :
- 	t23run.cpp
- 	osansi1.c osansi2.c osansi3.c
-@@ -74,8 +74,8 @@
- 	;
- 
--LinkLibraries tadsr : libtads2 libtads3 ;
-+LinkLibraries gargoyle-tadsr : libtads2 libtads3 ;
- 
--LINK on tadsr$(SUFEXE) = $(C++) ;
-+LINK on gargoyle-tadsr$(SUFEXE) = $(C++) ;
- 
--APPS += tadsr ;
-+APPS += gargoyle-tadsr ;
- 
-diff -rU 2 gargoyle-2006-07-03-source-pre/terps/Jamfile gargoyle-2006-07-03-source/terps/Jamfile
---- gargoyle-2006-07-03-source-pre/terps/Jamfile	2006-07-02 13:20:32.000000000 -0400
-+++ gargoyle-2006-07-03-source/terps/Jamfile	2006-08-18 16:51:59.000000000 -0400
-@@ -32,9 +32,9 @@
-     SubDirCcFlags -w ;
- 
--    Main advsys :
-+    Main gargoyle-advsys :
-         advmsg.c advtrm.c advprs.c advdbs.c advint.c advjunk.c advexe.c
-         glkstart.c ;
- 
--    APPS += advsys ;
-+    APPS += gargoyle-advsys ;
- }
- 
-@@ -58,5 +58,5 @@
-     SubDirCcFlags -DGLK_ANSI_ONLY ;
- 
--    Main agility :
-+    Main gargoyle-agility :
-         agtread.c gamedata.c util.c agxfile.c auxfile.c filename.c
-         parser.c exec.c runverb.c metacommand.c savegame.c debugcmd.c
-@@ -65,5 +65,5 @@
-         ;
- 
--    APPS += agility ;
-+    APPS += gargoyle-agility ;
- }
- 
-@@ -83,5 +83,5 @@
-     SubDirCcFlags -funsigned-char -Wno-parentheses -DGLK -DREVERSED ;
- 
--    Main alan2 :
-+    Main gargoyle-alan2 :
-         arun.c main.c debug.c args.c exe.c inter.c parse.c rules.c stack.c
-         decode.c term.c reverse.c readline.c params.c sysdep.c
-@@ -89,5 +89,5 @@
-         ;
- 
--    APPS += alan2 ;
-+    APPS += gargoyle-alan2 ;
- }
- 
-@@ -106,5 +106,5 @@
-     SubDirCcFlags -funsigned-char -DGLK ;
- 
--    Main alan3 :
-+    Main gargoyle-alan3 :
-         arun.c main.c debug.c args.c exe.c inter.c parse.c rules.c stack.c
-         decode.c term.c reverse.c readline.c params.c sysdep.c
-@@ -113,5 +113,5 @@
-         ;
- 
--    APPS += alan3 ;
-+    APPS += gargoyle-alan3 ;
- }
- 
-@@ -126,5 +126,5 @@
-     ObjDir frotz ;
- 
--    Main frotz :
-+    Main gargoyle-frotz :
-         buffer.c err.c fastmem.c files.c
-         input.c main.c math.c object.c process.c quetzal.c random.c
-@@ -133,5 +133,5 @@
-         ;
- 
--    APPS += frotz ;
-+    APPS += gargoyle-frotz ;
- }
- 
-@@ -150,5 +150,5 @@
-     SubDirCcFlags -DUSE_INLINE ;
- 
--    Main git :
-+    Main gargoyle-git :
-         git.c memory.c compiler.c opcodes.c operands.c
-         peephole.c terp.c glkop.c search.c git_unix.c
-@@ -156,5 +156,5 @@
-         ;
- 
--    APPS += git ;
-+    APPS += gargoyle-git ;
- }
- 
-@@ -171,10 +171,10 @@
-     if $(OS) != MINGW { SubDirCcFlags -DOS_UNIX ; }
- 
--    Main glulxe :
-+    Main gargoyle-glulxe :
-         main.c files.c vm.c exec.c funcs.c operand.c string.c glkop.c
-         serial.c search.c gestalt.c osdepend.c unixstrt.c
-         ;
- 
--    APPS += glulxe ;
-+    APPS += gargoyle-glulxe ;
- }
- 
-@@ -206,10 +206,10 @@
-         [ FDirName $(SUBDIR) heglk ] ;
- 
--    Main hugo :
-+    Main gargoyle-hugo :
-         he.c heexpr.c hemisc.c heobject.c heparse.c heres.c herun.c heset.c 
-         stringfn.c heglk.c heglkunix.c
-         ;
- 
--    APPS += hugo ;
-+    APPS += gargoyle-hugo ;
- }
- 
-@@ -237,7 +237,7 @@
-         [ FDirName $(SUBDIR) Glk ] ;
- 
--    Main level9 : level9.c glk.c ;
-+    Main gargoyle-level9 : level9.c glk.c ;
- 
--    APPS += level9 ;
-+    APPS += gargoyle-level9 ;
- }
- 
-@@ -268,7 +268,7 @@
-     # SubDirCcFlags -DNOBORDER ;
- 
--    Main magnetic : emu.c glk.c ;
-+    Main gargoyle-magnetic : emu.c glk.c ;
- 
--    APPS += magnetic ;
-+    APPS += gargoyle-magnetic ;
- }
- 
-@@ -315,8 +315,8 @@
-         sound.c graphics.c blorb.c 
-         ;
--    Main nitfol : main.c startunix.c ;
--    LinkLibraries nitfol : libnitfol ;
-+    Main gargoyle-nitfol : main.c startunix.c ;
-+    LinkLibraries gargoyle-nitfol : libnitfol ;
- 
--    APPS += nitfol ;
-+    APPS += gargoyle-nitfol ;
- }
- 
-@@ -336,5 +336,5 @@
-     }
- 
--    Main scare :
-+    Main gargoyle-scare :
-         sctafpar.c sctaffil.c scprops.c scvars.c scexpr.c scprintf.c
-         scinterf.c scparser.c sclibrar.c scrun.c scevents.c scnpcs.c
-@@ -343,5 +343,5 @@
-         ;
- 
--    APPS += scare ;
-+    APPS += gargoyle-scare ;
- }
- 
diff --git a/games-engines/gargoyle/gargoyle-20060703.ebuild b/games-engines/gargoyle/gargoyle-20060703.ebuild
deleted file mode 100644
index 867cbe316997..000000000000
--- a/games-engines/gargoyle/gargoyle-20060703.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-20060703.ebuild,v 1.2 2006/08/24 11:09:51 s4t4n Exp $
-
-inherit eutils
-
-MY_PV="2006-07-03"
-MY_P=${PN}-${MY_PV}
-S="${WORKDIR}/${MY_P}-source/"
-DESCRIPTION="Beautified Glk library and interactive fiction multi-interpreter"
-HOMEPAGE="http://ccxvii.net/gargoyle/"
-SRC_URI="http://ccxvii.net/gargoyle/download/${MY_P}-source.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RDEPEND=">=media-libs/freetype-2.1.9-r1
-	>=x11-libs/gtk+-2.8.8
-	>=dev-libs/glib-2.8.5
-	>=media-libs/jpeg-6b-r5
-	>=media-libs/libpng-1.2.8
-	>=sys-libs/zlib-1.2.3
-	>=media-libs/fmod-3.74"
-
-DEPEND="${RDEPEND}
-	>=dev-util/jam-2.5-r3
-	app-arch/unzip"
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/filename-friendliness.patch
-}
-
-src_compile()
-{
-	jam
-}
-
-src_install()
-{
-	dodoc Readme.txt garglk/TODO licenses/*
-	insinto /etc; newins garglk/garglk.ini garglk.ini
-
-	#Should to copy garglk/garglk.ini to /etc/, but I don't know the syntax
-
-	cd build/temp.linux.release
-	dolib garglk/libgarglk.so
-	dobin advsys/gargoyle-advsys agility/gargoyle-agility alan2/gargoyle-alan2
-	dobin alan3/gargoyle-alan3 garglk/gargoyle git/gargoyle-git
-	dobin hugo/gargoyle-hugo level9/gargoyle-level9 scare/gargoyle-scare
-	dobin tads/gargoyle-tadsr frotz/gargoyle-frotz magnetic/gargoyle-magnetic
-}