old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 5 insertions, 97 deletions

diff --git a/games-puzzle/tong/ChangeLog b/games-puzzle/tong/ChangeLog
index 9365b696039a..ca70b561c756 100644
--- a/games-puzzle/tong/ChangeLog
+++ b/games-puzzle/tong/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/tong
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tong/ChangeLog,v 1.11 2014/05/15 16:54:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tong/ChangeLog,v 1.12 2014/08/28 06:13:08 mr_bones_ Exp $
+
+  28 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/tong-1.0-fps.patch, -files/tong-1.0-makefile.patch, -tong-1.0.ebuild:
+  old
 
   15 May 2014; Ulrich Müller <ulm@gentoo.org> tong-1.2.ebuild:
   Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
diff --git a/games-puzzle/tong/files/tong-1.0-fps.patch b/games-puzzle/tong/files/tong-1.0-fps.patch
deleted file mode 100644
index d7f14dc8bc28..000000000000
--- a/games-puzzle/tong/files/tong-1.0-fps.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- tong.cpp.ori
-+++ tong.cpp
-@@ -54,6 +54,8 @@
- #define MENUMOUSE_THRESHOLD 40
- #define DEMO_TIME           8000
- 
-+#define MIN_TIME            45
-+
- bool drop_piece(Tetrad*, Tetrad*, Bucket*, Uint32&, bool&, bool&, Option*,
- 		int&);
- 
-@@ -1979,6 +1981,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
- 
-   if(Mix_PlayingMusic()) {
diff --git a/games-puzzle/tong/files/tong-1.0-makefile.patch b/games-puzzle/tong/files/tong-1.0-makefile.patch
deleted file mode 100644
index b131f1d38aeb..000000000000
--- a/games-puzzle/tong/files/tong-1.0-makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -1,11 +1,10 @@
- #hello world
- #my first attempt at making a makefile
- 
--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
--CC=g++ -O3 -Wall #-ggdb3 
- SOURCES = tetris.cpp pong.cpp text.cpp option.cpp media.cpp
- #these sources need to be linked to the SDL libs so may have special flag settings
- SDL_SOURCES = tong.cpp
-@@ -16,13 +15,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) $(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.0.ebuild b/games-puzzle/tong/tong-1.0.ebuild
deleted file mode 100644
index 3e609526a04e..000000000000
--- a/games-puzzle/tong/tong-1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tong/tong-1.0.ebuild,v 1.6 2009/04/06 21:57:42 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
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-makefile.patch" \
-		"${FILESDIR}/${P}-fps.patch"
-	sed -i \
-		-e "s:\"media/:\"${GAMES_DATADIR}/${PN}/media/:" \
-		media.cpp option.cpp option.h pong.cpp tetris.cpp text.cpp \
-		|| die "sed failed"
-	cp media/icon.png "${T}/${PN}.png"
-}
-
-src_install() {
-	dogamesbin tong || die "dogamesbin failed"
-	dodir "${GAMES_DATADIR}/${PN}"
-	cp -r media/ "${D}/${GAMES_DATADIR}/${PN}" || die "cp failed"
-	dodoc CHANGELOG README making-of.txt CREDITS
-
-	make_desktop_entry tong TONG
-	doicon "${T}/${PN}.png"
-	prepgamesdirs
-}