summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games-server/crossfire-server/ChangeLog11
-rw-r--r--games-server/crossfire-server/Manifest17
-rw-r--r--games-server/crossfire-server/crossfire-server-1.70.0.ebuild40
-rw-r--r--games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch10
-rw-r--r--games-server/crossfire-server/files/crossfire-server-1.11.0-libpng15.patch11
5 files changed, 58 insertions, 31 deletions
diff --git a/games-server/crossfire-server/ChangeLog b/games-server/crossfire-server/ChangeLog
index d3d1f2af4e23..70a610154dbd 100644
--- a/games-server/crossfire-server/ChangeLog
+++ b/games-server/crossfire-server/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for games-server/crossfire-server
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.26 2012/05/30 23:20:48 mr_bones_ Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.27 2013/01/10 05:37:03 mr_bones_ Exp $
+
+*crossfire-server-1.70.0 (10 Jan 2013)
+
+ 10 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+ +crossfire-server-1.70.0.ebuild, -files/crossfire-server-1.11.0-curl.patch,
+ -files/crossfire-server-1.11.0-libpng15.patch:
+ version bump (bug #410219)
30 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
-crossfire-server-1.11.0.ebuild:
diff --git a/games-server/crossfire-server/Manifest b/games-server/crossfire-server/Manifest
index 2321143d9470..754dea8e1563 100644
--- a/games-server/crossfire-server/Manifest
+++ b/games-server/crossfire-server/Manifest
@@ -1,8 +1,9 @@
-AUX crossfire-server-1.11.0-curl.patch 252 RMD160 184c50319bd04377a35d8020892b382ea955e559 SHA1 b0cc1ce7e8c0cbdfa232dd744525f316b4e0a9e2 SHA256 1ae1f299f30a29d98a11d3328c989e39ab2255f55cd2b17ce07af404277ca964
-AUX crossfire-server-1.11.0-libpng15.patch 386 RMD160 1e3beabb9fc24d21ecaf453fa74e622a4eabaca7 SHA1 a9544fc1a991e25adc44f8d0c7b1f916c2b2d6ee SHA256 7f5c391d0323e9abe9ae2d8ad7ffc381408af75d9ef59f6262f882aed7b8bfc0
-AUX crossfire-server-1.60.0-curl.patch 252 RMD160 184c50319bd04377a35d8020892b382ea955e559 SHA1 b0cc1ce7e8c0cbdfa232dd744525f316b4e0a9e2 SHA256 1ae1f299f30a29d98a11d3328c989e39ab2255f55cd2b17ce07af404277ca964
-DIST crossfire-1.60.0.maps.tar.gz 28826670 RMD160 5217bd81a1ed9238316cb3b86ca6b128a62f3fb0 SHA1 504202695d37f69c70a1b9b0174a750d341c9d3b SHA256 f21005c1f6e81ae02012cef047bb63fe08faa14bb54f5e72c512fd81b8a38528
-DIST crossfire-1.60.0.tar.gz 6323410 RMD160 7ad2b9b7e4099d74dae78147a7af28d421021b3e SHA1 3437639b4fb105848bd8d5b5de39d4fa0cbd2508 SHA256 db60901128d44715ca354c17ec8ba22756de398156836f02cfc60afa406ec563
-EBUILD crossfire-server-1.60.0.ebuild 1091 RMD160 0703627e8d943d17910f111c7a94da818eba7bc3 SHA1 045813fe86db81c2018b9326eb9b99176c34fed1 SHA256 9b4015c36dc33b113c9be318ccf6ab8dfc481cb3be924753df7dbfc9da105120
-MISC ChangeLog 3860 RMD160 761df4ad59960604e2abe619a114a22792208552 SHA1 7011e158960201f042abf4bb35957e0d6bb53727 SHA256 8aded4aef58e2b3b06556ed4b6df4b8f9787e9d3a27f5aa6bccd13f536c71b25
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+AUX crossfire-server-1.60.0-curl.patch 252 SHA256 1ae1f299f30a29d98a11d3328c989e39ab2255f55cd2b17ce07af404277ca964 SHA512 f7b2368247cedc4388a0d9fdfa3f555c8c5716177673363af2fc289c0cbcd6c23856bd2b81b80144ffea6bf30026c5dd08da82a57ad6a26298b7d55314aee7cb WHIRLPOOL 140e13dc089885870109657cbba9ca04aeef5815412af64e81cc85455f4ccbadd046d141e57c3add211702b7e919e424ba15bd1ee5986f82a48d3d7e86cd3c43
+DIST crossfire-1.60.0.maps.tar.gz 28826670 SHA256 f21005c1f6e81ae02012cef047bb63fe08faa14bb54f5e72c512fd81b8a38528 SHA512 5ba9bea0574841ff820df27693e5ab3dc5c10f06cc481537214e5dd319f9c68c9c93eca2c8970e1993bea47a8a805e40c953efc53ad9b92e351b728703cb2a42 WHIRLPOOL b800f006d1048ad3cde2f3d286fb4b1bc8d0c6ce2bb0f73d0517f16321193e3ea643831399bd04621b38ec53c7837ef0f105fbf07b435452cbb93d9a3ee4feca
+DIST crossfire-1.60.0.tar.gz 6323410 SHA256 db60901128d44715ca354c17ec8ba22756de398156836f02cfc60afa406ec563 SHA512 92ca8e47147969c7942c8754b59bf0f6063d673a640d4c631f1b076a7a4f00885b9b0a93762da20c514d7b8ab47aed84002c9e7886456bff7877879cd6dad7be WHIRLPOOL 4e3d2ba1132849f6d8d4b790b3fb49d89c406bb484bd0afd545ed375fe21f17e09bd026bb0dc9476bc34ef1ed9ee704e1f704f45d80b978175e2a176099c9cc8
+DIST crossfire-1.70.0.maps.tar.gz 28911538 SHA256 64b1bccef796fde9559a84b4486cf380710b9db70c2c45a1b0f67adf3d822aa9 SHA512 6c6349033950fc0bc60938d9784e420a4f594fdb6c3e0f281591445ae6c9e073caf1c5bb6627f0fe7f4b7a7a8afeafa1b41e948dbdfd9fe8fef1f41857afa06a WHIRLPOOL b5d1869b84f314dc054eadb22a5cfa83bb1721fcc1417b83e36586f2e3f65a90f2593eaecbb0e808d200aed563a5060961a1312d0afb0d9885b2a304263a8c48
+DIST crossfire-1.70.0.tar.gz 6626864 SHA256 f6679aa19f7b041a779d26215a7f0062ab7a1fd96185527c207485e084b4654d SHA512 c19f52aaf2292cacb47f186603d6a48769e84aea2973d5fa9028594001706a3e13452e540f2352e279c2f49a839282efb2624a0fd177b1729a2a6df0a5db4fc5 WHIRLPOOL 39652a4dc9c2d1096721c1462378a5b9481194ab1e0188a4bcbe9b8ebbd4981d5dea176cf243a8d23ed133df97dfaebf4831e5a5a5a446d75aa8ebf37daa47d8
+EBUILD crossfire-server-1.60.0.ebuild 1091 SHA256 9b4015c36dc33b113c9be318ccf6ab8dfc481cb3be924753df7dbfc9da105120 SHA512 9cb248b0b8c6e2a447714099e3fd6598d84f2e2da919cbd319a9e15498c8442cccfab542f2470c86a6d8ce8b9f409b08f26d2a0c89080f1e7e53bebe2a95256a WHIRLPOOL c9b927f50ae3be2e85886d7e46b991b43801786639e7340aa6d0a7f55a040154de6c888da9bad473f44dc5208de85504283d385fe907441dfbd80a07a7edd714
+EBUILD crossfire-server-1.70.0.ebuild 1044 SHA256 3e2e61ba2dfd45f78a8dcd0b30a8001f91fb0d951ad87c589ea74db6e8674c00 SHA512 4a4f242b4e937a64e0b7a8d74b2931790ef63301d6f28c7ba02dadb82911bf924fe3ef183d4108737b546e2e36e0947a509424726f47ced3e58c9f94defc4c98 WHIRLPOOL 5191f0e31ca8604480cdf1bbdf8dc3cfdc498a30b0f2cc18bc1f0061c63d39042a03cc2d0d24d1c9f0b776bc3e1b827d7dfc3394f9542b749e8f0ae71c7d8a7d
+MISC ChangeLog 4112 SHA256 e8197e4a1e04d5e1fa6881025407cd2d728ba83b60a953ecb26386fd4c83fccc SHA512 caecf61f526b249c23ffd5784eb8b09c53d07f396096dd051785085ddf386a1a6ce30f0e13ab1ebbabb219800a4415a83a1919d31e9349b17353845f981c1b59 WHIRLPOOL 8b512d4d0ade48133ee99cd97a01940590ee51ef87cde8b7fa9d0a4f47143ad6c8e0e0e5c1d4f36368a422b1fc16064016ed7533aff414a840b230f5ae7889c3
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-server/crossfire-server/crossfire-server-1.70.0.ebuild b/games-server/crossfire-server/crossfire-server-1.70.0.ebuild
new file mode 100644
index 000000000000..a36e6fa4179b
--- /dev/null
+++ b/games-server/crossfire-server/crossfire-server-1.70.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.70.0.ebuild,v 1.1 2013/01/10 05:37:03 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils games
+
+MY_P="${P/-server/}"
+DESCRIPTION="server for the crossfire clients"
+HOMEPAGE="http://crossfire.real-time.com/"
+SRC_URI="mirror://sourceforge/crossfire/${MY_P}.tar.gz
+ mirror://sourceforge/crossfire/crossfire-${PV}.maps.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+RESTRICT="test"
+
+DEPEND="net-misc/curl
+ X? (
+ x11-libs/libXaw
+ media-libs/libpng:0
+ )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ rm -f "${WORKDIR}"/maps/Info/combine.pl # bug #236205
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ keepdir "${GAMES_STATEDIR}"/crossfire/{datafiles,maps,players,template-maps,unique-items}
+ dodoc AUTHORS ChangeLog DEVELOPERS NEWS README TODO
+ insinto "${GAMES_DATADIR}/crossfire"
+ doins -r "${WORKDIR}/maps"
+ prepgamesdirs
+}
diff --git a/games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch b/games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch
deleted file mode 100644
index 86365d2ee85b..000000000000
--- a/games-server/crossfire-server/files/crossfire-server-1.11.0-curl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- socket/metaserver.c.old 2011-10-10 16:23:40.513409319 +0200
-+++ socket/metaserver.c 2011-10-10 16:23:46.617408594 +0200
-@@ -48,7 +48,6 @@
-
- #ifdef HAVE_CURL_CURL_H
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
-
diff --git a/games-server/crossfire-server/files/crossfire-server-1.11.0-libpng15.patch b/games-server/crossfire-server/files/crossfire-server-1.11.0-libpng15.patch
deleted file mode 100644
index 93841e518db5..000000000000
--- a/games-server/crossfire-server/files/crossfire-server-1.11.0-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- crossedit/png.c.old 2011-02-21 14:50:43.000000000 +0100
-+++ crossedit/png.c 2011-02-21 14:51:20.000000000 +0100
-@@ -269,7 +269,7 @@
- png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
- return PNGX_OUTOFMEM;
- }
-- if (setjmp (png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
- return PNGX_DATA;
- }