version bump (bug #452282)

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

8 files changed, 163 insertions, 13 deletions

diff --git a/games-puzzle/tong/ChangeLog b/games-puzzle/tong/ChangeLog
index 84446011c476..5150bd560998 100644
--- a/games-puzzle/tong/ChangeLog
+++ b/games-puzzle/tong/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-puzzle/tong
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tong/ChangeLog,v 1.7 2009/04/06 21:57:42 mr_bones_ Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tong/ChangeLog,v 1.8 2013/01/23 22:28:10 mr_bones_ Exp $
+
+*tong-1.2 (23 Jan 2013)
+
+  23 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/tong-1.2-datadir.patch, +files/tong-1.2-fps.patch,
+  +files/tong-1.2-makefile.patch, +tong-1.2.ebuild, files/tong-1.0-fps.patch,
+  files/tong-1.0-makefile.patch:
+  version bump (bug #452282)
 
   06 Apr 2009; Michael Sterrett <mr_bones_@gentoo.org>
   +files/tong-1.0-fps.patch, -files/1.0-makefile.patch,
@@ -27,4 +35,3 @@
   01 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> +metadata.xml,
   +tong-1.0.ebuild:
   initial commit - ebuild submitted by eGore via bug #76950
-
diff --git a/games-puzzle/tong/Manifest b/games-puzzle/tong/Manifest
index cf2e0a11435a..11f338ec01b3 100644
--- a/games-puzzle/tong/Manifest
+++ b/games-puzzle/tong/Manifest
@@ -1,6 +1,11 @@
-AUX tong-1.0-fps.patch 670 RMD160 92c52b58016b2ce07e77825ec49fba23453c1a2c SHA1 99b0dff37c98c635980fd9b0c0ce1a1163c66d6f SHA256 85b1aaade219761f347f39ec1d513db81bd2e966b25a5aef57ecd4dd6ef176f7
-AUX tong-1.0-makefile.patch 929 RMD160 d6cb28ab7041a6c9a7cd95848fa6d0491035d165 SHA1 202d99a6f011fb864684c60792052d259e61044e SHA256 fdbb3314e558aa3aa5009b6a9b60036e88618a30d0cc8116c00ad4cd515767aa
-DIST tong-1.0.tar.gz 33291881 RMD160 620361e15403951423f664f29584b416056c5d94 SHA1 a7b1a39f0bb2f81956e36c8240ce66724c97cb7f SHA256 430e3b36b01cadf73680578f132cc5e095939f7a75ca06812e61e466c2de2271
-EBUILD tong-1.0.ebuild 1103 RMD160 1f53a4991ccd3d91adbdbb1761747dacbc4e35cb SHA1 13c01bae149d1e2f8b3cd57da8e7f1f63c299750 SHA256 ca38ad6d6cda0c0412b39da6cae60dcb152d705840a1a20237e8c2c294be0d10
-MISC ChangeLog 1141 RMD160 1468a82f8ae2f0e81ea7f5f8b8bee869271eca70 SHA1 094458183bd9a6aff7b187e5725ae4c92a9dc09a SHA256 8d499488da1e4d12ca21e349a3c2c8bcb22d3b586eeb8a823bd2b930ef292dd7
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+AUX tong-1.0-fps.patch 598 SHA256 765193db940d141691846ea759464f11ee1ad333e7619411b8abf814e5c31636 SHA512 460618d9e083ea32d4be482e99409b1f91137c783251f598098182d020e7a4821804a662bb2e6390d69f62632e02a93211bfbee131966ac55805e1ca7c5204cd WHIRLPOOL 1e3f5571eb55fe6233e3eedd51d4ff540001add981adbc1d1ba33011ce51b8298e4e50e152782fcb36b022e85df58aa49c1efa2040f238cbf2ee906798d285cc
+AUX tong-1.0-makefile.patch 857 SHA256 664fa59590f02b778d6b500fdca3fdb222934b071e8c5050af3fba6aed6afa3d SHA512 db7f0d7425325258cf75bebefd4524a30a3aa2d75a780fe635d89e41428ae9f4bab0e253789b6c1180c988d7c43316263d5d93821968fcc01051324936fbfe40 WHIRLPOOL 8438c972df4696dc3632a97b0aeb7284b2c00158575caabad4edb3f2a81db5b093c63c52d433ef293b584902dd3b79a38ef894f6630ad0013c0c20c555fcc1fa
+AUX tong-1.2-datadir.patch 1105 SHA256 2948094ac5ad181594ae80e66c459fc5c860c66e7e9f54d3bb7fd1c8807851d6 SHA512 68b59062fb9c5c12eb2af7a1f4cdc47cff0ef1a656323b8fe28175931984c4336e5a763b5f6df32120311d4f84bc084341e455a29f19941d6a27b076e1213c6d WHIRLPOOL 2669a7ec474ac3aaeba2cf217244f96e9edb6271a1283646978fa507847ae2007311f59a04cee8421a692cfb9ac83ad4f0d932d6cf72ee3d080684fc07ddfcf5
+AUX tong-1.2-fps.patch 553 SHA256 a5ee4809b73f965275dd1dd8ae7ed96fc1e7bd9dfb19f86b8be1d0a271657eb0 SHA512 789be3f3742d12166e58717dec9890f9051a86ae6aca072046c6874397f6cbb0d604fc4127228ac258dceab2425777207777167e6ec3c28baa0b39324f931692 WHIRLPOOL cb94826525fdea39e40863d18a599fe88889b34cb35b364c57441d771663b8bc7c23681a5b14abbf0804e449d281ac031e9c74db94a80a15504dfbe07725e4cf
+AUX tong-1.2-makefile.patch 897 SHA256 5b358ac7c923e32cca6ed7b8541fd267b866827ff869dd61b3210b6c6b1234ea SHA512 c342f686a57def0f07dd51aa7c180108624463db5ef1defc4ac4636df74a9b754dccf5c39615f0cf2a30caf77fd20b07a8d89d337a8e19cf148ae47d44fb0731 WHIRLPOOL 7acab9df0da31ae5715fcaa783f437b98a27844e12f48a5c311550cfc0d6ee3726ae49ed5fa559712bf0db38af8bc88ca1789b296d928b6a30e8c08345351d1c
+DIST tong-1.0.tar.gz 33291881 SHA256 430e3b36b01cadf73680578f132cc5e095939f7a75ca06812e61e466c2de2271
+DIST tong-1.2.tar.gz 88028070 SHA256 7514bf0c1c1a9a8d6985d0fbe83486b83f665d9a202beed2ae91e3f45e90942b SHA512 0544f489141bba37985f1ef3c316208e3e6dacdea8f8b79f37997a9489ff5c1710fd1426e02489f8adb33bf9a1511bb9a0250122fa2054ef4a6ef203c8881261 WHIRLPOOL 107d3009c2e70e78ef81781b388e329f3c45aac8e09470e5c362b3d8b152ad7b6a2d119490a2e2bc29899bb4a8ab36f9d9e86245c46257c260c6b2f65769ab16
+EBUILD tong-1.0.ebuild 1103 SHA256 ca38ad6d6cda0c0412b39da6cae60dcb152d705840a1a20237e8c2c294be0d10 SHA512 012d9215675ce88051b0bacca1c1a7cdda9c7257218404174514f2cf41a5b4d7880072e91d38b4567a9202ee46cbb9be3375373d4819603f61139592acbde7fd WHIRLPOOL 41ec5bb112da489d0bdd98d1119ec833b22f0025d547b301d602595c61d4d32526c31e83929718aefe5d8b4da61ebb3ed3d3e49699e12b3035ec45eb4335bbda
+EBUILD tong-1.2.ebuild 1146 SHA256 07f5df02a06a05505222d960accdd9f8b729764c62b19dac524cbb11867ff40c SHA512 ca206ace661a147d1fd430498d39eaae2542bb883c46973c4e7d55717f7eb878abaa62fa34bcacff5e98df35d87af1639c083edb84fe999a7f814f8d4eaafb59 WHIRLPOOL 0f6aa029ae1e581cd93d4690a860d0648a55e03705a493258f0b3bcddcd0d31c81085cfef755b2ad51058ff3b6e10a731b9ce9993ac7ca13afeb7a9d6f55059d
+MISC ChangeLog 1421 SHA256 a8dd7dc2ac64f521e96f8a8cf0d9c7b565c59f336f9f2ed5ac6d9da0bbd6124e SHA512 ade467a5cde8e0170cef9d24615f395c8018861dfd0e8c66c6fd0305ae2b5aea771c70e214463203330b529221e71ca4af646b051d629559dcfe89faad9eba4a WHIRLPOOL 95a744d7b9f6502e849f2ca6336aa49e0e96eaba8463ddbcaceb76986fd488188365b78a39513a1650f770c3aa7e28e1efa9cb122659a02aa617f8a01db2116a
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-puzzle/tong/files/tong-1.0-fps.patch b/games-puzzle/tong/files/tong-1.0-fps.patch
index 59c1244d3537..d7f14dc8bc28 100644
--- a/games-puzzle/tong/files/tong-1.0-fps.patch
+++ b/games-puzzle/tong/files/tong-1.0-fps.patch
@@ -1,5 +1,5 @@
---- tong.cpp.ori	2007-10-15 19:27:54.000000000 +0200
-+++ tong.cpp	2007-10-15 19:36:51.000000000 +0200
+--- tong.cpp.ori
++++ tong.cpp
 @@ -54,6 +54,8 @@
  #define MENUMOUSE_THRESHOLD 40
  #define DEMO_TIME           8000
diff --git a/games-puzzle/tong/files/tong-1.0-makefile.patch b/games-puzzle/tong/files/tong-1.0-makefile.patch
index 4c7fc65fc103..b131f1d38aeb 100644
--- a/games-puzzle/tong/files/tong-1.0-makefile.patch
+++ b/games-puzzle/tong/files/tong-1.0-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2005-02-01 11:49:23.000000000 -0500
-+++ Makefile	2005-02-01 11:51:07.000000000 -0500
+--- Makefile.orig
++++ Makefile
 @@ -1,11 +1,10 @@
  #hello world
  #my first attempt at making a makefile
diff --git a/games-puzzle/tong/files/tong-1.2-datadir.patch b/games-puzzle/tong/files/tong-1.2-datadir.patch
new file mode 100644
index 000000000000..d0279ac3b874
--- /dev/null
+++ b/games-puzzle/tong/files/tong-1.2-datadir.patch
@@ -0,0 +1,41 @@
+--- tong.cpp.orig
++++ tong.cpp
+@@ -202,7 +202,6 @@
+ 	Tetrad *tetrad, *nexttetrad;
+ 	Paddle *paddle;
+ 	Ball *ball;
+-	char datadir[256];
+ 	input_t input;
+ 	int volume = MIX_MAX_VOLUME;
+ 
+@@ -210,7 +209,6 @@
+ 	volume = 24;
+ #endif
+ 	memset(&input, 0, sizeof(input_t));
+-	strcpy(datadir, GAME_DATA_DIR);
+ 	if(argc>1) {
+ 		if(!strcmp(argv[1], "-v") || !strcmp(argv[1], "--version")) {
+ 			printf("%s\n", GAME_ID);
+@@ -219,10 +217,6 @@
+ 				   "warranty; not even for MERCHANTABILITY or"
+ 				   " FITNESS FOR A PARTICULAR PURPOSE.\n");
+ 			return 0;
+-		} else if(!strncmp(argv[1], "-p=", 3)) {
+-			strcpy(datadir, argv[1]+(3*sizeof(char)));
+-		} else if(!strncmp(argv[1], "--path=", 7)) {
+-			strcpy(datadir, argv[1]+(7*sizeof(char)));
+ 		} else {
+ 			printf("Usage: %s [OPTION]\n", argv[0]);
+ 			printf("Play TONG, a Free Software game (Tetris meets Pong)\n");
+@@ -237,11 +231,6 @@
+ #ifdef WII
+ 	fatInitDefault();
+ #endif
+-	if (chdir(datadir)) {
+-		printf("Could not chdir to %s (attempting to use current dir)\n",
+-			   datadir);
+-	}
+-
+ 	if(SDL_Init(SDL_INIT_AUDIO
+ 				|SDL_INIT_VIDEO
+ 				|SDL_INIT_TIMER
diff --git a/games-puzzle/tong/files/tong-1.2-fps.patch b/games-puzzle/tong/files/tong-1.2-fps.patch
new file mode 100644
index 000000000000..8ce66ebf1d31
--- /dev/null
+++ b/games-puzzle/tong/files/tong-1.2-fps.patch
@@ -0,0 +1,25 @@
+--- tong.cpp.orig
++++ tong.cpp
+@@ -64,6 +64,8 @@
+ 
+ #define DEMO_TIME           8000
+ 
++#define MIN_TIME            45
++
+ #define GP2X_BUTTON_UP         0
+ #define GP2X_BUTTON_UPLEFT     1
+ #define GP2X_BUTTON_LEFT       2
+@@ -1854,6 +1856,13 @@
+ 		SDL_Flip(screen);
+ 		lastlastupdate=lastupdate;
+ 		lastupdate=SDL_GetTicks();
++
++		// limit to 1000/MIN_TIME fps
++		if (lastupdate-lastlastupdate < MIN_TIME) {
++			SDL_Delay(MIN_TIME - (lastupdate - lastlastupdate));
++		}
++		lastupdate = SDL_GetTicks();
++
+ 	}  //main game loop
+ 
+ 	Mix_FreeMusic(music);
diff --git a/games-puzzle/tong/files/tong-1.2-makefile.patch b/games-puzzle/tong/files/tong-1.2-makefile.patch
new file mode 100644
index 000000000000..68b4547d9427
--- /dev/null
+++ b/games-puzzle/tong/files/tong-1.2-makefile.patch
@@ -0,0 +1,28 @@
+--- Makefile.orig
++++ Makefile
+@@ -1,11 +1,10 @@
+ # TONG! makefile, tweak as you see fit
+ 
+-SDL_CFLAGS := $(shell sdl-config --cflags)
++CXXFLAGS += $(shell sdl-config --cflags)
+ SDL_LDFLAGS := $(shell sdl-config --libs)
+ MIXER_FLAGS := -lSDL_mixer -lpthread
+ IMG_FLAGS := -lSDL_image
+ GAME_DATA_DIR := .
+-CC = g++ -O3 -Wall #-ggdb3 
+ SOURCES = tetris.cpp pong.cpp text.cpp option.cpp media.cpp
+ # these sources need to be linked to SDL libs, so may have special flag settings
+ SDL_SOURCES = tong.cpp
+@@ -29,11 +28,7 @@
+ 
+ # builds all, builds the target
+ all:	$(OBJS)
+-	$(CC) $(SDL_LDFLAGS) $(MIXER_FLAGS) $(IMG_FLAGS) $(OBJS) -o $(TARGET)
+-%.o: %.cpp
+-	$(CC) $(SDL_CFLAGS) -c -o $@ $<
+-tong.o: $(SDL_SOURCES)
+-	$(CC) -DGAME_DATA_DIR=\"$(GAME_DATA_DIR)\" $(SDL_CFLAGS) -c -o $@ $<
++	$(CXX) $(LDFLAGS) $(OBJS) $(SDL_LDFLAGS) $(MIXER_FLAGS) $(IMG_FLAGS) -o $(TARGET)
+ 
+ # clean out the mess
+ clean:
diff --git a/games-puzzle/tong/tong-1.2.ebuild b/games-puzzle/tong/tong-1.2.ebuild
new file mode 100644
index 000000000000..18c977729d3e
--- /dev/null
+++ b/games-puzzle/tong/tong-1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tong/tong-1.2.ebuild,v 1.1 2013/01/23 22:28:10 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils games
+
+DESCRIPTION="Tetris and Pong in the same place at the same time"
+HOMEPAGE="http://www.nongnu.org/tong/"
+SRC_URI="http://www.nongnu.org/tong/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[audio,joystick,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-makefile.patch" \
+		"${FILESDIR}/${P}-fps.patch" \
+		"${FILESDIR}/${P}-datadir.patch"
+	sed -i \
+		-e "s:\"media/:\"${GAMES_DATADIR}/${PN}/media/:" \
+		media.cpp option.cpp option.h pong.cpp tetris.cpp text.cpp \
+		|| die
+	cp media/icon.png "${T}/${PN}.png" || die
+}
+
+src_install() {
+	dogamesbin tong || die
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -r media/ "${D}/${GAMES_DATADIR}/${PN}" || die
+	dodoc CHANGELOG README making-of.txt CREDITS
+
+	make_desktop_entry tong TONG
+	doicon "${T}/${PN}.png"
+	prepgamesdirs
+}