unbundle libRocket, revbump for safety

(Portage version: 2.2.0_alpha153/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

3 files changed, 238 insertions, 17 deletions

diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index 77658703bbf1..6b975ac3acf2 100644
--- a/games-fps/warsow/ChangeLog
+++ b/games-fps/warsow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/warsow
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.47 2012/12/27 02:24:48 hasufell Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.48 2013/01/18 19:08:09 hasufell Exp $
+
+*warsow-1.02-r1 (18 Jan 2013)
+
+  18 Jan 2013; Julian Ospald <hasufell@gentoo.org> +warsow-1.02-r1.ebuild,
+  files/warsow-1.02-build.patch:
+  unbundle libRocket, revbump for safety
 
   27 Dec 2012; Julian Ospald <hasufell@gentoo.org> warsow-1.02.ebuild,
   files/warsow-1.02-build.patch:
diff --git a/games-fps/warsow/files/warsow-1.02-build.patch b/games-fps/warsow/files/warsow-1.02-build.patch
index ed73860fd4e9..b08376a8cc44 100644
--- a/games-fps/warsow/files/warsow-1.02-build.patch
+++ b/games-fps/warsow/files/warsow-1.02-build.patch
@@ -13,10 +13,13 @@ g) address parallel make issues
 
 --- source/Makefile
 +++ source/Makefile
-@@ -30,6 +30,13 @@
+@@ -30,6 +30,16 @@
  # Build Warsow client without server capabilities?
  BUILD_THIN_CLIENT?=NO
  
++# use system libRocket
++SYSTEM_LIBS=NO
++
 +# enable verbosity
 +V=NO
 +
@@ -27,7 +30,7 @@ g) address parallel make issues
  ###########################################################
  
  ifeq ($(USE_MINGW),YES)
-@@ -50,10 +57,10 @@
+@@ -50,10 +60,10 @@
  else
  CC?=gcc
  CXX?=g++
@@ -42,7 +45,7 @@ g) address parallel make issues
  
  # this nice line comes from the linux kernel makefile
  BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
-@@ -62,7 +69,7 @@
+@@ -62,7 +72,7 @@
  ifeq ($(OS),FreeBSD)
  ARCH?=freebsd_$(BASE_ARCH)
  else
@@ -51,7 +54,7 @@ g) address parallel make issues
  endif
  
  SHARED_LIBRARY_EXTENSION=so
-@@ -72,7 +79,7 @@
+@@ -72,7 +82,7 @@
  
  ifeq ($(DEBUG_BUILD), YES)
  BINDIR=debug
@@ -60,7 +63,32 @@ g) address parallel make issues
  else
  BINDIR=release
  endif
-@@ -195,9 +202,9 @@
+@@ -118,15 +128,22 @@
+ LIBROCKET_INC=$(LIBROCKET_DIR)/Include
+ LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a
+ 
+-CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC)
++CFLAGS_ROCKET=-I$(ANGELSCRIPT_INC)
+ # add the base of ui to inclusions
+ CFLAGS_ROCKET+=-Iui
+ 
+ # static link to custombuilt lib
+-LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
++LDFLAGS_ROCKET= 
+ # dynamic link to 'official' build
+ # LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/Build -lRocketCore -lRocketControls -lfreetype
+ 
++ifneq ($(SYSTEM_LIBS),YES)
++CFLAGS_ROCKET += -DSTATIC_LIB -I$(LIBROCKET_INC)
++LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
++else
++LDFLAGS_ROCKET = -lRocketCore -lRocketControls
++endif
++
+ ###########################################################
+ 
+ ####################### MINGW ######################
+@@ -195,9 +212,9 @@
  LOCALBASE?=/usr/local
  X11BASE?=/usr/X11R6
  
@@ -73,7 +101,7 @@ g) address parallel make issues
  ifeq ($(DEBUG_BUILD),YES)
  CFLAGS_COMMON+=$(CFLAGS_DEBUG)
  else
-@@ -209,18 +216,18 @@
+@@ -209,18 +226,18 @@
  CFLAGS_MODULE=-DPIC -fPIC
  CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
  
