From: Michael Sterrett Date: Tue, 20 Apr 2010 19:10:58 +0000 (+0000) Subject: version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86da35592c54ecf7ccbb63ab9ab3c92c7503a426;p=gentoo.git version bump Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- 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 + freedoko-0.7.3.ebuild, +freedoko-0.7.8.ebuild, + +files/freedoko-0.7.8-gentoo.patch: + version bump 12 Nov 2008; Tupone Alfredo +files/freedoko-0.7.3-gcc43.patch, freedoko-0.7.3.ebuild: diff --git a/games-board/freedoko/Manifest b/games-board/freedoko/Manifest index cd23a4b9c555..e07ad6ebe870 100644 --- a/games-board/freedoko/Manifest +++ b/games-board/freedoko/Manifest @@ -1,22 +1,19 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX Fix_Cardset_Make.patch 498 RMD160 2000df1c9401800fd11abdfdaa6f459a3125c576 SHA1 c372123f4f101564cf749f340469566292d91481 SHA256 933b819fdd660a8a7ac5bec560f5b6047732351847c61970c8c9e40652cec39a AUX freedoko-0.7.3-gcc43.patch 2341 RMD160 84624fe9331b75ba4214240b1fc83183820ab08c SHA1 18847e1886b86196834c7af9877a37c8c96e14f4 SHA256 ad216056be382fc1d5eb01f0d737d0155e16149d05a8c1e1b5360f973f93bebb +AUX freedoko-0.7.8-gentoo.patch 2794 RMD160 0c9e1f25786fadd9456518f77ebfabce1e8a5c0e SHA1 56023951b9ef7337ef41bf55da6fb2b693804241 SHA256 0a078230ff95a4ab747eb1c015af5ac8c1130b49126e526f3dd931cf818597b9 AUX nodoc.patch 368 RMD160 220eb20e38556d2b029092a91f698a0150bc9974 SHA1 471f5def092b812f49d2d7019c4e86eea7e70d6e SHA256 c31e2c78a9a6f81c2e0db5c8a5943ffd68146df6fcd2705410bff21b6236a3f6 AUX nonet.patch 421 RMD160 c283ea36b61cda2e98fe9f89d21118e207fbf256 SHA1 f0fc2a78a438625382bc8d5f728a7792b0ab7e2e SHA256 72fe58f2afd6bff66776bfe6f7045b39e8264e684cf15a001a28bc992d041289 AUX portage-cxx.patch 481 RMD160 629a23c217f468b9c4f30f1b713a03da3d6a472b SHA1 9b75cfa34f67cbdd1481ea459dc966643a69ee69 SHA256 cca8736b219e27d02b0ca82f11cbb8030b48128bf255d845b6277806347770d7 DIST FreeDoko_0.7.3.src.zip 2759310 RMD160 1c9a4c84d06a2941aa910438cfbd64afab34e7ec SHA1 7f051c97cac2035b646f592b333017e8259cfb71 SHA256 ea5cb508be0f2935caa4142401971d88d568221dd811a712fc0bef7c9f963fdd +DIST FreeDoko_0.7.8.manual.zip 7153951 RMD160 0b1164ddb885ccb8907d75f3c30080105aeaeefe SHA1 c6b04d7d7d8093cf8e932ea5eb41937f4db976ff SHA256 ec418608a663b31f99f758dce4034f65a2a7da0594ec50657c71c518733203d3 +DIST FreeDoko_0.7.8.src.zip 9259311 RMD160 fc82919da922fda201b37af26dce674475992e32 SHA1 ffa9a7698576c2caa70aa2ec3ff1ac36a3823da5 SHA256 0434a2ce065808a80f0bb1137d1eed580025389e984d693b0fe19fcd816b424a +DIST freedoko-backgrounds.zip 1067740 RMD160 dc47449484d41d8c7519c479c0cf697b691bca91 SHA1 7adcc96b14e6d61e2c0161a46b5905163e8268e8 SHA256 70129744d330976da17675b59ad3f2bc088e77a7b6b8279e866da8e74ed385ee +DIST gnome-games.zip 3338038 RMD160 5104a63fc1ce64b3017d6f64e1829393fbe9326c SHA1 ca1a5758cc1a84ec951bb80da1d2f0eb159db833 SHA256 bf4ba39f8a95f8881c58327803ff144181f6100f9bd1ad9c383b8d500dc32cf8 DIST kdecarddecks.zip 3370611 RMD160 c99a94e52e697c49068a31a0fc10acca7f528c86 SHA1 d01d92bdeb6fa1c9d73987269484940319353970 SHA256 07b17aaef44c5643b12089da7ffd8f8b18f8f5541e7d01fc04e53c964780cdac +DIST openclipart.zip 1251509 RMD160 6f1738994a20c42078d1c475978bfb56118143a6 SHA1 ca188615c68a54d190e4494d82deadd28f78c140 SHA256 68b1c83e7c8325d5d2dfd4cc846571640d21af820fb675e253f8834436e15d3a DIST pysol.zip 26314316 RMD160 0ceb36c33e3de983e7a60df13367857fe14ddba7 SHA1 2ebe408cdfa9e40277727033fe7306438976c120 SHA256 94d0e2d6aa13e5b007efaf08af0f506f48708e3243186db77f23e2e4660c0aa6 DIST xskat.zip 666085 RMD160 c4e10c6ca9753a544fa1197d45a6759363742f7e SHA1 af209c9b1b8b33bae657e049d146d58541296fad SHA256 77cd3d7b3305ef1c201963e512557637929b394f4c1b19d838395dda3c9f8a1d -EBUILD freedoko-0.7.3.ebuild 2791 RMD160 1b44a7f29ea3906f37ae9f45496663df9363325c SHA1 c8a0aa1834d6290f807078deb19563de3f39da5b SHA256 fc885deb01d8be67dfbce2692d9a716c7307ea3defac764938d68f167a073f7c -MISC ChangeLog 1335 RMD160 0a61705041fcc1c5d4a0cab25ac7bc148d256156 SHA1 66a30fedf2d7ecb57c825c0d2d35e469fd1a9474 SHA256 2c4fd914778c833059c2fcba25e7ce22f9fd30f3968d8f982fc596a828e9077b -MISC metadata.xml 580 RMD160 bf5e93ea7362a7694ef89b22a04ad8a05e27c50e SHA1 6b2e80c4b517fd0b1ea71c9754a179f286201110 SHA256 2f1b0c07f4dd8ed2e9c050cd126ebae9b9a59e476dc6c1e87fe3e201b713d373 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkkbMWsACgkQSYz9rjec82aSYwCgi6AAxLM37C4V7tY2ucySlT8O -jwYAoL4bOiKWWJa9Lo9YOhUlhR10qoPy -=10XU ------END PGP SIGNATURE----- +EBUILD freedoko-0.7.3.ebuild 2816 RMD160 6fb6e8db14f0e4605975ecaadbb8d589007e8cdf SHA1 eb6bb97e25232c7e7948913b47b51ee29cae4da4 SHA256 cadad165c80726faaeeccf9227a4743553375601211d7967bbed4192a79f5a85 +EBUILD freedoko-0.7.8.ebuild 2744 RMD160 d7207f2accdc58c800760374f9de6761bd8d4a37 SHA1 ffa235e6751402127f32251169d10aa1afa95749 SHA256 43fedc851286b394876b8a689aea0de27fb307eb6731bc5eae830b6fd6eaf6cc +MISC ChangeLog 1527 RMD160 8bceda9126fe2a2940880b8a620dc70366278b54 SHA1 4475735c94a1ecf629d5eb1e633cb859a0a97234 SHA256 377ff4109db58dd1d557819ac8f8126734a5c686d96eee03f111a16801670713 +MISC metadata.xml 812 RMD160 327da3de98448fbdc2b7500068c92e271c8f800b SHA1 8a302887b177ea28c3d9b3ac98d600edbed72b60 SHA256 1bd6d63d2ea73b8f88010dda41e0fe534f1eec00145fd3188fcbd8d33c8a30e4 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::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::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" Use the Altenburg card set - Use the KDE card set + Install the KDE card set Enable network game support - Use the PySol card set - Use the XSkat card set + Install the PySol card set + Install the XSkat card set + Install the gnome-games card set + Install the openclipartcards card set + Install additional background images