[gentoo-commits] proj/gamerlay:master commit in: games-strategy/openxcom/files/, games-strategy/openxcom/

[Azamat H. Hackimov]

commit:     21ca9b105976bce57863a5868c25d076a02b0618
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Tue Sep  6 16:31:37 2011 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Tue Sep  6 16:31:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=21ca9b10

[games-strategy/openxcom] Updated 9999 and new 0.3.

(Portage version: 2.1.10.11/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 .../openxcom/files/openxcom-0.3-makefile.patch     |   24 ++++++++
 games-strategy/openxcom/openxcom-0.3.ebuild        |   56 ++++++++++++++++++++
 games-strategy/openxcom/openxcom-9999.ebuild       |   39 +++++++-------
 3 files changed, 99 insertions(+), 20 deletions(-)

diff --git a/games-strategy/openxcom/files/openxcom-0.3-makefile.patch b/games-strategy/openxcom/files/openxcom-0.3-makefile.patch
new file mode 100644
index 0000000..f8da2b5
--- /dev/null
+++ b/games-strategy/openxcom/files/openxcom-0.3-makefile.patch
@@ -0,0 +1,24 @@
+diff --git a/src/Makefile b/src/Makefile
+index f9fcc06..b455cc2 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -22,16 +22,15 @@ endif
+ # Compiler settings
+ CXXFLAGS ?= -Wall -O2
+ CXXFLAGS += $(addprefix -D,$(TARGET))
+-CXXFLAGS += `$(PKG-CONFIG) --cflags sdl yaml-cpp`
++CXXFLAGS += $(shell $(PKG-CONFIG) --cflags sdl yaml-cpp)
+ 
+-LDFLAGS ?= -lSDL_gfx -lSDL_mixer
+-LDFLAGS += `$(PKG-CONFIG) --libs sdl yaml-cpp`
++LIBS = $(shell $(PKG-CONFIG) --libs sdl yaml-cpp) -lSDL_gfx -lSDL_mixer
+ 
+ # Rules
+ all: $(BINDIR)$(BIN)
+ 
+ $(BINDIR)$(BIN): $(OBJS)
+-	$(CXX) $(OBJS) $(LDFLAGS) -o $(BINDIR)$(BIN)
++	$(CXX) $(OBJS) $(LDFLAGS) $(LIBS) -o $(BINDIR)$(BIN)
+ 
+ $(OBJDIR)%.o:: %.cpp
+ 	$(CXX) $(CXXFLAGS) -c -o $@ $<

diff --git a/games-strategy/openxcom/openxcom-0.3.ebuild b/games-strategy/openxcom/openxcom-0.3.ebuild
new file mode 100644
index 0000000..fda102f
--- /dev/null
+++ b/games-strategy/openxcom/openxcom-0.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils games
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"
+	inherit git-2
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/SupSuper/OpenXcom/tarball/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/SupSuper-OpenXcom-1603231 # Last digit - revision
+fi
+
+DESCRIPTION="Open-source reimplementation of the original X-Com"
+HOMEPAGE="http://openxcom.ninex.info/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-cpp/yaml-cpp-0.2.6
+	media-libs/libsdl
+	>=media-libs/sdl-gfx-2.0.22
+	media-libs/sdl-mixer[timidity]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.3-makefile.patch
+	sed -i -e "s:/usr/share/openxcom:${GAMES_DATADIR}/${PN}:" \
+		"${S}"/src/Engine/CrossPlatform.cpp || die "sed failed"
+}
+
+src_compile() {
+	cd src
+	emake || die "make failed"
+}
+
+src_install() {
+	dogamesbin bin/openxcom
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r bin/DATA/*
+	dodoc README.txt
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	elog "Copy the data files from X-COM: Enemy Unknown to"
+	elog "${GAMES_DATADIR}/${PN}/"
+}

diff --git a/games-strategy/openxcom/openxcom-9999.ebuild b/games-strategy/openxcom/openxcom-9999.ebuild
index 0a6b5ed..fda102f 100644
--- a/games-strategy/openxcom/openxcom-9999.ebuild
+++ b/games-strategy/openxcom/openxcom-9999.ebuild
@@ -2,40 +2,40 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI=3
 
-inherit eutils games git
+inherit eutils games
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"
+	inherit git-2
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/SupSuper/OpenXcom/tarball/v${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/SupSuper-OpenXcom-1603231 # Last digit - revision
+fi
 
 DESCRIPTION="Open-source reimplementation of the original X-Com"
 HOMEPAGE="http://openxcom.ninex.info/"
-EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"
-#SRC_URI=""
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
-RDEPEND="dev-cpp/yaml-cpp
+RDEPEND=">=dev-cpp/yaml-cpp-0.2.6
 	media-libs/libsdl
 	>=media-libs/sdl-gfx-2.0.22
-	media-libs/sdl-mixer"
+	media-libs/sdl-mixer[timidity]"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/trunk
-
 src_prepare() {
-#	epatch "${FILESDIR}"/Makefile.pkg-config.patch
-	sed -i \
-		-e "s:\(CXXFLAGS \)=:\1+=:" \
-		-e "s:\(LDFLAGS \)=:\1+=:" \
-		"${S}"/src/Makefile || die "sed failed"
-	sed -i -e "s:\(#define DATA_FOLDER \)\"./DATA/\":\1\"${GAMES_DATADIR}/${PN}/DATA/\":" \
-		"${S}"/src/Menu/StartState.cpp || die "sed failed"
+	epatch "${FILESDIR}"/${PN}-0.3-makefile.patch
+	sed -i -e "s:/usr/share/openxcom:${GAMES_DATADIR}/${PN}:" \
+		"${S}"/src/Engine/CrossPlatform.cpp || die "sed failed"
 }
 
 src_compile() {
-	mkdir obj
 	cd src
 	emake || die "make failed"
 }
@@ -43,9 +43,8 @@ src_compile() {
 src_install() {
 	dogamesbin bin/openxcom
 
-	insinto "${GAMES_DATADIR}"/${PN}/DATA
+	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r bin/DATA/*
-
 	dodoc README.txt
 
 	prepgamesdirs
@@ -53,5 +52,5 @@ src_install() {
 
 pkg_postinst() {
 	elog "Copy the data files from X-COM: Enemy Unknown to"
-	elog "${GAMES_DATADIR}/${PN}/DATA/"
+	elog "${GAMES_DATADIR}/${PN}/"
 }