@@ -97,7 +125,7 @@ g) address parallel make issues
  endif
  
  ifeq ($(ARCH),x86_64)
-@@ -298,12 +305,19 @@
+@@ -298,12 +315,19 @@
  ######################################################################################################
  # Helper functions
  ######################################################################################################
@@ -120,7 +148,7 @@ g) address parallel make issues
  
  DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
  DO_CC_DED=$(DO_CC) $(CFLAGS_DED)
-@@ -505,17 +519,17 @@
+@@ -505,17 +529,17 @@
  
  all: client openal qf ded cgame game ui irc cin angelwrap tv_server
  
@@ -141,14 +169,22 @@ g) address parallel make issues
  
  clean: clean-msg clean-depend clean-client clean-openal clean-qf clean-ded clean-cgame clean-game clean-ui clean-librocket clean-irc clean-cin clean-angelwrap clean-tv_server
  
-@@ -611,13 +625,14 @@
+@@ -609,7 +633,14 @@
+ 	@echo "> *********************************************************"
+ 	@echo "> * Building ui"
  	@echo "> *********************************************************"
++
++ifneq ($(SYSTEM_LIBS),YES)
  compile-ui: $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
- link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
 +$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB)
++else
++compile-ui: $(OBJS_UI_ROCKET)
++endif
++
+ link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
  clean-ui:
  	@echo "  > Removing ui objects" && \
- 	$(RM) $(OBJS_UI_ROCKET)
+@@ -617,7 +648,7 @@
  
  $(LIBROCKET_LIB):
  	@echo "> * Building Rocket library"
@@ -157,7 +193,7 @@ g) address parallel make issues
  	@echo "> * Done building RocketCore library."
  	@echo "> *********************************************************"
  	@echo "> * Continuing ui building..."
-@@ -656,7 +671,6 @@
+@@ -656,7 +687,6 @@
  	@echo "> *********************************************************"
  	@echo "> * Building angelwrap"
  	@echo "> *********************************************************"
@@ -165,7 +201,7 @@ g) address parallel make issues
  $(ANGELSCRIPT_INC)/angelscript.h:
  	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
  	@echo "!!!"
-@@ -668,7 +682,7 @@
+@@ -668,7 +698,7 @@
  
  $(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h
  	@echo "> * Building Angelscript library first"
@@ -174,7 +210,7 @@ g) address parallel make issues
  	@echo "> * Done building angelscript library."
  	@echo "> *********************************************************"
  	@echo "> * Continuing angelwrap building..."
-@@ -702,69 +716,69 @@
+@@ -702,69 +732,69 @@
  # DED
  ########
  $(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
@@ -268,7 +304,7 @@ g) address parallel make issues
  
  ######################################################################################################
  # Meta Rules
-@@ -776,229 +790,229 @@
+@@ -776,229 +806,229 @@
  # CLIENT
  ########
  $(BUILDDIR)/client/%.o: qcommon/%.c
