public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-board/freedoko/files/, games-board/freedoko/
@ 2015-12-31 11:42 Pacho Ramos
  0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2015-12-31 11:42 UTC (permalink / raw
  To: gentoo-commits

commit:     91ecddb6c84583bc2839b5b510629880a763a045
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 11:42:11 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 11:42:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ecddb6

games-board/freedoko: Fix building with latest glibmm/libsigc++ (#569530)

Package-Manager: portage-2.2.26

 .../freedoko/files/freedoko-0.7.13-libsigc26.patch |  36 ++++++++
 games-board/freedoko/freedoko-0.7.13-r1.ebuild     | 100 +++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/games-board/freedoko/files/freedoko-0.7.13-libsigc26.patch b/games-board/freedoko/files/freedoko-0.7.13-libsigc26.patch
new file mode 100644
index 0000000..2c35669
--- /dev/null
+++ b/games-board/freedoko/files/freedoko-0.7.13-libsigc26.patch
@@ -0,0 +1,36 @@
+--- src/ui/gtkmm/player.h	2015-11-17 14:04:43.251096876 +0100
++++ src/ui/gtkmm/player.h	2015-11-17 14:04:43.251096876 +0100
+@@ -36,7 +36,7 @@
+ #include "../../player/player.h"
+ typedef ::Player::Type PlayerType;
+ 
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ namespace Gtk {
+   class Label;
+   class Button;
+
+--- src/ui/gtkmm/aiconfig.h	2015-11-17 14:04:43.251096876 +0100
++++ src/ui/gtkmm/aiconfig.h	2015-11-17 14:04:43.251096876 +0100
+@@ -36,7 +36,7 @@
+ #include "../../player/aiconfig.h"
+ 
+ #include "widgets/label_type_selector.h"
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ #include <gtkmm/liststore.h>
+ namespace Gtk {
+   class VBox;
+
+--- src/player/ai/heuristics.cpp	2015-11-17 14:04:13.267766289 +0100
++++ src/player/ai/heuristics.cpp	2015-11-17 14:04:13.267766289 +0100
+@@ -2350,7 +2350,7 @@
+            && (   card.less(c)
+                || (   tpoints >= hi.value( Aiconfig::LIMITDOLLE )
+                    && c.less(Card(Card::DIAMOND, Card::QUEEN))
+-                   && !hi.color_runs( t.startcard().color() ) < 1
++                   && (hi.color_runs( t.startcard().color() ) > 0)
+                    && !t.islastcard()
+                   )
+               )
+

diff --git a/games-board/freedoko/freedoko-0.7.13-r1.ebuild b/games-board/freedoko/freedoko-0.7.13-r1.ebuild
new file mode 100644
index 0000000..5ed3755
--- /dev/null
+++ b/games-board/freedoko/freedoko-0.7.13-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic 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
+	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"
+
+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
+	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
+	epatch "${FILESDIR}"/${P}-libsigc26.patch
+	append-cxxflags -std=c++11
+}
+
+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
+	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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-board/freedoko/files/, games-board/freedoko/
@ 2018-04-29 18:13 Pacho Ramos
  0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2018-04-29 18:13 UTC (permalink / raw
  To: gentoo-commits

commit:     83df52b405d1829e61415ba2b35bafd8335f287b
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 17:58:11 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 18:13:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83df52b4

games-board/freedoko: Version bump

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-board/freedoko/Manifest                      |   1 +
 .../freedoko/files/freedoko-0.7.16-gentoo.patch    |  33 +++++++
 games-board/freedoko/freedoko-0.7.16.ebuild        | 100 +++++++++++++++++++++
 3 files changed, 134 insertions(+)

diff --git a/games-board/freedoko/Manifest b/games-board/freedoko/Manifest
index d4d7544b3f4..ff03641f422 100644
--- a/games-board/freedoko/Manifest
+++ b/games-board/freedoko/Manifest
@@ -1,4 +1,5 @@
 DIST FreeDoko_0.7.14.src.zip 21959828 BLAKE2B fb19946876978119e36d6f8bb7bd0049523f2145dbaf198fe00e776256a1d66efb3067324bb6ffb0f7db90b3b5acd937c848cf7ec7958419e6897ae918955fce SHA512 d9135ad846c48c05b3d61c07b146429ef8c54d301469a304912176164f05ee98682d05a5b2ec8feb1a568acae2d81b2bf62fa625a1fde09a5c1c03a1c782ff17
+DIST FreeDoko_0.7.16.src.zip 21763114 BLAKE2B a02e562badef67d596a5652a384022c0d7e86af766bdde35ce6fa18b212142a6f9008e3f702bdb571efc20cbbbaf1ebf61633a0e09fa97ed7bb5798268daaf34 SHA512 5a656539a6d8b06873532a32869a54a3cab68532b7ee8eb526e92c378ded957478e71ff5c2b1b5674f9433bb62adf2e94bdcf2d3ce13ffc7d846f268adbce314
 DIST freedoko-backgrounds.zip 1067740 BLAKE2B 1f4485007bc78c3d7d497ba556a9f7bf0ff121a228e9d938ee000a12bd3921eef14c40cfbc6806b95c5905bff3f8e823b56c5fc110b290719a0771351f985d5c SHA512 66f118a5440b854c7ad4b1bdfd63e7f3bc16e66c921a6f632637269ca8855a6a45eb05a71bfb9105abda20285e35994ff3c9c50649f70ab6de4a082e092c3a14
 DIST gnome-games.zip 3338038 BLAKE2B cc2ddb0abfcc1557addf896d15daf00150ec08d7bd75ae9c4fdf1e4cd6e5d126e9dcd5e50a7c62f1d74cb881259da8ba96f2f5623ff84041d04c6b5a38b9662e SHA512 42dd63c4eb696d7964b0ad30ff0032c80c93e8bd0a2517b0938005eaf8b12a584d7ce7901c6b3bb0bb55372e484162240c7719d2bf102035870b9c57f1930ec1
 DIST kdecarddecks.zip 3370611 BLAKE2B d097bd95545e57250ea7dc034d40577253cf8e78e539e7b81217a548903817ee792a5ee1115eef7d8238b3e90a70601e272df84fc304b43be4a28697220d545c SHA512 4f3fdac3c672fd1de3db2f6603919a242db73e2445a8dac07d45dcf284cfbb56948925d6e512f15a0b4c762b71758c0755312624a0030a4d8f11dbfe65666c44

diff --git a/games-board/freedoko/files/freedoko-0.7.16-gentoo.patch b/games-board/freedoko/files/freedoko-0.7.16-gentoo.patch
new file mode 100644
index 00000000000..68160dcba92
--- /dev/null
+++ b/games-board/freedoko/files/freedoko-0.7.16-gentoo.patch
@@ -0,0 +1,33 @@
+--- a/src/Makefile.old	2017-06-06 13:30:39.005626983 +0200
++++ b/src/Makefile	2017-06-06 13:31:09.180881871 +0200
+@@ -239,15 +239,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) $$(OBJECTS)'
+-	@echo '        $(INCLUDE_ALL)'
+-	@echo '        $(LIBS_ALL)'
+-	@echo '       $(CXXFLAGS)'
+-	@echo '        -o $@'
+-	@$(CXX) \
++	$(CXX) \
+ 	  $(OBJECTS_ALL:%.o=$(FREEDOKO_WORKING_DIRECTORY)/%.o) \
+ 	  $(INCLUDE_ALL) \
+ 	  $(LIBS_ALL) \
+--- a/src/Makefile.rules.old	2017-06-06 13:30:27.071526137 +0200
++++ b/src/Makefile.rules	2017-06-06 13:31:17.829954904 +0200
+@@ -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) $(INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(DEPGEN_FLAGS) -o $@ -c $<
++	$(CXX) $(INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(DEPGEN_FLAGS) -o $@ -c $<
+ 
+ 
+ -include $(OBJECTS:%.o=$(TARGET_DIR_LOCAL)%.d)

diff --git a/games-board/freedoko/freedoko-0.7.16.ebuild b/games-board/freedoko/freedoko-0.7.16.ebuild
new file mode 100644
index 00000000000..279bdf73da2
--- /dev/null
+++ b/games-board/freedoko/freedoko-0.7.16.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic gnome2-utils
+
+DESCRIPTION="FreeDoko is a Doppelkopf-game"
+HOMEPAGE="http://free-doko.sourceforge.net"
+SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.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 ~x86"
+IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net"
+
+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
+	cp /dev/null "${S}"/src/Makefile.local || die
+
+	cd "${S}"/data/cardsets || die
+
+	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 || die
+		unpack ${PN}-backgrounds.zip
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.16-gentoo.patch
+)
+
+src_prepare() {
+	default
+	export VARTEXFONTS="${T}/fonts" #652028
+	append-cxxflags -std=c++14
+}
+
+src_compile() {
+	export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"/usr/share/${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() {
+	newbin src/FreeDoko freedoko
+	insinto /usr/share/${PN}/
+	doins -r data/{backgrounds,cardsets,iconsets,rules,sounds,translations,*png}
+	find "${D}/usr/share/${PN}" -name Makefile -delete
+	dodoc AUTHORS README ChangeLog
+	newicon -s 32 src/FreeDoko.png ${PN}.png
+	make_desktop_entry ${PN} FreeDoko
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-board/freedoko/files/, games-board/freedoko/
@ 2018-04-29 18:13 Pacho Ramos
  0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2018-04-29 18:13 UTC (permalink / raw
  To: gentoo-commits

commit:     e719478c45b1903f0a41e3a4d8505689a6b81611
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 17:58:31 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 18:13:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e719478c

games-board/freedoko: Drop old

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 games-board/freedoko/Manifest                      |   1 -
 .../freedoko/files/freedoko-0.7.14-gentoo.patch    |  42 ---------
 games-board/freedoko/freedoko-0.7.14-r1.ebuild     | 100 ---------------------
 3 files changed, 143 deletions(-)

diff --git a/games-board/freedoko/Manifest b/games-board/freedoko/Manifest
index ff03641f422..54c25bb38de 100644
--- a/games-board/freedoko/Manifest
+++ b/games-board/freedoko/Manifest
@@ -1,4 +1,3 @@
-DIST FreeDoko_0.7.14.src.zip 21959828 BLAKE2B fb19946876978119e36d6f8bb7bd0049523f2145dbaf198fe00e776256a1d66efb3067324bb6ffb0f7db90b3b5acd937c848cf7ec7958419e6897ae918955fce SHA512 d9135ad846c48c05b3d61c07b146429ef8c54d301469a304912176164f05ee98682d05a5b2ec8feb1a568acae2d81b2bf62fa625a1fde09a5c1c03a1c782ff17
 DIST FreeDoko_0.7.16.src.zip 21763114 BLAKE2B a02e562badef67d596a5652a384022c0d7e86af766bdde35ce6fa18b212142a6f9008e3f702bdb571efc20cbbbaf1ebf61633a0e09fa97ed7bb5798268daaf34 SHA512 5a656539a6d8b06873532a32869a54a3cab68532b7ee8eb526e92c378ded957478e71ff5c2b1b5674f9433bb62adf2e94bdcf2d3ce13ffc7d846f268adbce314
 DIST freedoko-backgrounds.zip 1067740 BLAKE2B 1f4485007bc78c3d7d497ba556a9f7bf0ff121a228e9d938ee000a12bd3921eef14c40cfbc6806b95c5905bff3f8e823b56c5fc110b290719a0771351f985d5c SHA512 66f118a5440b854c7ad4b1bdfd63e7f3bc16e66c921a6f632637269ca8855a6a45eb05a71bfb9105abda20285e35994ff3c9c50649f70ab6de4a082e092c3a14
 DIST gnome-games.zip 3338038 BLAKE2B cc2ddb0abfcc1557addf896d15daf00150ec08d7bd75ae9c4fdf1e4cd6e5d126e9dcd5e50a7c62f1d74cb881259da8ba96f2f5623ff84041d04c6b5a38b9662e SHA512 42dd63c4eb696d7964b0ad30ff0032c80c93e8bd0a2517b0938005eaf8b12a584d7ce7901c6b3bb0bb55372e484162240c7719d2bf102035870b9c57f1930ec1

diff --git a/games-board/freedoko/files/freedoko-0.7.14-gentoo.patch b/games-board/freedoko/files/freedoko-0.7.14-gentoo.patch
deleted file mode 100644
index d1d18fb485e..00000000000
--- a/games-board/freedoko/files/freedoko-0.7.14-gentoo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- FreeDoko_0.7.14.orig/src/Makefile
-+++ FreeDoko_0.7.14/src/Makefile
-@@ -241,15 +241,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) $(CXXFLAGS) \
- 	  $(OBJECTS_ALL:%.o=$(FREEDOKO_WORKING_DIRECTORY)/%.o) \
- 	  $(INCLUDE_ALL) \
- 	  $(LIBS_ALL) \
---- FreeDoko_0.7.14.orig/src/Makefile.os
-+++ FreeDoko_0.7.14/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.14.orig/src/Makefile.rules
-+++ FreeDoko_0.7.14/src/Makefile.rules
-@@ -80,10 +80,8 @@
- 		  $(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)

diff --git a/games-board/freedoko/freedoko-0.7.14-r1.ebuild b/games-board/freedoko/freedoko-0.7.14-r1.ebuild
deleted file mode 100644
index 1c2f599e443..00000000000
--- a/games-board/freedoko/freedoko-0.7.14-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="FreeDoko is a Doppelkopf-game"
-HOMEPAGE="http://free-doko.sourceforge.net"
-SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.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 ~x86"
-IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net"
-
-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
-	cp /dev/null "${S}"/src/Makefile.local || die
-
-	cd "${S}"/data/cardsets || die
-
-	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 || die
-		unpack ${PN}-backgrounds.zip
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	append-cxxflags -std=c++11
-}
-
-src_compile() {
-	export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"/usr/share/${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() {
-	newbin src/FreeDoko freedoko
-	insinto /usr/share/${PN}/
-	doins -r data/{backgrounds,cardsets,iconsets,rules,sounds,translations,*png}
-	find "${D}/usr/share/${PN}" -name Makefile -delete
-	dodoc AUTHORS README ChangeLog
-	newicon -s 32 src/FreeDoko.png ${PN}.png
-	make_desktop_entry ${PN} FreeDoko
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-board/freedoko/files/, games-board/freedoko/
@ 2024-03-22  5:33 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-03-22  5:33 UTC (permalink / raw
  To: gentoo-commits

commit:     405073029c1ae4a1a2a1a2cbfb7d5af0284c12f1
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri Mar 22 04:00:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 05:31:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40507302

games-board/freedoko: add 0.8.0

Brings us up from 2017 to end of 2023. Drop hack for CXX std as it was
introduced in commit 91ecddb6c84583bc2839b5b510629880a763a045 for the
purpose of "Fix building with latest glibmm/libsigc++" and it seems
quite archaic as a temporary hotfix.

Reroll the patch, drop 2 data directories that were dropped upstream.

The new version handily fixes compiling with LTO.

Closes: https://bugs.gentoo.org/926051
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-board/freedoko/Manifest                      |  1 +
 .../freedoko/files/freedoko-0.8.0-gentoo.patch     | 34 ++++++++
 games-board/freedoko/freedoko-0.8.0.ebuild         | 97 ++++++++++++++++++++++
 3 files changed, 132 insertions(+)

diff --git a/games-board/freedoko/Manifest b/games-board/freedoko/Manifest
index 54c25bb38de9..40a4bbd1f995 100644
--- a/games-board/freedoko/Manifest
+++ b/games-board/freedoko/Manifest
@@ -1,4 +1,5 @@
 DIST FreeDoko_0.7.16.src.zip 21763114 BLAKE2B a02e562badef67d596a5652a384022c0d7e86af766bdde35ce6fa18b212142a6f9008e3f702bdb571efc20cbbbaf1ebf61633a0e09fa97ed7bb5798268daaf34 SHA512 5a656539a6d8b06873532a32869a54a3cab68532b7ee8eb526e92c378ded957478e71ff5c2b1b5674f9433bb62adf2e94bdcf2d3ce13ffc7d846f268adbce314
+DIST FreeDoko_0.8.0.src.zip 24831232 BLAKE2B 3c5265e4fefe9de2509c5b6db1660261be5f3cfceeaac9dcf2d7e8138ae71fad950745427979fa123a501c560b312ad0db4a12cf93a90948fcc6f4b8a442bb90 SHA512 db2ca8a0775313e212c7e16fe01189d3fed035503d5ebfb3047af07ec24f58f7a3c17270b65aa1d9f5531c81a636ce7881bea656ff2a131528c593ae3948093b
 DIST freedoko-backgrounds.zip 1067740 BLAKE2B 1f4485007bc78c3d7d497ba556a9f7bf0ff121a228e9d938ee000a12bd3921eef14c40cfbc6806b95c5905bff3f8e823b56c5fc110b290719a0771351f985d5c SHA512 66f118a5440b854c7ad4b1bdfd63e7f3bc16e66c921a6f632637269ca8855a6a45eb05a71bfb9105abda20285e35994ff3c9c50649f70ab6de4a082e092c3a14
 DIST gnome-games.zip 3338038 BLAKE2B cc2ddb0abfcc1557addf896d15daf00150ec08d7bd75ae9c4fdf1e4cd6e5d126e9dcd5e50a7c62f1d74cb881259da8ba96f2f5623ff84041d04c6b5a38b9662e SHA512 42dd63c4eb696d7964b0ad30ff0032c80c93e8bd0a2517b0938005eaf8b12a584d7ce7901c6b3bb0bb55372e484162240c7719d2bf102035870b9c57f1930ec1
 DIST kdecarddecks.zip 3370611 BLAKE2B d097bd95545e57250ea7dc034d40577253cf8e78e539e7b81217a548903817ee792a5ee1115eef7d8238b3e90a70601e272df84fc304b43be4a28697220d545c SHA512 4f3fdac3c672fd1de3db2f6603919a242db73e2445a8dac07d45dcf284cfbb56948925d6e512f15a0b4c762b71758c0755312624a0030a4d8f11dbfe65666c44

diff --git a/games-board/freedoko/files/freedoko-0.8.0-gentoo.patch b/games-board/freedoko/files/freedoko-0.8.0-gentoo.patch
new file mode 100644
index 000000000000..d4935fedfb72
--- /dev/null
+++ b/games-board/freedoko/files/freedoko-0.8.0-gentoo.patch
@@ -0,0 +1,34 @@
+diff --git a/src/Makefile b/src/Makefile
+index 95d51e8..6eab774 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -266,12 +266,7 @@ $(PROGRAM) : show_settings
+ # 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) $$(OBJ_FILES_ALL)'
+-	@echo '        $(LIBS_ALL)'
+-	@echo '        $(CXXFLAGS)'
+-	@echo '        $(LDFLAGS)'
+-	@echo '        -o $@'
+-	@$(CXX) \
++	$(CXX) \
+ 	  $(OBJ_FILES_ALL:%.o=$(OBJDIR)/%.o) \
+ 	  $(LIBS_ALL) \
+ 	  $(CXXFLAGS) \
+diff --git a/src/Makefile.rules b/src/Makefile.rules
+index 8ff7b35..0745227 100644
+--- a/src/Makefile.rules
++++ b/src/Makefile.rules
+@@ -92,9 +92,8 @@ $(TARGET_DIR_LOCAL)%.o : %.cpp \
+ 		  $(DEPTH)/Makefile.os
+ # Gentoo users do want to see the real compile line.
+ # So remove the next line and remove the '@' in the lines after.
+-	@echo $(CXX) -c $(SUBDIR)/$<
+-	@$(RM) $(TARGET_DIR_LOCAL)*.gcno $(TARGET_DIR_LOCAL)*.gcda
+-	@$(CXX) $(INCLUDE) $(CPPFLAGS) $(CPPFLAGS_FREEDOKO) $(CXXFLAGS) $(DEPGEN_FLAGS) -o $@ -c $<
++	$(RM) $(TARGET_DIR_LOCAL)*.gcno $(TARGET_DIR_LOCAL)*.gcda
++	$(CXX) $(INCLUDE) $(CPPFLAGS) $(CPPFLAGS_FREEDOKO) $(CXXFLAGS) $(DEPGEN_FLAGS) -o $@ -c $<
+ 
+ 
+ -include $(OBJ_FILES:%.o=$(TARGET_DIR_LOCAL)%.d)

diff --git a/games-board/freedoko/freedoko-0.8.0.ebuild b/games-board/freedoko/freedoko-0.8.0.ebuild
new file mode 100644
index 000000000000..2a7beb3e17a4
--- /dev/null
+++ b/games-board/freedoko/freedoko-0.8.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="FreeDoko is a Doppelkopf-game"
+HOMEPAGE="https://free-doko.sourceforge.net"
+SRC_URI="
+	mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
+	backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> ${PN}-backgrounds.zip )
+	gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip )
+	kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip )
+	openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip )
+	pysolcards? ( mirror://sourceforge/free-doko/pysol.zip )
+	xskatcards? ( mirror://sourceforge/free-doko/xskat.zip )
+	!xskatcards? (
+		!kdecards? (
+			!gnomecards? (
+				!openclipartcards? (
+					!pysolcards? (
+						mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )"
+S="${WORKDIR}/FreeDoko_${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+backgrounds +gnomecards +kdecards +openclipartcards +pysolcards +xskatcards"
+
+RDEPEND="
+	dev-cpp/gtkmm:3.0
+	media-libs/openal"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-gentoo.patch
+)
+
+src_unpack() {
+	unpack FreeDoko_${PV}.src.zip
+
+	local cards=
+	unpack_cards() {
+		if use $1; then
+			cards=y
+			unpack $2
+		fi
+	}
+
+	cd "${S}"/data/cardsets || die
+
+	unpack_cards gnomecards       gnome-games.zip
+	unpack_cards kdecards         kdecarddecks.zip
+	unpack_cards openclipartcards openclipart.zip
+	unpack_cards pysolcards       pysol.zip
+	unpack_cards xskatcards       xskat.zip
+	[[ $cards ]] || unpack xskat.zip # fall back to xskat
+
+	if use backgrounds ; then
+		cd "${S}"/data/backgrounds || die
+		unpack ${PN}-backgrounds.zip
+	fi
+}
+
+src_compile() {
+	tc-export CXX
+	append-cppflags \
+		-DPUBLIC_DATA_DIRECTORY_VALUE="'\"${EPREFIX}/usr/share/${PN}\"'" \
+		-DMANUAL_DIRECTORY_VALUE="'\"${EPREFIX}/usr/share/doc/${PF}/html\"'"
+	touch src/Makefile.local || die # needed for above paths to be used
+
+	export OSTYPE=Linux
+	export USE_NETWORK=false
+	export USE_SOUND_ALUT=false # still marked experimental
+	export VARTEXFONTS="${T}/fonts" #652028
+
+	emake Version
+	emake -C src FreeDoko LIBS="${LDFLAGS}"
+}
+
+src_install() {
+	newbin src/FreeDoko freedoko
+
+	insinto /usr/share/${PN}
+	doins -r data/{backgrounds,cardsets,iconsets,sounds,*.png}
+
+	newicon src/icon.png ${PN}.png
+	make_desktop_entry ${PN} FreeDoko
+
+	einstalldocs
+
+	find "${ED}"/usr/share/${PN} -name Makefile -delete || die
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-03-22  5:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-31 11:42 [gentoo-commits] repo/gentoo:master commit in: games-board/freedoko/files/, games-board/freedoko/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2018-04-29 18:13 Pacho Ramos
2018-04-29 18:13 Pacho Ramos
2024-03-22  5:33 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox