version bump

(Portage version: 2.1.8.3/cvs/Linux i686)

5 files changed, 169 insertions, 7 deletions

diff --git a/games-board/freedoko/ChangeLog b/games-board/freedoko/ChangeLog
index 48bea13bb63c..62f4494e47b5 100644
--- a/games-board/freedoko/ChangeLog
+++ b/games-board/freedoko/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-board/freedoko
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/ChangeLog,v 1.7 2008/11/12 19:41:19 tupone Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/ChangeLog,v 1.8 2010/04/20 19:10:58 mr_bones_ Exp $
+
+*freedoko-0.7.8 (20 Apr 2010)
+
+  20 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  freedoko-0.7.3.ebuild, +freedoko-0.7.8.ebuild,
+  +files/freedoko-0.7.8-gentoo.patch:
+  version bump
 
   12 Nov 2008; Tupone Alfredo <tupone@gentoo.org>
   +files/freedoko-0.7.3-gcc43.patch, freedoko-0.7.3.ebuild:
diff --git a/games-board/freedoko/files/freedoko-0.7.8-gentoo.patch b/games-board/freedoko/files/freedoko-0.7.8-gentoo.patch
new file mode 100644
index 000000000000..cb07df3e7470
--- /dev/null
+++ b/games-board/freedoko/files/freedoko-0.7.8-gentoo.patch
@@ -0,0 +1,64 @@
+diff -ru FreeDoko_0.7.8.orig/src/Makefile FreeDoko_0.7.8/src/Makefile
+--- FreeDoko_0.7.8.orig/src/Makefile	2010-03-13 14:22:58.000000000 -0500
++++ FreeDoko_0.7.8/src/Makefile	2010-04-20 12:52:29.294499776 -0400
+@@ -211,15 +211,7 @@
+ # compile FreeDoko
+ $(PROGNAME) : show_settings objects $(DIRECTORIES)
+ 	@echo "compiling $(PROGNAME)..."
+-# 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) \
+diff -ru FreeDoko_0.7.8.orig/src/Makefile.os FreeDoko_0.7.8/src/Makefile.os
+--- FreeDoko_0.7.8.orig/src/Makefile.os	2010-03-13 14:22:58.000000000 -0500
++++ FreeDoko_0.7.8/src/Makefile.os	2010-04-20 12:52:29.294499776 -0400
+@@ -1,6 +1,5 @@
+ include $(DEPTH)/../Makefile.os
+ 
+-include $(DEPTH)/Makefile.local
+ include $(DEPTH)/Makefile.modules
+ 
+ ifeq ($(OPERATING_SYSTEM), Linux)
+diff -ru FreeDoko_0.7.8.orig/src/Makefile.rules FreeDoko_0.7.8/src/Makefile.rules
+--- FreeDoko_0.7.8.orig/src/Makefile.rules	2010-03-13 14:22:59.000000000 -0500
++++ FreeDoko_0.7.8/src/Makefile.rules	2010-04-20 12:52:29.295507223 -0400
+@@ -81,9 +81,7 @@
+ 		  $(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)
+diff -ru FreeDoko_0.7.8.orig/src/ui/help.cpp FreeDoko_0.7.8/src/ui/help.cpp
+--- FreeDoko_0.7.8.orig/src/ui/help.cpp	2010-03-13 14:23:02.000000000 -0500
++++ FreeDoko_0.7.8/src/ui/help.cpp	2010-04-20 13:00:28.862375812 -0400
+@@ -142,14 +142,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.3.ebuild b/games-board/freedoko/freedoko-0.7.3.ebuild
index 3d98f9f6ac98..78c6bf423859 100644
--- a/games-board/freedoko/freedoko-0.7.3.ebuild
+++ b/games-board/freedoko/freedoko-0.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.3.ebuild,v 1.10 2008/11/12 19:41:19 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.3.ebuild,v 1.11 2010/04/20 19:10:58 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -41,6 +41,7 @@ src_unpack() {
 	use !net && epatch "${FILESDIR}"/nonet.patch
 	sed -i \
 		-e 's/linux binary/Gentoo '${ARCH}' binary/g' \
+		-e '/strip\ .*/d' \
 		Makefile \
 		|| die "sed failed"
 
diff --git a/games-board/freedoko/freedoko-0.7.8.ebuild b/games-board/freedoko/freedoko-0.7.8.ebuild
new file mode 100644
index 000000000000..cdc11b8b6ed4
--- /dev/null
+++ b/games-board/freedoko/freedoko-0.7.8.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.8.ebuild,v 1.1 2010/04/20 19:10:58 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils 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-cpp/gtkmm-2.4"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-util/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
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.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 || die
+	emake -C src FreeDoko || die
+}
+
+src_install() {
+	newgamesbin src/FreeDoko freedoko || die
+	insinto "${GAMES_DATADIR}"/${PN}/
+	doins -r data/{ai,cardsets,backgrounds,rules,sounds,translations,*png} || die
+	find "${D}${GAMES_DATADIR}"/${PN} -name Makefile -delete
+	dodoc AUTHORS README ChangeLog
+	use doc && dohtml -r doc/manual/
+	newicon src/FreeDoko.png ${PN}.png
+	make_desktop_entry ${PN} FreeDoko
+	prepgamesdirs
+}
diff --git a/games-board/freedoko/metadata.xml b/games-board/freedoko/metadata.xml
index df618860f6ab..2d19168dfb16 100644
--- a/games-board/freedoko/metadata.xml
+++ b/games-board/freedoko/metadata.xml
@@ -7,9 +7,12 @@ The Linux version of the popular german cardgame "Doppelkopf"
 </longdescription>
   <use>
     <flag name="altenburgcards">Use the Altenburg card set</flag>
-    <flag name="kdecards">Use the KDE card set</flag>
+    <flag name="kdecards">Install the KDE card set</flag>
     <flag name="net">Enable network game support</flag>
-    <flag name="pysolcards">Use the PySol card set</flag>
-    <flag name="xskatcards">Use the XSkat card set</flag>
+    <flag name="pysolcards">Install the PySol card set</flag>
+    <flag name="xskatcards">Install the XSkat card set</flag>
+    <flag name="gnomecards">Install the gnome-games card set</flag>
+    <flag name="openclipartcards">Install the openclipartcards card set</flag>
+    <flag name="backgrounds">Install additional background images</flag>
   </use>
 </pkgmetadata>