diff --git a/games-fps/warsow/warsow-1.02-r1.ebuild b/games-fps/warsow/warsow-1.02-r1.ebuild
new file mode 100644
index 000000000000..ee1adca6affd
--- /dev/null
+++ b/games-fps/warsow/warsow-1.02-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.02-r1.ebuild,v 1.1 2013/01/18 19:08:09 hasufell Exp $
+
+EAPI=4
+inherit eutils check-reqs gnome2-utils games
+
+MY_P=${PN}_${PV}
+DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
+HOMEPAGE="http://www.warsow.net/"
+SRC_URI="http://funpark.warsow-esport.net/~${PN}/1.0/${PN}_1.0_unified.tar.gz
+	http://funpark.warsow-esport.net/~${PN}/${PV}/${MY_P}_sdk.tar.gz
+	http://funpark.warsow-esport.net/~${PN}/${PV}/${MY_P}_update.zip
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2 warsow"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+angelscript debug dedicated irc openal server"
+
+RDEPEND=">=dev-libs/libRocket-1.2.1_p20130110
+	media-libs/freetype
+	net-misc/curl
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libpng:0
+		media-libs/libsdl
+		media-libs/libtheora
+		media-libs/libvorbis
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXxf86dga
+		x11-libs/libXxf86vm
+		virtual/jpeg
+		virtual/opengl
+		openal? ( media-libs/openal )
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	x11-misc/makedepend
+	!dedicated? (
+		x11-proto/xineramaproto
+		x11-proto/xf86dgaproto
+		x11-proto/xf86vidmodeproto
+	)
+	openal? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/${MY_P}_sdk/source
+S_U=${WORKDIR}/${PN}_1.0
+S_UPDATE=${WORKDIR}/${MY_P}_update
+
+CHECKREQS_DISK_BUILD="1G"
+CHECKREQS_DISK_USR="500M"
+
+src_unpack() {
+	unpack ${PN}_1.0_unified.tar.gz ${MY_P}_sdk.tar.gz
+	mkdir "${S_UPDATE}" || die
+	cd "${S_UPDATE}" || die
+	unpack ${MY_P}_update.zip
+}
+
+src_prepare() {
+	sed -i \
+		-e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \
+		qcommon/files.c \
+		|| die "sed files.c failed"
+
+	sed -i \
+		-e "s:q_jpeg_mem_src:_&:" \
+		ref_gl/r_image.c || die "sed r_image.c failed"
+
+	rm -r "${S_U}"/docs/old* || die
+
+	cd "${WORKDIR}"/${MY_P}_sdk || die
+	epatch "${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-pic.patch
+	epatch_user
+}
+
+src_compile() {
+	yesno() { use ${1} && echo YES || echo NO ; }
+
+	use angelscript &&
+		emake -C ../libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc
+
+	local arch
+	if use amd64 ; then
+		arch=x86_64
+	elif use x86 ; then
+		arch=i386
+	fi
+
+	local myconf
+	if use dedicated ; then
+		myconf=(
+			BUILD_CLIENT=NO
+			BUILD_IRC=NO
+			BUILD_SND_OPENAL=NO
+			BUILD_SND_QF=NO
+			BUILD_CIN=NO
+			BUILD_SERVER=YES
+			BUILD_TV_SERVER=YES
+		)
+	else
+		myconf=(
+			BUILD_CLIENT=YES
+			BUILD_IRC=$(yesno irc)
+			BUILD_SND_OPENAL=$(yesno openal)
+			BUILD_SND_QF=YES
+			BUILD_CIN=YES
+			BUILD_SERVER=$(yesno server)
+			BUILD_TV_SERVER=$(yesno server)
+		)
+	fi
+
+	emake \
+		V=YES \
+		SYSTEM_LIBS=YES \
+		BASE_ARCH=${arch} \
+		BINDIR=lib \
+		BUILD_ANGELWRAP=$(yesno angelscript) \
+		DEBUG_BUILD=$(yesno debug) \
+		${myconf[@]}
+}
+
+src_install() {
+	cd lib
+
+	if ! use dedicated ; then
+		newgamesbin ${PN}.* ${PN}
+		doicon -s 48 "${DISTDIR}"/${PN}.png
+		make_desktop_entry ${PN} Warsow
+	fi
+
+	if use dedicated || use server ; then
+		newgamesbin wsw_server.* ${PN}-ded
+		newgamesbin wswtv_server.* ${PN}-tv
+	fi
+
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe */*.so
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r "${S_U}"/basewsw
+	doins -r "${S_UPDATE}"/basewsw
+
+	local so
+	for so in basewsw/*.so ; do
+		dosym "$(games_get_libdir)"/${PN}/${so##*/} \
+			"${GAMES_DATADIR}"/${PN}/${so}
+	done
+
+	if [[ -e libs ]] ; then
+		dodir "${GAMES_DATADIR}"/${PN}/libs
+		for so in libs/*.so ; do
+			dosym "$(games_get_libdir)"/${PN}/${so##*/} \
+				"${GAMES_DATADIR}"/${PN}/${so}
+		done
+	fi
+
+	dodoc "${S_U}"/docs/*
+	dodoc "${S_UPDATE}"/docs/*
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}