version bump wrt #452306

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

4 files changed, 181 insertions, 2 deletions

diff --git a/games-board/freedoko/ChangeLog b/games-board/freedoko/ChangeLog
index 0b67cf162067..37bc6fbe7027 100644
--- a/games-board/freedoko/ChangeLog
+++ b/games-board/freedoko/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/freedoko
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/ChangeLog,v 1.19 2012/09/24 08:45:18 tupone Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/ChangeLog,v 1.20 2013/02/03 00:56:36 hasufell Exp $
+
+*freedoko-0.7.11 (03 Feb 2013)
+
+  03 Feb 2013; Julian Ospald <hasufell@gentoo.org> +freedoko-0.7.11.ebuild,
+  +files/freedoko-0.7.11-gcc47.patch, +files/freedoko-0.7.11-gentoo.patch:
+  version bump wrt #452306
 
   24 Sep 2012; Tupone Alfredo <tupone@gentoo.org> freedoko-0.7.10.ebuild,
   +files/freedoko-0.7.10-gcc47.patch:
diff --git a/games-board/freedoko/files/freedoko-0.7.11-gcc47.patch b/games-board/freedoko/files/freedoko-0.7.11-gcc47.patch
new file mode 100644
index 000000000000..5fc4292f81cb
--- /dev/null
+++ b/games-board/freedoko/files/freedoko-0.7.11-gcc47.patch
@@ -0,0 +1,10 @@
+--- src/freedoko.cpp.old	2012-09-24 09:49:20.770335560 +0200
++++ src/freedoko.cpp	2012-09-24 09:49:59.696057735 +0200
+@@ -37,6 +37,7 @@
+ 
+ #include "constants.h"
+ #include <time.h>
++#include <unistd.h>
+ #ifdef WINDOWS
+ // for 'mkdir'
+ #include <io.h>
diff --git a/games-board/freedoko/files/freedoko-0.7.11-gentoo.patch b/games-board/freedoko/files/freedoko-0.7.11-gentoo.patch
new file mode 100644
index 000000000000..fcc47516f50c
--- /dev/null
+++ b/games-board/freedoko/files/freedoko-0.7.11-gentoo.patch
@@ -0,0 +1,61 @@
+--- FreeDoko_0.7.10.orig/src/Makefile
++++ FreeDoko_0.7.10/src/Makefile
+@@ -217,15 +217,7 @@
+ # compile FreeDoko
+ $(PROGRAM) : show_settings objects $(DIRECTORIES)
+ 	@echo "compiling $(PROGRAM)..."
+-# Gentoo users do want to see the real compile line.
+-# So remove the next five lines (the echo lines)
+-# and remove the '@' in the line after.
+-	@echo '$(CXX) $(CXXFLAGS)'
+-	@echo '        $$(OBJECTS)'
+-	@echo '        $(INCLUDE_ALL)'
+-	@echo '        $(LIBS_ALL)'
+-	@echo '        -o $@'
+-	@$(CXX) $(CXXFLAGS) \
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) \
+ 	  $(OBJECTS_ALL:%.o=$(FREEDOKO_WORKING_DIRECTORY)/%.o) \
+ 	  $(INCLUDE_ALL) \
+ 	  $(LIBS_ALL) \
+--- FreeDoko_0.7.10.orig/src/Makefile.os
++++ FreeDoko_0.7.10/src/Makefile.os
+@@ -1,6 +1,5 @@
+ include $(DEPTH)/../Makefile.os
+ 
+-include $(DEPTH)/Makefile.local
+ include $(DEPTH)/Makefile.modules
+ 
+ ifeq ($(OPERATING_SYSTEM), Linux)
+--- FreeDoko_0.7.10.orig/src/Makefile.rules
++++ FreeDoko_0.7.10/src/Makefile.rules
+@@ -80,10 +80,7 @@
+ 		  $(DEPTH)/Makefile.modules \
+ 		  $(DEPTH)/Makefile.local \
+ 		  $(DEPTH)/Makefile.os
+-# Gentoo users do want to see the real compile line.
+-# So remove the next line and remove the '@' in the line after.
+-	@echo $(CXX) -c $(SUBDIR)/$<
+-	@$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(DEPGEN_FLAGS) -o $@ -c $<
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDE) $(DEPGEN_FLAGS) -o $@ -c $<
+ 
+ 
+ -include $(OBJECTS:%.o=$(TARGET_DIR_LOCAL)%.d)
+--- FreeDoko_0.7.10.orig/src/ui/help.cpp
++++ FreeDoko_0.7.10/src/ui/help.cpp
+@@ -152,14 +152,14 @@
+     for (list<string>::const_iterator d = datadir.begin();
+          d != datadir.end();
+          d++)
+-      directories.push_back(*d + "/"
++      directories.push_back("/"
+                             + ::setting(Setting::MANUAL_DIRECTORY) + "/"
+                             + ::translator.token());
+     if (::translator.token() != ::setting(Setting::LANGUAGE))
+       for (list<string>::const_iterator d = datadir.begin();
+            d != datadir.end();
+            d++)
+-        directories.push_back(*d + "/"
++        directories.push_back("/"
+                               + ::setting(Setting::MANUAL_DIRECTORY) + "/"
+                               + ::setting(Setting::LANGUAGE));
+   } // fill the directories list
diff --git a/games-board/freedoko/freedoko-0.7.11.ebuild b/games-board/freedoko/freedoko-0.7.11.ebuild
new file mode 100644
index 000000000000..5ad2939b7f17
--- /dev/null
+++ b/games-board/freedoko/freedoko-0.7.11.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.11.ebuild,v 1.1 2013/02/03 00:56:36 hasufell Exp $
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="FreeDoko is a Doppelkopf-game"
+HOMEPAGE="http://free-doko.sourceforge.net"
+SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
+	doc? ( mirror://sourceforge/free-doko/FreeDoko_${PV}.manual.zip )
+	backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> ${PN}-backgrounds.zip )
+	kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip )
+	xskatcards? ( mirror://sourceforge/free-doko/xskat.zip )
+	pysolcards? ( mirror://sourceforge/free-doko/pysol.zip )
+	gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip )
+	openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip )
+	!xskatcards? (
+		!kdecards? (
+			!gnomecards? (
+				!openclipartcards? (
+					!pysolcards? (
+						mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net doc"
+
+RDEPEND="net? ( net-libs/gnet dev-libs/glib:2 )
+	>=dev-cpp/gtkmm-2.4:2.4"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S=${WORKDIR}/FreeDoko_${PV}
+
+src_unpack() {
+	local cards=0
+
+	unpack_cards() {
+		use $1 && { unpack $2 ; cards=$(( $cards + 1 )); };
+	}
+	unpack FreeDoko_${PV}.src.zip
+	use doc && unpack FreeDoko_${PV}.manual.zip
+	cp /dev/null "${S}"/src/Makefile.local
+
+	cd "${S}"/data/cardsets
+
+	unpack_cards xskatcards       xskat.zip
+	unpack_cards kdecards         kdecarddecks.zip
+	unpack_cards pysolcards       pysol.zip
+	unpack_cards gnomecards       gnome-games.zip
+	unpack_cards openclipartcards openclipart.zip
+	[ $cards ] || unpack xskat.zip # fall back to xskat
+
+	if use backgrounds ; then
+		cd "${S}"/data/backgrounds
+		unpack ${PN}-backgrounds.zip
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+)
+
+src_compile() {
+	export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"${GAMES_DATADIR}/${PN}\"'"
+	export CPPFLAGS+=" -DMANUAL_DIRECTORY_VALUE='\"/usr/share/doc/${PF}/html\"'"
+	export OSTYPE=Linux
+	export USE_NETWORK=$(use net && echo true || echo false)
+	export USE_SOUND_ALUT=false # still marked experimental
+	emake Version
+	emake -C src FreeDoko
+}
+
+src_install() {
+	newgamesbin src/FreeDoko freedoko
+	insinto "${GAMES_DATADIR}"/${PN}/
+	doins -r data/{ai,cardsets,backgrounds,rules,sounds,translations,*png}
+	find "${D}${GAMES_DATADIR}"/${PN} -name Makefile -delete
+	dodoc AUTHORS README ChangeLog
+	use doc && dohtml -r doc/manual/
+	newicon -s 32 src/FreeDoko.png ${PN}.png
+	make_desktop_entry ${PN} FreeDoko
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}