From 4c8625e9e736ea88291afdd855b3c363feeeb4c6 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Mon, 23 Nov 2009 01:02:45 +0000 Subject: old Package-Manager: portage-2.1.6.13/cvs/Linux i686 --- games-puzzle/quadra/Manifest | 18 -- games-puzzle/quadra/files/libpng-1.2.5.patch | 11 - games-puzzle/quadra/files/quadra-1.1.8-amd64.patch | 38 --- .../quadra/files/quadra-1.1.8-asneeded.patch | 11 - games-puzzle/quadra/files/quadra-1.1.8-gcc3.patch | 102 -------- games-puzzle/quadra/files/quadra-1.1.8-gcc42.patch | 272 --------------------- games-puzzle/quadra/files/quadra-1.1.8-gcc43.patch | 114 --------- games-puzzle/quadra/quadra-1.1.8.ebuild | 67 ----- 8 files changed, 633 deletions(-) delete mode 100644 games-puzzle/quadra/files/libpng-1.2.5.patch delete mode 100644 games-puzzle/quadra/files/quadra-1.1.8-amd64.patch delete mode 100644 games-puzzle/quadra/files/quadra-1.1.8-asneeded.patch delete mode 100644 games-puzzle/quadra/files/quadra-1.1.8-gcc3.patch delete mode 100644 games-puzzle/quadra/files/quadra-1.1.8-gcc42.patch delete mode 100644 games-puzzle/quadra/files/quadra-1.1.8-gcc43.patch delete mode 100644 games-puzzle/quadra/quadra-1.1.8.ebuild (limited to 'games-puzzle/quadra') diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest index 84bd4fc1b755..f7ae4847719b 100644 --- a/games-puzzle/quadra/Manifest +++ b/games-puzzle/quadra/Manifest @@ -1,22 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX libpng-1.2.5.patch 319 RMD160 8f777f0452e7d6df56c0bd024711ee895ad842ae SHA1 3549909150df804ad74466149b0122baf0f4d716 SHA256 7b00007124b62a247e748f37b85b97d35fb50e31fd18742ea6c217e2dc4543c9 -AUX quadra-1.1.8-amd64.patch 1075 RMD160 3f88f9078fe2daed39b20c0bd51109759a2b17c5 SHA1 722d51a6ff42d4ddf3b3d2e1838bffcce20af21b SHA256 9c8fe51ab59a6234d3f9dd0c4ab0722327e142e99fd3f9a0007009579205893e -AUX quadra-1.1.8-asneeded.patch 579 RMD160 91c6f340686e8981576a823fb77f080a3475a76f SHA1 a7006149cd39a1e3a6da8a7df80733933581fc89 SHA256 62eb778b58482853ec303149cd53ee3540852ef04b4e9c4bc5b13189e0f60555 -AUX quadra-1.1.8-gcc3.patch 3221 RMD160 058b31005f511039a1cf7ffa4de2d4b79ba686c8 SHA1 a043a1cd04ae98e8880d060b69879568004549a4 SHA256 093d65e718a1cb346b1011bc5627784a16e0128424b8d7e2af697991e37f04ed -AUX quadra-1.1.8-gcc42.patch 7471 RMD160 3aa3fb25624dc564b7ffb4a6105e00e65f5625e6 SHA1 6e448257043fbb1ba82653344919c947a0a365cf SHA256 deb7a7950ef89ade43d3fa17b1f841c532fa77d4ffd896a439dbc3f0ec369b6d -AUX quadra-1.1.8-gcc43.patch 2305 RMD160 b53a7fd8285f59209e12793bd4c1cb93b7e9a68a SHA1 3f250a6bdc45c2f831f4ca7456fd3aa9ed921cb1 SHA256 fa50f82c598cf233d1ea3c49d1cc8f6943d81a335659ebbeff749b4dabd910a9 -DIST quadra-1.1.8.tar.gz 3379618 RMD160 e57f25a714d5f447f3dcb34c34af9fa22718560d SHA1 3c97ffbbf180b4d952f8aedd183b0fd4a4809957 SHA256 6ebf81d4ffe1cedbebfdcc2cb44fdac875da8ccbd3d113ca5cb62169bf63d201 DIST quadra-1.2.0.tar.gz 5103875 RMD160 b3e4bf1ae6e3be0fad5fae1247bc1ada892bdcf2 SHA1 fd503196b94ccafd8f7bfb789ef1e3c9a9a9ece8 SHA256 0312d826668ccb71d60a1d7229ca644c547a04d12d1b738dbeac7ee68e5fb643 -EBUILD quadra-1.1.8.ebuild 1780 RMD160 bbd5cc63792dc11553774379fe2a0fa920d07932 SHA1 af7ed78951a0ca82bcc16b2775513e466e82b3cf SHA256 a6b54ba5e5b5b5f61dcda2fd7e130df74e36297baf8195a3e2810f2597820c81 EBUILD quadra-1.2.0.ebuild 1022 RMD160 1784e3287cdc30c7253835d5a2e668fe6c6eba80 SHA1 9f1de44ec758d37e877cd4acc4a0408846fd8fd3 SHA256 8dafa58f93c59c7b57b96bea36983b616388b15be2274927a488b9dfc24b520d MISC ChangeLog 3039 RMD160 aac2e85f26253aa9858ea29958ee3d9e1378c338 SHA1 a1c87f5484522f51e96b4907c0b1df67c48931df SHA256 96e341da44f3b34ffa33eff57798cb112f31e9baf3e9c659c22963f5b9f6d7b1 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAksGkmEACgkQNQqtfCuFneN2IQCggtZL8HXpo1zxcZwRRecwY4px -3hoAnjQnbhI1DPmzvon5bOaRL2ORd+aH -=/3wo ------END PGP SIGNATURE----- diff --git a/games-puzzle/quadra/files/libpng-1.2.5.patch b/games-puzzle/quadra/files/libpng-1.2.5.patch deleted file mode 100644 index 62958eda7780..000000000000 --- a/games-puzzle/quadra/files/libpng-1.2.5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2002-11-27 18:23:31.000000000 -0500 -+++ configure 2002-11-27 18:23:53.000000000 -0500 -@@ -1735,7 +1735,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lpng $LIBS" -+LIBS="-lpng -lz -lm $LIBS" - cat > conftest.$ac_ext < - #include - #include --typedef size_t addr_size_t; -+typedef socklen_t addr_size_t; - inline int closesocket(int fd) { - return close(fd); - } ---- quadra-1.1.8/skelton/svgalib/video_x11_24.cpp 2001-10-11 19:35:14.000000000 -0100 -+++ quadra-1.1.8-fix/skelton/svgalib/video_x11_24.cpp 2004-11-01 20:03:16.513369160 -0100 -@@ -63,7 +63,12 @@ - }; - #pragma pack() - -+#ifdef _LP64 -+ unsigned int* buf32; -+#else - unsigned long* buf32; -+#endif -+ - Pixel3* buf24; - int x, y; - -@@ -82,7 +87,11 @@ - ((PixelValue*)(&colors[vfb[(y * width) +x]]))->pixel; - } else { - /* Conversion of the 8 bpp buffer to a 32 bpp buffer. */ -+#ifdef _LP64 -+ buf32 = (unsigned int*) image->data; -+#else - buf32 = (unsigned long*) image->data; -+#endif - for(y = 0; y < 480; y++) - for(x = min_x[y]; x <= max_x[y]; x++) - buf32[(y * width) + x] = diff --git a/games-puzzle/quadra/files/quadra-1.1.8-asneeded.patch b/games-puzzle/quadra/files/quadra-1.1.8-asneeded.patch deleted file mode 100644 index f0e7422d1ba3..000000000000 --- a/games-puzzle/quadra/files/quadra-1.1.8-asneeded.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- source/rules.mk.old 2007-12-26 13:03:26.000000000 +0100 -+++ source/rules.mk 2007-12-26 13:04:00.000000000 +0100 -@@ -19,7 +19,7 @@ - # $Id: quadra-1.1.8-asneeded.patch,v 1.1 2007/12/26 12:24:25 tupone Exp $ - - quadra: $(QUADRA_OBJECTS) skelton/lib/libugs_s.a -- $(LINK.cc) -Lskelton/lib $(X_CFLAGS) $(X_LIBS) -lX11 -lXext -lXpm -lpng -ldl -lz -o $@ $^ -+ $(LINK.cc) -Lskelton/lib $(X_CFLAGS) $(X_LIBS) -ldl -lz -o $@ $^ -lX11 -lXext -lXpm -lpng - - quadra.res: $(shell cat resources.txt) resources.txt skelton/tools/wadder/wadder - skelton/tools/wadder/wadder ./ $@ resources.txt diff --git a/games-puzzle/quadra/files/quadra-1.1.8-gcc3.patch b/games-puzzle/quadra/files/quadra-1.1.8-gcc3.patch deleted file mode 100644 index 8b03e05535ad..000000000000 --- a/games-puzzle/quadra/files/quadra-1.1.8-gcc3.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- quadra-1.1.8-orig/skelton/include/array.h 2006-05-21 16:35:30.000000000 -0400 -+++ quadra-1.1.8/skelton/include/array.h 2006-05-21 16:53:06.000000000 -0400 -@@ -21,6 +21,7 @@ - #ifndef _HEADER_ARRAY - #define _HEADER_ARRAY - #include -+#include - - #ifndef max - #define max(a,b) (((a) > (b)) ? (a) : (b)) -@@ -37,7 +38,9 @@ - v.push_back(t); - } - void add_before(const T& t, int i) { -- v.insert(&v[i], t); -+ typename std::vector::iterator iter = v.begin(); -+ std::advance(iter, i); -+ v.insert(iter, t); - } - bool remove_item(const T& t) { - for(int i=0; i::iterator iter = v.begin(); -+ std::advance(iter, i); -+ v.erase(iter); - } - int size() const { - return v.size(); -diff -urN quadra-1.1.8/skelton/tools/wadder/wadder.cpp quadra-1.1.8-kacsa/skelton/tools/wadder/wadder.cpp ---- quadra-1.1.8/skelton/tools/wadder/wadder.cpp Fri Oct 19 23:19:30 2001 -+++ quadra-1.1.8-kacsa/skelton/tools/wadder/wadder.cpp Fri May 17 17:21:19 2002 -@@ -109,12 +109,12 @@ - char *usage = "usage: wadder \n"; - Resfile *wad; - --char *basename(const char* f) { -+/*char *basename(const char* f) { - char* p=(char*)(f+strlen(f)); - while(*p != '/' && *p != '\\' && p>=f) - p--; - return p+1; --} -+}*/ - - void addfile(const char* fname) { - Res_dos *res; -diff -urN quadra-1.1.8/source/net_stuff.cpp quadra-1.1.8-kacsa/source/net_stuff.cpp ---- quadra-1.1.8/source/net_stuff.cpp Thu Oct 11 22:35:14 2001 -+++ quadra-1.1.8-kacsa/source/net_stuff.cpp Fri May 17 17:15:05 2002 -@@ -18,6 +18,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include - #include "error.h" - #include "packets.h" - #include "config.h" -diff -urN quadra-1.1.8/source/quadra.cpp quadra-1.1.8-kacsa/source/quadra.cpp ---- quadra-1.1.8/source/quadra.cpp Fri Oct 19 23:19:31 2001 -+++ quadra-1.1.8-kacsa/source/quadra.cpp Fri May 17 17:17:02 2002 -@@ -25,6 +25,7 @@ - #include - #endif - #include -+#include - #include "packet.h" - #include "types.h" - #include "net.h" -@@ -2387,7 +2387,7 @@ - try { - overmind.step(); - } -- catch(exception *e) { -+ catch(std::exception *e) { - msgbox("Exception caught from overmind.step(): %s\n", e->what()); - } - #ifdef PAINTDETECTOR2000 -@@ -2406,7 +2406,7 @@ - try { - ecran->draw_zone(); - } -- catch(exception *e) { -+ catch(std::exception *e) { - msgbox("Exception caught from ecran->draw_zone(): %s\n", e->what()); - } - ---- quadra-1.1.8/source/net_server.cpp.orig 2004-01-29 04:44:28.493992136 -0500 -+++ quadra-1.1.8-herpies/source/net_server.cpp 2004-01-29 04:44:47.181151256 -0500 -@@ -406,7 +406,8 @@ - if(game->server_max_players && game->net_list.size() >= game->server_max_players) - playeraccepted.accepted = 5; // game is full, can't join - if(game->server_max_teams && game->net_list.count_teams() >= game->server_max_teams) { -- for(unsigned i=0; inet_list.get(i); - if(c && c->color==p->team) - break; diff --git a/games-puzzle/quadra/files/quadra-1.1.8-gcc42.patch b/games-puzzle/quadra/files/quadra-1.1.8-gcc42.patch deleted file mode 100644 index eb64e2ec2443..000000000000 --- a/games-puzzle/quadra/files/quadra-1.1.8-gcc42.patch +++ /dev/null @@ -1,272 +0,0 @@ ---- skelton/common/bitmap.cpp -+++ skelton/common/bitmap.cpp -@@ -145,11 +145,11 @@ - - // Special cases: vertical and horizontal lines. - if(y1 == y2) { -- hline(y1, min(x1, x2), deltax, color); -+ hline(y1, MIN(x1, x2), deltax, color); - return; - } - if(x1 == x2) { -- vline(x1, min(y1, y2), deltay, color); -+ vline(x1, MIN(y1, y2), deltay, color); - return; - } - ---- skelton/common/clipable.cpp -+++ skelton/common/clipable.cpp -@@ -31,16 +31,16 @@ - int Clipable::clip_w; - - bool Clipable::clip(const int x, const int y, const int w, const int h) const { -- clip_x1=max(0, x); -+ clip_x1=MAX(0, x); - if(clip_x1>=width) - return true; -- clip_x2=min(width-1, x+w-1); -+ clip_x2=MIN(width-1, x+w-1); - if(clip_x2<0) - return true; -- clip_y1=max(0, y); -+ clip_y1=MAX(0, y); - if(clip_y1>=height) - return true; -- clip_y2=min(height-1, y+h-1); -+ clip_y2=MIN(height-1, y+h-1); - if(clip_y2<0) - return true; - clip_w = clip_x2-clip_x1+1; ---- skelton/common/cursor_self.cpp -+++ skelton/common/cursor_self.cpp -@@ -68,7 +68,7 @@ - } - - void Cursor_Self::set_speed(const Byte s) { -- speed = max(1, s); -+ speed = MAX(1, s); - pool_x = pool_y = 0; - } - ---- skelton/common/inter.cpp -+++ skelton/common/inter.cpp -@@ -420,7 +420,7 @@ - void Zone_panel::resize() { - if(pan) - delete pan; -- pan = Video_bitmap::New(x+2, y+2, max(w-4, 0), max(h-4, 0)); -+ pan = Video_bitmap::New(x+2, y+2, MAX(w-4, 0), MAX(h-4, 0)); - dirt(); - } - -@@ -537,10 +537,10 @@ - int total_x = inter->font->width(st); - sx = inter->font->width(st, curpos); - if(sx - panx > w-8) { -- panx = min(panx + (w>>2), total_x - (w-8)); -+ panx = MIN(panx + (w>>2), total_x - (w-8)); - } - if(sx - panx < 0) { -- panx = max(0, panx - (w>>2)); -+ panx = MAX(0, panx - (w>>2)); - } - inter->font->draw(st, pan, -panx, 0); - ---- skelton/common/net.cpp -+++ skelton/common/net.cpp -@@ -1156,7 +1156,7 @@ - delete packet; - packet=NULL; - skelton_msgbox(" bad packet\n "); -- Word size=min(nb->len(), 128); -+ Word size=MIN(nb->len(), 128); - nb->reset(); - int i; - for(i=0; i ressize) { -- ressize = ressize + max(nb, 16384); -+ ressize = ressize + MAX(nb, 16384); - _buf = (Byte *) realloc(_buf, ressize); - if(_buf == NULL) - (void) new Error("Unable to reallocate buffer (need %i bytes)\n", ressize); ---- skelton/common/sprite.cpp -+++ skelton/common/sprite.cpp -@@ -101,7 +101,7 @@ - tmp = new Bitmap(w, h, rw); - res.read((*tmp)[0], rw*h); - spr[i] = new Sprite(*tmp, 0, 0, 0); -- pre_width[i] = max(spr[i]->width - shrink, 3); -+ pre_width[i] = MAX(spr[i]->width - shrink, 3); - delete tmp; - } else { - spr[i] = NULL; ---- skelton/include/array.h -+++ skelton/include/array.h -@@ -23,11 +23,11 @@ - #include - #include - --#ifndef max --#define max(a,b) (((a) > (b)) ? (a) : (b)) -+#ifndef MAX -+#define MAX(a,b) (((a) > (b)) ? (a) : (b)) - #endif --#ifndef min --#define min(a,b) (((a) < (b)) ? (a) : (b)) -+#ifndef MIN -+#define MIN(a,b) (((a) < (b)) ? (a) : (b)) - #endif - - template ---- skelton/include/types.h -+++ skelton/include/types.h -@@ -21,11 +21,11 @@ - #ifndef _HEADER_TYPES - #define _HEADER_TYPES - --#ifndef max --#define max(a,b) (((a) > (b)) ? (a) : (b)) -+#ifndef MAX -+#define MAX(a,b) (((a) > (b)) ? (a) : (b)) - #endif --#ifndef min --#define min(a,b) (((a) < (b)) ? (a) : (b)) -+#ifndef MIN -+#define MIN(a,b) (((a) < (b)) ? (a) : (b)) - #endif - - #ifndef NULL ---- source/canvas.cpp -+++ source/canvas.cpp -@@ -387,7 +387,7 @@ - bflash[y][x]=32; - dirted[y][x]=2; - } -- tmp=min(255, tmp+time); -+ tmp=MIN(255, tmp+time); - blinded[y][x] = tmp; - } - } -@@ -434,7 +434,7 @@ - if(nb+bonus > 20) - nb = 20-bonus; - nc--; -- int normal = max(nb - nc, 0); -+ int normal = MAX(nb - nc, 0); - int fucked = nb - normal; - if(game->net_version()>=23) { - for(x=0; x= 24 (below) - // but it must remain as is for network compatibility - enough=i? true:false; -@@ -864,10 +864,10 @@ - h1 = (y1+h1+17)/18; - x1 = x1/18; - y1 = y1/18; -- x1 = max(0,x1); -- y1 = max(0,y1); -- w1 = min(10,w1); -- h1 = min(20,h1); -+ x1 = MAX(0,x1); -+ y1 = MAX(0,y1); -+ w1 = MIN(10,w1); -+ h1 = MIN(20,h1); - for(j=y1; jbloc->by; - p.player=canvas->num_player; - if(game->net_version()<23) { -- i = max(overmind.framecount - canvas->frame_start - 50, 0); -- p.score=max(0, 100 - i) >> 1; -+ i = MAX(overmind.framecount - canvas->frame_start - 50, 0); -+ p.score=MAX(0, 100 - i) >> 1; - } - else - p.score=0; -@@ -1621,7 +1621,7 @@ - } - - // adjust handicap_crowd considering crowdedness of the game (i.e. number of players alive) -- int max_handicap_crowd = max(0, int(game->net_list.count_alive())-4); -+ int max_handicap_crowd = MAX(0, int(game->net_list.count_alive())-4); - max_handicap_crowd *= Canvas::stamp_per_handicap; - if(canvas->handicap_crowd < max_handicap_crowd) - ++canvas->handicap_crowd; -@@ -2049,7 +2049,7 @@ - if(!strcmp(temp, "blind") || !strcmp(temp, "fullblind")) { - if(param) { - int p=atoi(param); -- p=min(max(1, p), 255); -+ p=MIN(MAX(1, p), 255); - ret.param=p; - } - } -@@ -2077,7 +2077,7 @@ - res="help_fr.txt"; break; - } - Res_doze cmdline(res); -- Dword size = min(sizeof(st)-1, cmdline.size()); -+ Dword size = MIN(sizeof(st)-1, cmdline.size()); - strncpy(st, (char *)cmdline.buf(), size); - st[size] = 0; - if(video) -@@ -2090,7 +2090,7 @@ - Res_dos script(fn); - if(script.exist) { - //-2 because Stringtable is strange -- Dword size = min(sizeof(st)-2, script.size()); -+ Dword size = MIN(sizeof(st)-2, script.size()); - strncpy(st, (char *)script.buf(), size); - st[size] = 0; - Stringtable str((Byte *)st, size); -@@ -2258,7 +2258,7 @@ - p.set_preset(PRESET_BLIND); - char *temp = command_get_param("blind ", "30"); - Dword time=atoi(temp); -- time=min(max(time, 0), 255); -+ time=MIN(MAX(time, 0), 255); - p.normal_attack.param=time; - p.clean_attack.param=time; - } -@@ -2266,7 +2266,7 @@ - p.set_preset(PRESET_FULLBLIND); - char *temp = command_get_param("fullblind ", "12"); - Dword time=atoi(temp); -- time=min(max(time, 0), 255); -+ time=MIN(MAX(time, 0), 255); - p.normal_attack.param=time; - p.clean_attack.param=time; - } -@@ -2293,7 +2293,7 @@ - if(command.token("level")) { - char *temp = command_get_param("level "); - p.level_start = atoi(temp); -- p.level_start = min(max(p.level_start, 1), 40); -+ p.level_start = MIN(MAX(p.level_start, 1), 40); - } - if(command.token("name")) { - char *temp = command_get_param("name "); -@@ -2315,7 +2315,7 @@ - if(p.game_end != END_NEVER) { - char *temp = command_get_param("endfrag/endtime/endpoints "); - p.game_end_value = atoi(temp); -- p.game_end_value = min(max(p.game_end_value, 1), p.game_end<=END_TIME? 9999:99999); -+ p.game_end_value = MIN(MAX(p.game_end_value, 1), p.game_end<=END_TIME? 9999:99999); - } - if(command.token("public")) - p.game_public = true; diff --git a/games-puzzle/quadra/files/quadra-1.1.8-gcc43.patch b/games-puzzle/quadra/files/quadra-1.1.8-gcc43.patch deleted file mode 100644 index 59c0c7425a56..000000000000 --- a/games-puzzle/quadra/files/quadra-1.1.8-gcc43.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- include/net_list.h -+++ include/net_list.h -@@ -29,6 +29,7 @@ - #include "net_stuff.h" - #include "stats.h" - #include "game.h" -+#include - - class Canvas; - ---- include/packets.h -+++ include/packets.h -@@ -27,6 +27,7 @@ - #include "game.h" - #include "config.h" - #include "track.h" -+#include - - enum Packet_type { - P_CHAT, ---- skelton/common/http_request.cpp -+++ skelton/common/http_request.cpp -@@ -18,7 +18,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include -+#include -+#include - #include "error.h" - #include "net.h" - #include "http_request.h" ---- skelton/common/res_compress.cpp -+++ skelton/common/res_compress.cpp -@@ -21,6 +21,7 @@ - #include "zlib.h" - #undef FAR - #include "res_compress.h" -+#include - - RCSID("$Id: quadra-1.1.8-gcc43.patch,v 1.1 2008/05/02 22:35:13 nyhm Exp $") - ---- skelton/common/reswriter.cpp -+++ skelton/common/reswriter.cpp -@@ -18,7 +18,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include -+#include -+#include - #include "res.h" - #include "resfile.h" - ---- skelton/include/net_buf.h -+++ skelton/include/net_buf.h -@@ -23,6 +23,7 @@ - - #include "types.h" - #include "net.h" -+#include - - class Net_buf { - public: ---- skelton/svgalib/main.cpp -+++ skelton/svgalib/main.cpp -@@ -27,8 +27,9 @@ - #ifndef NDEBUG - #include - #endif --#include --#include -+#include -+#include -+#include - - #include "debug.h" - #include "types.h" ---- skelton/svgalib/sound.cpp -+++ skelton/svgalib/sound.cpp -@@ -18,7 +18,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include -+#include -+#include - - #include - #include ---- skelton/svgalib/video_x11.cpp -+++ skelton/svgalib/video_x11.cpp -@@ -20,7 +20,8 @@ - - #ifdef UGS_LINUX_X11 - --#include -+#include -+#include - #include - #include - #define Font XFont ---- skelton/tools/wadder/wadder.cpp -+++ skelton/tools/wadder/wadder.cpp -@@ -100,7 +100,8 @@ - - */ - --#include -+#include -+#include - #include "stringtable.h" - #include "res.h" - diff --git a/games-puzzle/quadra/quadra-1.1.8.ebuild b/games-puzzle/quadra/quadra-1.1.8.ebuild deleted file mode 100644 index 10a0e8996252..000000000000 --- a/games-puzzle/quadra/quadra-1.1.8.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.19 2008/05/02 22:35:13 nyhm Exp $ - -inherit eutils games - -DESCRIPTION="A tetris clone with multiplayer support" -HOMEPAGE="http://quadra.sourceforge.net/" -SRC_URI="mirror://sourceforge/quadra/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="svga" - -RDEPEND="x11-libs/libXpm - media-libs/libpng - svga? ( media-libs/svgalib )" -DEPEND="${RDEPEND} - x11-proto/xextproto" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch \ - "${FILESDIR}"/${P}-gcc3.patch \ - "${FILESDIR}"/libpng-1.2.5.patch \ - "${FILESDIR}"/${P}-amd64.patch \ - "${FILESDIR}"/${P}-asneeded.patch \ - "${FILESDIR}"/${P}-gcc42.patch \ - "${FILESDIR}"/${P}-gcc43.patch - sed -i \ - -e 's:-pedantic::' config/vars.mk \ - || die "sed config/vars.mk failed" - sed -i \ - -e "/^libgamesdir:=/s:/games:/${PN}:" \ - -e "/^datagamesdir:=/s:/games:/${PN}:" config/config.mk.in \ - || die "sed config/config.mk.in failed" -} - -src_compile() { - # configure script is coded only to accept --without-svgalib - # --with-svgalib is bugged - # raised bug #1433828 @ quadra - Sourceforge - # http://sourceforge.net/tracker/index.php?func=detail&aid=1433828&group_id=7275&atid=107275 - if use svga; then - egamesconf || die - else - egamesconf --without-svgalib || die - fi - emake || die "emake failed" -} - -src_install() { - dogamesbin ${PN} || die "dogamesbin failed" - if use svga; then - dogameslib.so ${PN}-svga.so || die "dogameslib.so failed" - fi - insinto "${GAMES_DATADIR}"/${PN} - doins ${PN}.res || die "doins failed" - doicon images/${PN}.xpm - make_desktop_entry ${PN} Quadra - - dodoc ChangeLog NEWS README - dohtml help/* - prepgamesdirs -} -- cgit v1.2.3-65-gdbad