old

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

6 files changed, 10 insertions, 144 deletions

diff --git a/games-roguelike/crossfire-client/ChangeLog b/games-roguelike/crossfire-client/ChangeLog
index 1c29651fa48d..2b24aba94d99 100644
--- a/games-roguelike/crossfire-client/ChangeLog
+++ b/games-roguelike/crossfire-client/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-roguelike/crossfire-client
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.36 2013/01/28 08:24:58 hasufell Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.37 2014/08/28 06:51:25 mr_bones_ Exp $
+
+  28 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -crossfire-client-1.12.0.ebuild,
+  -files/crossfire-client-1.12.0-curl-headers.patch,
+  -files/crossfire-client-1.12.0-libpng15.patch,
+  -files/crossfire-client-1.12.0-lua.patch,
+  -files/crossfire-client-1.12.0-underlink.patch:
+  old
 
 *crossfire-client-1.70.0-r1 (28 Jan 2013)
 
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild
deleted file mode 100644
index 79dc20777876..000000000000
--- a/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.12.0.ebuild,v 1.9 2012/05/02 21:06:17 jdhore Exp $
-
-EAPI=2
-inherit eutils autotools games
-
-DESCRIPTION="Client for the nethack-style but more in the line of UO"
-HOMEPAGE="http://crossfire.real-time.com/"
-SRC_URI="mirror://sourceforge/crossfire/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="alsa gtk oss sdl"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	gtk? ( x11-libs/gtk+:2
-		sdl? ( media-libs/libsdl[video]
-			media-libs/sdl-image ) )
-	net-misc/curl
-	media-libs/freeglut
-	media-libs/libpng
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-r '/^.TH/s:$: 6:' \
-		$(find . -name "*man") \
-		|| die "sed failed"
-	epatch \
-		"${FILESDIR}"/${P}-lua.patch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-curl-headers.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-	eautoreconf
-}
-
-src_configure() {
-	# bugs in configure script so we cant use $(use_enable ...)
-	local myconf="--disable-dependency-tracking"
-
-	if use gtk ; then
-		use sdl || myconf="${myconf} --disable-sdl"
-	else
-		myconf="${myconf} --disable-gtk"
-	fi
-	if ! use alsa ; then
-		myconf="${myconf} --disable-alsa9 --disable-alsa"
-	fi
-	if ! use alsa && ! use oss ; then
-		myconf="${myconf} --disable-sound"
-	fi
-	egamesconf ${myconf}
-}
-
-src_compile() {
-	# bug 139785
-	if use alsa || use oss ; then
-		emake -j1 -C sound-src || die "sound building failed"
-	fi
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
-	prepgamesdirs
-}
diff --git a/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-curl-headers.patch b/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-curl-headers.patch
deleted file mode 100644
index 26f884da6ab2..000000000000
--- a/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-curl-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/common/metaserver.c b/common/metaserver.c
-index f963da6..0c75b11 100644
---- a/common/metaserver.c
-+++ b/common/metaserver.c
-@@ -47,7 +47,6 @@ const char * const rcsid_common_metaserver_c =
- 
- #ifdef HAVE_CURL_CURL_H
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
- 
diff --git a/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-libpng15.patch b/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-libpng15.patch
deleted file mode 100644
index c5644e80bfe5..000000000000
--- a/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-libpng15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- gtk-v2/src/png.c
-+++ gtk-v2/src/png.c
-@@ -571,7 +571,7 @@
-         png_destroy_read_struct (&png_ptr, NULL, NULL);
-         return PNGX_OUTOFMEM;
-     }
--    if (setjmp (png_ptr->jmpbuf)) {
-+    if (setjmp (png_jmpbuf(png_ptr))) {
-         png_destroy_read_struct (&png_ptr, &info_ptr,NULL);
-         return PNGX_DATA;
-     }
---- x11/png.c
-+++ x11/png.c
-@@ -88,7 +88,7 @@
- 	png_destroy_read_struct (&png_ptr, NULL, NULL);
- 	return NULL;
-     }
--    if (setjmp (png_ptr->jmpbuf)) {
-+    if (setjmp (png_jmpbuf(png_ptr))) {
- 	png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
- 	return NULL;
-     }
-@@ -600,7 +600,7 @@
- 	png_destroy_read_struct (&png_ptr, NULL, NULL);
- 	return PNGX_OUTOFMEM;
-     }
--    if (setjmp (png_ptr->jmpbuf)) {
-+    if (setjmp (png_jmpbuf(png_ptr))) {
- 	png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
- 	return PNGX_DATA;
-     }
diff --git a/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-lua.patch b/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-lua.patch
deleted file mode 100644
index ebd6eb27150c..000000000000
--- a/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-lua.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru crossfire-client-1.12.0-old/common/script_lua.c crossfire-client-1.12.0/common/script_lua.c
---- crossfire-client-1.12.0-old/common/script_lua.c	2009-04-04 13:43:43.000000000 -0400
-+++ crossfire-client-1.12.0/common/script_lua.c	2009-12-13 00:45:32.020011661 -0500
-@@ -44,6 +44,13 @@
- #include <lua.h>
- #include <lualib.h>
- 
-+/* luaL_newstate() is declared in lauxlib.h in Lua >= 5.1 
-+ * and is needed to correct "implicit declaration" warnings. 
-+ */
-+#if LUA_VERSION_NUM >= 501
-+#include <lauxlib.h>
-+#endif
-+
- struct script_state
- {
-     lua_State* state;
diff --git a/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-underlink.patch b/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-underlink.patch
deleted file mode 100644
index 3d1428702352..000000000000
--- a/games-roguelike/crossfire-client/files/crossfire-client-1.12.0-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- x11/Makefile.am.old	2011-06-14 12:31:30.676664440 +0200
-+++ x11/Makefile.am	2011-06-14 12:31:57.661423436 +0200
-@@ -42,7 +42,7 @@
- 
- AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/pixmaps
- 
--crossfire_client_x11_LDADD = $(DMALLOC_LIB) $(X_LIBS) ../common/libcfclient.a @LUA_LIBS@
-+crossfire_client_x11_LDADD = $(DMALLOC_LIB) $(X_LIBS) ../common/libcfclient.a @LUA_LIBS@ -lpthread
- 
- ../common/libcfclient.a:
- 	( cd ../common ; make libcfclient.a )