diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2014-03-20 20:44:29 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2014-03-20 20:44:29 +0000 |
commit | 716d7e5f52bfdcdfc10dc2cf2bd559df6a341145 (patch) | |
tree | d30011a180a4f48de00f2c1f077ce43a500f24fd | |
parent | Fixed hpn patch to not add a false patch level to ssh's version string (6.6p2... (diff) | |
download | gentoo-2-716d7e5f52bfdcdfc10dc2cf2bd559df6a341145.tar.gz gentoo-2-716d7e5f52bfdcdfc10dc2cf2bd559df6a341145.tar.bz2 gentoo-2-716d7e5f52bfdcdfc10dc2cf2bd559df6a341145.zip |
old
(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
-rw-r--r-- | games-board/freedoko/ChangeLog | 9 | ||||
-rw-r--r-- | games-board/freedoko/files/freedoko-0.7.10-gcc47.patch | 10 | ||||
-rw-r--r-- | games-board/freedoko/files/freedoko-0.7.10-gentoo.patch | 61 | ||||
-rw-r--r-- | games-board/freedoko/freedoko-0.7.10.ebuild | 88 |
4 files changed, 7 insertions, 161 deletions
diff --git a/games-board/freedoko/ChangeLog b/games-board/freedoko/ChangeLog index 4b8937fa7dda..8eb2ba9a40e0 100644 --- a/games-board/freedoko/ChangeLog +++ b/games-board/freedoko/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-board/freedoko -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/ChangeLog,v 1.24 2013/12/24 12:47:38 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/ChangeLog,v 1.25 2014/03/20 20:44:29 mr_bones_ Exp $ + + 20 Mar 2014; Michael Sterrett <mr_bones_@gentoo.org> + -files/freedoko-0.7.10-gcc47.patch, -files/freedoko-0.7.10-gentoo.patch, + -freedoko-0.7.10.ebuild: + old 24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> freedoko-0.7.11.ebuild: Stable for x86, wrt bug #490644 diff --git a/games-board/freedoko/files/freedoko-0.7.10-gcc47.patch b/games-board/freedoko/files/freedoko-0.7.10-gcc47.patch deleted file mode 100644 index 5fc4292f81cb..000000000000 --- a/games-board/freedoko/files/freedoko-0.7.10-gcc47.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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.10-gentoo.patch b/games-board/freedoko/files/freedoko-0.7.10-gentoo.patch deleted file mode 100644 index fcc47516f50c..000000000000 --- a/games-board/freedoko/files/freedoko-0.7.10-gentoo.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- 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.10.ebuild b/games-board/freedoko/freedoko-0.7.10.ebuild deleted file mode 100644 index 88de5544018d..000000000000 --- a/games-board/freedoko/freedoko-0.7.10.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.10.ebuild,v 1.6 2012/09/24 08:45:18 tupone 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: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 || 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 -} |