summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2008-09-01 19:14:01 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2008-09-01 19:14:01 +0000
commitc3d533ee381ede05178da658026a48ac604b2649 (patch)
tree6c5302c09eb8e54d180028ae4ac9513eeadac232 /games-strategy
parentold (diff)
downloadhistorical-c3d533ee381ede05178da658026a48ac604b2649.tar.gz
historical-c3d533ee381ede05178da658026a48ac604b2649.tar.bz2
historical-c3d533ee381ede05178da658026a48ac604b2649.zip
old
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/scorched3d/Manifest8
-rw-r--r--games-strategy/scorched3d/files/scorched3d-40-freealut.patch79
-rw-r--r--games-strategy/scorched3d/files/scorched3d-40-gcc4.patch215
-rw-r--r--games-strategy/scorched3d/files/scorched3d-40-unicode.patch39
-rw-r--r--games-strategy/scorched3d/files/scorched3d-40.1d-freealut.patch70
-rw-r--r--games-strategy/scorched3d/scorched3d-40.1d.ebuild57
-rw-r--r--games-strategy/scorched3d/scorched3d-40.ebuild60
7 files changed, 0 insertions, 528 deletions
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index c26482bf02ac..b63519409c04 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,13 +1,5 @@
-AUX scorched3d-40-freealut.patch 1642 RMD160 f1b34457eb557593c9d41227353cd0d44d7e1737 SHA1 ea6eabe5a8d79f31e67b8cf2827ecbadf67789a6 SHA256 65bb549d836d2cd724cb1ab2ce41b57696f2ac0ae3ba5b9457acab57e04c039f
-AUX scorched3d-40-gcc4.patch 8484 RMD160 bdd202713b9ac4d57e08a3b2bf7ff60093c110a3 SHA1 8801919284a8d75f0160d3db90e25db2635295e7 SHA256 f88e7299096cfc7a465923da247ca1f51629ce4eed3a69d5d1d0b1018e4cc1f6
-AUX scorched3d-40-unicode.patch 1759 RMD160 89b0ce779ad07ad8dcb4252be3029e8251e94c0e SHA1 3cb5b91921633217be19adb1720419737a27bd56 SHA256 c84ef2cd1f60bba076ab44f8ee4417476dfd0969da0136b2c6a98727c6efbb3a
-AUX scorched3d-40.1d-freealut.patch 1441 RMD160 4b12f99f9dff61504b95168f74f16eb433fd0654 SHA1 16a50065e27f201fc1fae84bb799ea78335400ee SHA256 b67b346e25212a14c5142402ae620bc0afbfbab4fb132b417a4945272752678a
AUX scorched3d-41.3-gcc43.patch 1822 RMD160 1ec0e6808f78e3431fd2c7634774943a55a7b4d0 SHA1 42a92eae55440f7da3c2c60278686515ab217fcd SHA256 7430531c43b80f9cd4331c245297e1428efd0623347a0050bb4d8ef61156f87d
-DIST Scorched3D-40-src.tar.gz 55427740 RMD160 2e900986a8a9262d3ffb85d1f6e6bfd4b4d9b9a6 SHA1 91a80b8a968532b505082d477c646b3a8e805ecd SHA256 8722d1f06e50f25f8e373f4388668a8b056e978dba8b86f197a45c3fa1f9008b
-DIST Scorched3D-40.1d-src.tar.gz 55701460 RMD160 0585295e1bc32b80329be7da2203b3dfc549f95f SHA1 14f0291534572273f74daa7e925c8e85a2971eb7 SHA256 76fc3eb70923551e978d3f35801d5731402c70c7c992063fafe403f0c6334252
DIST Scorched3D-41.3-src.tar.gz 60672892 RMD160 517689d2fd8c9d03a975e8fdc396c235de08c144 SHA1 c38fa05ca801b484c859012086dbbc03244ae71c SHA256 a606cc93674cb2acd55389e7c54b5389408c288369077d4270bd785e430b2b03
-EBUILD scorched3d-40.1d.ebuild 1351 RMD160 b85b2a7ca33abe89810f8871ca4daa98fdb6fa8e SHA1 d7adaa40d12f9620636221b7a34222daf0d6dc68 SHA256 4acede9f7946b3bae16e8b9622222eef450b4811afeedbb82239e486b704aed8
-EBUILD scorched3d-40.ebuild 1440 RMD160 e1720251b26a779193a7e28719584de02a30e9f3 SHA1 c57d3cf9290cfdb816399d3b9cef05501f806b10 SHA256 dd36f917ef54d9a1fc8f8ebc1154d31ef7299535da4ededf919103fde6acf423
EBUILD scorched3d-41.3-r1.ebuild 1734 RMD160 c18527033b9a452f7f225b697ed476df81d5d653 SHA1 5f1209045e8e02b660f6bd5116a2c0d7cc62dc99 SHA256 9c8a5a945a66af0b2a017cbcd9ca4b0dbd12cfb2ee60bc74fd005a079c10a541
MISC ChangeLog 7726 RMD160 63a35109d51f3021325e123e35d541b98f0d009c SHA1 6b5e7d615fb397414809d15214e10099852704ce SHA256 6fbcf4fa4b87e7bdc7064a29aaf5786f08e2e23741c32418eb8c300a37bb8d63
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/scorched3d/files/scorched3d-40-freealut.patch b/games-strategy/scorched3d/files/scorched3d-40-freealut.patch
deleted file mode 100644
index 8fe0706cac81..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-40-freealut.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- configure
-+++ configure
-@@ -3946,7 +3946,7 @@
- if test x"$use_static_openal" = x"yes"; then
- LIBS="$LIBS /usr/local/lib/libopenal.a"
- else
-- LIBS="$LIBS `$OPENAL_CONFIG --libs`"
-+ LIBS="$LIBS `$OPENAL_CONFIG --libs` -lalut"
- fi
-
- CFLAGS="$CFLAGS `$OPENAL_CONFIG --cflags`"
-
---- src/sound/SoundBufferStaticWav.cpp
-+++ src/sound/SoundBufferStaticWav.cpp
-@@ -57,44 +57,7 @@
- SoundBuffer(fileName),
- buffer_(0)
- {
-- unsigned int error;
--
-- // Create a buffer
-- alGetError();
-- alGenBuffers(1, &buffer_);
-- if ((error = alGetError()) != AL_NO_ERROR)
-- {
-- return;
-- }
--
-- // Load WAV
-- void *data;
-- ALenum format;
-- ALsizei size;
-- ALsizei freq;
-- ALboolean loop;
--
--#ifdef __DARWIN__
-- alutLoadWAVFile((ALbyte*) fileName,&format,&data,&size,&freq);
--#else
-- alutLoadWAVFile((ALbyte*) fileName,&format,&data,&size,&freq,&loop);
--#endif
--
-- if ((error = alGetError()) != AL_NO_ERROR)
-- {
-- return;
-- }
--
-- // Load WAV into buffer
-- alBufferData(buffer_,format,data,size,freq);
-- if ((error = alGetError()) != AL_NO_ERROR)
-- {
-- return;
-- }
--
-- // Delete WAV memory
-- alutUnloadWAV(format,data,size,freq);
-- if ((error = alGetError()) != AL_NO_ERROR)
-+ if ((buffer_ = alutCreateBufferFromFile(fileName)) == AL_NONE)
- {
- return;
- }
-
---- src/sound/Sound.cpp
-+++ src/sound/Sound.cpp
-@@ -28,6 +28,7 @@
- #include <sound/PlayingSoundSource.h>
- #include <AL/al.h>
- #include <AL/alc.h>
-+#include <AL/alut.h>
- #include <algorithm>
-
- Sound *Sound::instance_ = 0;
-@@ -150,6 +151,7 @@
- totalSources_.push_back(source);
- availableSources_.push_back(source);
- }
-+ alutInitWithoutContext(NULL, NULL);
-
- init_ = true;
- return init_;
diff --git a/games-strategy/scorched3d/files/scorched3d-40-gcc4.patch b/games-strategy/scorched3d/files/scorched3d-40-gcc4.patch
deleted file mode 100644
index a242ed5ee1ab..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-40-gcc4.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-diff -urN scorched.orig/src/client/ServerBrowser.cpp scorched/src/client/ServerBrowser.cpp
---- scorched3d-40/work/scorched/src/client/ServerBrowser.cpp 2006-07-05 19:16:14.000000000 +0200
-+++ scorched3d-40-long/work/scorched/src/client/ServerBrowser.cpp 2006-09-08 20:58:37.000000000 +0200
-@@ -79,7 +79,7 @@
-
- int ServerBrowser::threadFunc(void *var)
- {
-- bool lan = (bool) (int(var)==1);
-+ bool lan = (bool) (long(var)==1);
- bool result = false;
- if (lan) result = instance_->serverCollector_.fetchLANList();
- else result = instance_->serverCollector_.fetchServerList();
-diff -urN scorched.orig/src/coms/NetServer.cpp scorched/src/coms/NetServer.cpp
---- scorched3d-40/work/scorched/src/coms/NetServer.cpp 2006-02-13 18:54:26.000000000 +0100
-+++ scorched3d-40-long/work/scorched/src/coms/NetServer.cpp 2006-09-08 21:03:27.000000000 +0200
-@@ -235,7 +235,7 @@
- itor++)
- {
- TCPsocket sock = (*itor).first;
-- disconnectClient((unsigned int) sock);
-+ disconnectClient((unsigned long) sock);
- }
- SDL_UnlockMutex(setMutex_);
- }
-@@ -247,7 +247,7 @@
-
- NetMessage *message = NetMessagePool::instance()->
- getFromPool(NetMessage::DisconnectMessage,
-- (unsigned int) client,
-+ (unsigned long) client,
- getIpAddress(client));
-
- if (delayed)
-@@ -264,7 +264,7 @@
-
- void NetServer::sendMessage(NetBuffer &buffer)
- {
-- sendMessage(buffer, (unsigned int) firstDestination_);
-+ sendMessage(buffer, (unsigned long) firstDestination_);
- }
-
- void NetServer::sendMessage(NetBuffer &buffer, unsigned int dest)
-@@ -276,7 +276,7 @@
- // Get a new buffer from the pool
- NetMessage *message = NetMessagePool::instance()->
- getFromPool(NetMessage::NoMessage,
-- (unsigned int) destination,
-+ (unsigned long) destination,
- getIpAddress(destination));
-
- // Add message to new buffer
-@@ -305,7 +305,7 @@
- {
- NetMessagePool::instance()->addToPool(message);
- Logger::log(formatString("Unknown sendMessage destination %i",
-- (int) client));
-+ (long) client));
- }
- SDL_UnlockMutex(setMutex_);
- }
-diff -urN scorched.orig/src/coms/NetServerProtocol.cpp scorched/src/coms/NetServerProtocol.cpp
---- scorched3d-40/work/scorched/src/coms/NetServerProtocol.cpp 2006-02-13 18:54:26.000000000 +0100
-+++ scorched3d-40-long/work/scorched/src/coms/NetServerProtocol.cpp 2006-09-08 21:04:27.000000000 +0200
-@@ -125,7 +125,7 @@
- // allocate the buffer memory
- NetMessage *buffer = NetMessagePool::instance()->
- getFromPool(NetMessage::BufferMessage,
-- (unsigned int) socket,
-+ (unsigned long) socket,
- NetServer::getIpAddress(socket));
- buffer->getBuffer().allocate(len);
- buffer->getBuffer().setBufferUsed(len);
-@@ -161,7 +161,7 @@
- // Allocate a new buffer
- NetMessage *newMessage = NetMessagePool::instance()->
- getFromPool(NetMessage::BufferMessage,
-- (unsigned int) socket,
-+ (unsigned long) socket,
- NetServer::getIpAddress(socket));
- NetBuffer &newBuffer = newMessage->getBuffer();
- newBuffer.allocate(destLen);
-@@ -291,7 +291,7 @@
- // allocate the buffer memory
- NetMessage *netBuffer = NetMessagePool::instance()->
- getFromPool(NetMessage::BufferMessage,
-- (unsigned int) socket,
-+ (unsigned long) socket,
- NetServer::getIpAddress(socket));
- netBuffer->getBuffer().reset();
-
-@@ -354,7 +354,7 @@
- // allocate the buffer memory
- NetMessage *netBuffer = NetMessagePool::instance()->
- getFromPool(NetMessage::BufferMessage,
-- (unsigned int) socket,
-+ (unsigned long) socket,
- NetServer::getIpAddress(socket));
- netBuffer->getBuffer().reset();
-
-diff -urN scorched.orig/src/coms/NetServerRead.cpp scorched/src/coms/NetServerRead.cpp
---- scorched3d-40/work/scorched/src/coms/NetServerRead.cpp 2006-02-13 18:54:26.000000000 +0100
-+++ scorched3d-40-long/work/scorched/src/coms/NetServerRead.cpp 2006-09-08 21:05:53.000000000 +0200
-@@ -62,7 +62,7 @@
- // Send the player connected notification
- NetMessage *message = NetMessagePool::instance()->
- getFromPool(NetMessage::ConnectMessage,
-- (unsigned int) socket_,
-+ (unsigned long) socket_,
- NetServer::getIpAddress(socket_));
- messageHandler_->addMessage(message);
-
-@@ -94,7 +94,7 @@
- sentDisconnect_ = true;
- NetMessage *message = NetMessagePool::instance()->
- getFromPool(NetMessage::DisconnectMessage,
-- (unsigned int) socket_,
-+ (unsigned long) socket_,
- NetServer::getIpAddress(socket_));
- messageHandler_->addMessage(message);
- }
-@@ -189,7 +189,7 @@
- Logger::log(formatString(
- "Warning: %s net loop took %.2f seconds, client %i",
- (send?"Send":"Recv"),
-- timeDiff, (unsigned int) socket_));
-+ timeDiff, (unsigned long) socket_));
- }
- }
-
-@@ -199,7 +199,7 @@
- sentDisconnect_ = true;
- NetMessage *message = NetMessagePool::instance()->
- getFromPool(NetMessage::DisconnectMessage,
-- (unsigned int) socket_,
-+ (unsigned long) socket_,
- NetServer::getIpAddress(socket_));
- messageHandler_->addMessage(message);
- }
-diff -urN scorched.orig/src/dialogs/HelpButtonDialog.cpp scorched/src/dialogs/HelpButtonDialog.cpp
---- scorched3d-40/work/scorched/src/dialogs/HelpButtonDialog.cpp 2006-04-30 13:56:33.000000000 +0200
-+++ scorched3d-40-long/work/scorched/src/dialogs/HelpButtonDialog.cpp 2006-09-08 20:48:43.000000000 +0200
-@@ -127,7 +127,7 @@
- void HelpButtonDialog::VolumeMenu::menuSelection(const char* menuName,
- const int position, GLMenuItem &item)
- {
-- int data = (int) item.getUserData();
-+ long data = (long) item.getUserData();
- if (data != -1)
- {
- int volume = int(float(data) * 12.8f);
-diff -urN scorched.orig/src/engine/ScorchedCollisionHandler.cpp scorched/src/engine/ScorchedCollisionHandler.cpp
---- scorched3d-40/work/scorched/src/engine/ScorchedCollisionHandler.cpp 2006-04-07 01:08:28.000000000 +0200
-+++ scorched3d-40-long/work/scorched/src/engine/ScorchedCollisionHandler.cpp 2006-09-08 20:50:43.000000000 +0200
-@@ -90,8 +90,8 @@
- ScorchedCollisionInfo *info1, ScorchedCollisionInfo *info2,
- dContactGeom *contacts, int noContacts)
- {
-- unsigned int playerId1 = (unsigned int) info1->data;
-- unsigned int playerId2 = (unsigned int) info2->data;
-+ unsigned long playerId1 = (unsigned long) info1->data;
-+ unsigned long playerId2 = (unsigned long) info2->data;
- Target *target1 = context_->targetContainer->getTargetById(playerId1);
- Target *target2 = context_->targetContainer->getTargetById(playerId2);
- if (!target1 || !target2) return;
-@@ -136,7 +136,7 @@
- }
-
- ShotBounce *particle = (ShotBounce *) bounceInfo->data;
-- unsigned int id = (unsigned int) otherInfo->data;
-+ unsigned long id = (unsigned long) otherInfo->data;
-
- // only collide with the ground, walls or landscape,
- // or iteself
-@@ -257,7 +257,7 @@
- otherInfo = (ScorchedCollisionInfo *) dGeomGetData(o1);
- }
-
-- unsigned int id = (unsigned int) otherInfo->data;
-+ unsigned long id = (unsigned long) otherInfo->data;
- ShotProjectile *shot = (ShotProjectile *) particleInfo->data;
- shot->incLandedCounter();
- Vector particlePositionV(
-diff -urN scorched.orig/src/ode/obstack.cpp scorched/src/ode/obstack.cpp
---- scorched3d-40/work/scorched/src/ode/obstack.cpp 2004-09-14 15:18:26.000000000 +0200
-+++ scorched3d-40-long/work/scorched/src/ode/obstack.cpp 2006-09-08 20:55:39.000000000 +0200
-@@ -29,7 +29,7 @@
- // macros and constants
-
- #define ROUND_UP_OFFSET_TO_EFFICIENT_SIZE(arena,ofs) \
-- ofs = (size_t) (dEFFICIENT_SIZE( ((intP)(arena)) + ofs ) - ((intP)(arena)) );
-+ ofs = (size_t) (dEFFICIENT_SIZE( ((long)(arena)) + ofs ) - ((long)(arena)) );
-
- #define MAX_ALLOC_SIZE \
- ((size_t)(dOBSTACK_ARENA_SIZE - sizeof (Arena) - EFFICIENT_ALIGNMENT + 1))
-diff -urN scorched.orig/src/tankgraph/GLWTankTip.cpp scorched/src/tankgraph/GLWTankTip.cpp
---- scorched3d-40/work/scorched/src/tankgraph/GLWTankTip.cpp 2006-07-11 03:36:06.000000000 +0200
-+++ scorched3d-40-long/work/scorched/src/tankgraph/GLWTankTip.cpp 2006-09-08 20:44:53.000000000 +0200
-@@ -68,7 +68,7 @@
-
- void TankUndoMenu::itemSelected(GLWSelectorEntry *entry, int position)
- {
-- tank_->getPosition().revertSettings((unsigned int) entry->getUserData());
-+ tank_->getPosition().revertSettings((unsigned long) entry->getUserData());
- }
-
- TankFuelTip::TankFuelTip(Tank *tank) :
-@@ -236,7 +236,7 @@
- void TankBatteryTip::itemSelected(GLWSelectorEntry *entry, int position)
- {
- TankAIHuman *tankAI = (TankAIHuman *) tank_->getTankAI();
-- for (int i=1; i<=(int) entry->getUserData(); i++)
-+ for (int i=1; i<=(long) entry->getUserData(); i++)
- {
- if (tank_->getLife().getLife() <
- tank_->getLife().getMaxLife())
diff --git a/games-strategy/scorched3d/files/scorched3d-40-unicode.patch b/games-strategy/scorched3d/files/scorched3d-40-unicode.patch
deleted file mode 100644
index 0e71268fcfa5..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-40-unicode.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN scorched.orig/configure scorched/configure
---- scorched.orig/configure 2006-07-15 11:15:30.000000000 -0400
-+++ scorched/configure 2006-08-02 17:05:08.000000000 -0400
-@@ -5159,7 +5159,7 @@
- # Check for extra functions
-
-
--for ac_func in vsnprintf snprintf
-+for ac_func in vsnprintf snprintf vasprintf asprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
-diff -urN scorched.orig/src/scorched/NetLan.cpp scorched/src/scorched/NetLan.cpp
---- scorched.orig/src/scorched/NetLan.cpp 2006-07-05 13:16:14.000000000 -0400
-+++ scorched/src/scorched/NetLan.cpp 2006-08-02 17:05:08.000000000 -0400
-@@ -96,9 +96,9 @@
- // Radio Buttons
- wxFlexGridSizer *radioSizer = new wxFlexGridSizer(1, 8, 5, 5);
- IDC_RADIO_NET_CTRL = new wxRadioButton(parent, IDC_RADIO_NET,
-- "Internet", wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-+ wxT("Internet"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
- IDC_RADIO_LAN_CTRL = new wxRadioButton(parent, IDC_RADIO_LAN,
-- "LAN", wxDefaultPosition, wxDefaultSize, 0);
-+ wxT("LAN"), wxDefaultPosition, wxDefaultSize, 0);
- radioSizer->Add(IDC_RADIO_NET_CTRL, 0, wxRIGHT, 10);
- radioSizer->Add(IDC_RADIO_LAN_CTRL, 0, wxRIGHT, 0);
- sizer->Add(radioSizer, 0, wxALIGN_CENTER | wxALL, 5);
-diff -urN scorched.orig/src/scorched/OptionEntrySetter.cpp scorched/src/scorched/OptionEntrySetter.cpp
---- scorched.orig/src/scorched/OptionEntrySetter.cpp 2006-07-11 10:35:32.000000000 -0400
-+++ scorched/src/scorched/OptionEntrySetter.cpp 2006-08-02 17:05:08.000000000 -0400
-@@ -122,7 +122,7 @@
- {
- sizer->Add(control =
- new wxCheckBox(parent, -1,
-- "",
-+ wxT(""),
- wxDefaultPosition, wxDefaultSize),
- 0, wxALIGN_LEFT);
- control->SetToolTip(
diff --git a/games-strategy/scorched3d/files/scorched3d-40.1d-freealut.patch b/games-strategy/scorched3d/files/scorched3d-40.1d-freealut.patch
deleted file mode 100644
index 19be920baba8..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-40.1d-freealut.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- configure
-+++ configure
-@@ -4010,6 +4010,7 @@
-
- CFLAGS="$CFLAGS `$FREEALUT_CONFIG --cflags`"
- CXXFLAGS="$CXXFLAGS `$FREEALUT_CONFIG --cflags`"
-+ LIBS="$LIBS `$FREEALUT_CONFIG --libs`"
-
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-
---- src/sound/SoundBufferStaticWav.cpp
-+++ src/sound/SoundBufferStaticWav.cpp
-@@ -57,44 +57,7 @@
- SoundBuffer(fileName),
- buffer_(0)
- {
-- unsigned int error;
--
-- // Create a buffer
-- alGetError();
-- alGenBuffers(1, &buffer_);
-- if ((error = alGetError()) != AL_NO_ERROR)
-- {
-- return;
-- }
--
-- // Load WAV
-- void *data;
-- ALenum format;
-- ALsizei size;
-- ALsizei freq;
-- ALboolean loop;
--
--#ifdef __DARWIN__
-- alutLoadWAVFile((ALbyte*) fileName,&format,&data,&size,&freq);
--#else
-- alutLoadWAVFile((ALbyte*) fileName,&format,&data,&size,&freq,&loop);
--#endif
--
-- if ((error = alGetError()) != AL_NO_ERROR)
-- {
-- return;
-- }
--
-- // Load WAV into buffer
-- alBufferData(buffer_,format,data,size,freq);
-- if ((error = alGetError()) != AL_NO_ERROR)
-- {
-- return;
-- }
--
-- // Delete WAV memory
-- alutUnloadWAV(format,data,size,freq);
-- if ((error = alGetError()) != AL_NO_ERROR)
-+ if ((buffer_ = alutCreateBufferFromFile(fileName)) == AL_NONE)
- {
- return;
- }
-
---- src/sound/Sound.cpp
-+++ src/sound/Sound.cpp
-@@ -152,6 +152,7 @@
- totalSources_.push_back(source);
- availableSources_.push_back(source);
- }
-+ alutInitWithoutContext(NULL, NULL);
-
- init_ = true;
- return init_;
diff --git a/games-strategy/scorched3d/scorched3d-40.1d.ebuild b/games-strategy/scorched3d/scorched3d-40.1d.ebuild
deleted file mode 100644
index a758592700ba..000000000000
--- a/games-strategy/scorched3d/scorched3d-40.1d.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-40.1d.ebuild,v 1.6 2007/09/28 23:52:49 dirtyepic Exp $
-
-inherit eutils wxwidgets games
-
-DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
-HOMEPAGE="http://www.scorched3d.co.uk/"
-SRC_URI="mirror://sourceforge/${PN}/Scorched3D-${PV}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="mysql"
-
-DEPEND="virtual/opengl
- virtual/glu
- media-libs/libogg
- media-libs/libvorbis
- media-libs/openal
- media-libs/freealut
- media-libs/libsdl
- media-libs/sdl-net
- =x11-libs/wxGTK-2.6*
- >=media-libs/freetype-2
- mysql? ( virtual/mysql )"
-
-S=${WORKDIR}/scorched
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-freealut.patch
-}
-
-pkg_setup() {
- games_pkg_setup
- WX_GTK_VER="2.6" need-wxwidgets unicode
-}
-
-src_compile() {
- egamesconf \
- --disable-dependency-tracking \
- --datadir="${GAMES_DATADIR}/${PN}" \
- --with-docdir="/usr/share/doc/${PF}" \
- --with-wx-config="${WX_CONFIG}" \
- $(use_with mysql) \
- || die
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- newicon data/windows/tank.bmp ${PN}.bmp
- make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
- prepgamesdirs
-}
diff --git a/games-strategy/scorched3d/scorched3d-40.ebuild b/games-strategy/scorched3d/scorched3d-40.ebuild
deleted file mode 100644
index 514cb8024596..000000000000
--- a/games-strategy/scorched3d/scorched3d-40.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-40.ebuild,v 1.8 2007/09/28 23:52:49 dirtyepic Exp $
-
-inherit eutils wxwidgets games
-
-DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
-HOMEPAGE="http://www.scorched3d.co.uk/"
-SRC_URI="mirror://sourceforge/${PN}/Scorched3D-${PV}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="mysql"
-
-DEPEND="virtual/opengl
- virtual/glu
- media-libs/libogg
- media-libs/libvorbis
- media-libs/openal
- media-libs/freealut
- media-libs/libsdl
- media-libs/sdl-net
- =x11-libs/wxGTK-2.6*
- >=media-libs/freetype-2
- mysql? ( virtual/mysql )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/scorched
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-freealut.patch
- epatch "${FILESDIR}"/${P}-unicode.patch
- epatch "${FILESDIR}"/${P}-gcc4.patch
-}
-
-pkg_setup() {
- games_pkg_setup
- WX_GTK_VER="2.6" \
- need-wxwidgets gtk2 || die "You need to emerge wxGTK with USE='X'"
-}
-
-src_compile() {
- egamesconf \
- --disable-dependency-tracking \
- --exec_prefix="${GAMES_PREFIX}" \
- --datadir="${GAMES_DATADIR}/${PN}" \
- --with-docdir="/usr/share/doc/${PF}" \
- --with-wx-config="${WX_CONFIG}" \
- $(use_with mysql) \
- || die "egamesconf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- prepgamesdirs
-}