Renaming 20100930 ebuild version to 2010.1 for consistency (it's the same ebuild). See bug #398535.

(Portage version: 2.1.10.49/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 11 insertions, 294 deletions

diff --git a/games-engines/gargoyle/ChangeLog b/games-engines/gargoyle/ChangeLog
index d7546d0635e4..7ee59387b36f 100644
--- a/games-engines/gargoyle/ChangeLog
+++ b/games-engines/gargoyle/ChangeLog
@@ -1,6 +1,14 @@
 # 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.14 2012/04/13 19:17:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.15 2012/05/04 15:01:10 s4t4n Exp $
+
+*gargoyle-2010.1 (04 May 2012)
+
+  04 May 2012; Michele Noberasco <s4t4n@gentoo.org> gargoyle-2010.1.ebuild:
+  Renamed old 20100930 ebuild to 2010.1 for naming consistency. See bug #398535.
+
+  gargoyle-20100930.ebuild:
+  Removed ebuild with incorrect version number. See bug #398535.
 
   13 Apr 2012; Ulrich Müller <ulm@gentoo.org> gargoyle-20100930.ebuild:
   Move EAPI assignment to top of ebuild, bug 411875.
diff --git a/games-engines/gargoyle/files/filename-friendliness-20060917.patch b/games-engines/gargoyle/files/filename-friendliness-20060917.patch
deleted file mode 100644
index 0d77d5578bd1..000000000000
--- a/games-engines/gargoyle/files/filename-friendliness-20060917.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-diff -rU2 gargoyle-orig/garglk/launcher.sh gargoyle/garglk/launcher.sh
---- gargoyle-orig/garglk/launcher.sh	2007-01-09 12:55:49.000000000 -0800
-+++ gargoyle/garglk/launcher.sh	2007-01-09 12:57:07.000000000 -0800
-@@ -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 -rU2 gargoyle-orig/tads/Jamfile gargoyle/tads/Jamfile
---- gargoyle-orig/tads/Jamfile	2007-01-09 12:55:51.000000000 -0800
-+++ gargoyle/tads/Jamfile	2007-01-09 12:57:57.000000000 -0800
-@@ -62,5 +62,5 @@
- SEARCH_SOURCE = $(SUBDIR) ;
- 
--Main tadsr :
-+Main gargoyle-tadsr :
- 	t23run.cpp
- 	osansi1.c osansi2.c osansi3.c
-@@ -75,8 +75,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 -rU2 gargoyle-orig/terps/Jamfile gargoyle/terps/Jamfile
---- gargoyle-orig/terps/Jamfile	2007-01-09 12:55:56.000000000 -0800
-+++ gargoyle/terps/Jamfile	2007-01-09 13:00:02.000000000 -0800
-@@ -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/files/level9-compilation-fix-20060917.patch b/games-engines/gargoyle/files/level9-compilation-fix-20060917.patch
deleted file mode 100644
index 7ab367d87105..000000000000
--- a/games-engines/gargoyle/files/level9-compilation-fix-20060917.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Only in gargoyle/terps/level9: .level9.c.swp
-diff -rU2 gargoyle-orig/terps/level9/level9.c gargoyle/terps/level9/level9.c
---- gargoyle-orig/terps/level9/level9.c	2007-01-22 20:50:44.000000000 -0330
-+++ gargoyle/terps/level9/level9.c	2007-01-22 20:51:47.000000000 -0330
-@@ -116,5 +116,5 @@
- GameState CheatWorkspace;

- 

--int reflectflag,scale,gintcolour,option;

-+int reflectflag,scale,gintcolour,zoption;

- int l9textmode=0,drawx=0,drawy=0,screencalled=0,showtitle=1;

- L9BYTE *gfxa5=NULL;

-@@ -2810,9 +2810,9 @@
- #ifdef L9DEBUG

- 	printf("gfx - sdraw (%d,%d) (%d,%d) colours %d,%d",

--		x1,y1,drawx,drawy,gintcolour&3,option&3);

-+		x1,y1,drawx,drawy,gintcolour&3,zoption&3);

- #endif

- 

- 	os_drawline(scalex(x1),scaley(y1),scalex(drawx),scaley(drawy),

--		gintcolour&3,option&3);

-+		gintcolour&3,zoption&3);

- }

- 

-@@ -2884,9 +2884,9 @@
- #ifdef L9DEBUG

- 	printf("gfx - draw (%d,%d) (%d,%d) colours %d,%d",

--		x1,y1,drawx,drawy,gintcolour&3,option&3);

-+		x1,y1,drawx,drawy,gintcolour&3,zoption&3);

- #endif

- 

- 	os_drawline(scalex(x1),scaley(y1),scalex(drawx),scaley(drawy),

--		gintcolour&3,option&3);

-+		gintcolour&3,zoption&3);

- }

- 

-@@ -2955,8 +2955,8 @@
- 

- #ifdef L9DEBUG

--	printf("gfx - gintfill (%d,%d) colours %d,%d",drawx,drawy,d7&3,option&3);

-+	printf("gfx - gintfill (%d,%d) colours %d,%d",drawx,drawy,d7&3,zoption&3);

- #endif

- 

--	os_fill(scalex(drawx),scaley(drawy),d7&3,option&3);

-+	os_fill(scalex(drawx),scaley(drawy),d7&3,zoption&3);

- }

- 

-@@ -3022,5 +3022,5 @@
- 		d0 = (d0&3)|0x80;

- /* optend */

--	option = d0;

-+	zoption = d0;

- }

- 

-@@ -3115,5 +3115,5 @@
- /* gintinit */

- 		gintcolour = 3;

--		option = 0x80;

-+		zoption = 0x80;

- 		reflectflag = 0;

- 		drawx = 0x1400;

diff --git a/games-engines/gargoyle/gargoyle-20100930.ebuild b/games-engines/gargoyle/gargoyle-2010.1.ebuild
index 6a79c1a25be7..0d2dd16e3338 100644
--- a/games-engines/gargoyle/gargoyle-20100930.ebuild
+++ b/games-engines/gargoyle/gargoyle-2010.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-20100930.ebuild,v 1.5 2012/04/13 19:17:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2010.1.ebuild,v 1.1 2012/05/04 15:01:10 s4t4n Exp $
 
 EAPI=2
 
@@ -18,14 +18,11 @@ EAPI=2
 # Since we don't compile or install any of the bundled fonts, their licenses
 # don't apply. (Fonts are installed through dependencies instead.)
 
-MY_PV="2010.1"
-MY_P="${PN}-${MY_PV}"
-
 inherit eutils games
 
 DESCRIPTION="An interactive fiction (IF) player supporting all major formats"
 HOMEPAGE="http://ccxvii.net/gargoyle/"
-SRC_URI="http://garglk.googlecode.com/files/${MY_P}-sources.zip"
+SRC_URI="http://garglk.googlecode.com/files/${P}-sources.zip"
 
 LICENSE="BSD GPL-2 MIT Hugo Glulxe"
 SLOT="0"