fixed ebuilds broken by carelessly "converting" them to EAPI6
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
Index: ghost/ghost.cpp
|
||||
===================================================================
|
||||
--- ghost/ghost.cpp (revision 573)
|
||||
+++ ghost/ghost.cpp (working copy)
|
||||
--- a/ghost/ghost.cpp
|
||||
+++ b/ghost/ghost.cpp
|
||||
@@ -233,15 +233,23 @@
|
||||
{
|
||||
srand( time( NULL ) );
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: ghost/ghost.cpp
|
||||
===================================================================
|
||||
--- ghost/ghost.cpp (revision 600)
|
||||
+++ ghost/ghost.cpp (working copy)
|
||||
--- a/ghost/ghost.cpp
|
||||
+++ b/ghost/ghost.cpp
|
||||
@@ -677,12 +677,20 @@
|
||||
if( m_AdminGamePort == m_HostPort )
|
||||
CONSOLE_Print( "[GHOST] warning - admingame_port and bot_hostport are set to the same value, you won't be able to host any games" );
|
||||
@@ -100,10 +98,8 @@ Index: ghost/ghost.cpp
|
||||
void CGHost :: EventBNETConnecting( CBNET *bnet )
|
||||
{
|
||||
if( m_AdminGame )
|
||||
Index: ghost/ghost.h
|
||||
===================================================================
|
||||
--- ghost/ghost.h (revision 600)
|
||||
+++ ghost/ghost.h (working copy)
|
||||
--- a/ghost/ghost.h
|
||||
+++ b/ghost/ghost.h
|
||||
@@ -134,6 +134,8 @@
|
||||
bool m_TCPNoDelay; // config value: use Nagle's algorithm or not
|
||||
uint32_t m_MatchMakingMethod; // config value: the matchmaking method
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: ghost/ghostdbsqlite.cpp
|
||||
===================================================================
|
||||
--- ghost/ghostdbsqlite.cpp (revision 580)
|
||||
+++ ghost/ghostdbsqlite.cpp (working copy)
|
||||
--- a/ghost/ghostdbsqlite.cpp
|
||||
+++ b/ghost/ghostdbsqlite.cpp
|
||||
@@ -23,8 +23,9 @@
|
||||
#include "config.h"
|
||||
#include "ghostdb.h"
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Index: ghost/ghost.cpp
|
||||
===================================================================
|
||||
--- ghost/ghost.cpp (revision 600)
|
||||
+++ ghost/ghost.cpp (working copy)
|
||||
--- a/ghost/ghost.cpp
|
||||
+++ b/ghost/ghost.cpp
|
||||
@@ -48,7 +48,7 @@
|
||||
#endif
|
||||
|
||||
@@ -29,10 +27,8 @@ Index: ghost/ghost.cpp
|
||||
{
|
||||
CONSOLE_Print( "[GHOST] extracting Scripts\\blizzard.j from MPQ file to [" + m_MapCFGPath + "blizzard.j]" );
|
||||
UTIL_FileWrite( m_MapCFGPath + "blizzard.j", (unsigned char *)SubFileData, BytesRead );
|
||||
Index: ghost/map.cpp
|
||||
===================================================================
|
||||
--- ghost/map.cpp (revision 600)
|
||||
+++ ghost/map.cpp (working copy)
|
||||
--- a/ghost/map.cpp
|
||||
+++ b/ghost/map.cpp
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "map.h"
|
||||
|
||||
@@ -78,10 +74,8 @@ Index: ghost/map.cpp
|
||||
{
|
||||
istringstream ISS( string( SubFileData, BytesRead ) );
|
||||
|
||||
Index: ghost/socket.h
|
||||
===================================================================
|
||||
--- ghost/socket.h (revision 600)
|
||||
+++ ghost/socket.h (working copy)
|
||||
--- a/ghost/socket.h
|
||||
+++ b/ghost/socket.h
|
||||
@@ -79,8 +79,6 @@
|
||||
#define SOCKET_ERROR -1
|
||||
|
||||
|
||||
@@ -38,12 +38,13 @@ src_prepare() {
|
||||
cp "${FILESDIR}/CMakeLists.txt" "${S}"
|
||||
cp -r "${FILESDIR}/cmake" "${S}"
|
||||
cp "${FILESDIR}/ghost++.cfg" "${S}"
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs="
|
||||
-DCONFIGPATH="${EROOT}etc/ghost++/"
|
||||
$(cmake-utils_use_with mysql MYSQL)"
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_find_package mysql MySQL)
|
||||
-DCONFIGPATH="${EROOT}etc/ghost++/")
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user