From aa3411e241a201d53a2689766fe419f2756819f3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Mar 2019 17:22:19 +0000 Subject: gentoo resync : 24.03.2019 --- games-puzzle/bastet/Manifest | 7 ++-- games-puzzle/bastet/bastet-0.43.2.ebuild | 37 ++++++++++++++++++++++ games-puzzle/bastet/bastet-0.43.ebuild | 32 ------------------- games-puzzle/bastet/files/bastet-0.43-gentoo.patch | 15 --------- .../bastet/files/bastet-0.43.2-Makefile.patch | 33 +++++++++++++++++++ .../bastet/files/bastet-0.43.2-boost_include.patch | 33 +++++++++++++++++++ 6 files changed, 107 insertions(+), 50 deletions(-) create mode 100644 games-puzzle/bastet/bastet-0.43.2.ebuild delete mode 100644 games-puzzle/bastet/bastet-0.43.ebuild delete mode 100644 games-puzzle/bastet/files/bastet-0.43-gentoo.patch create mode 100644 games-puzzle/bastet/files/bastet-0.43.2-Makefile.patch create mode 100644 games-puzzle/bastet/files/bastet-0.43.2-boost_include.patch (limited to 'games-puzzle/bastet') diff --git a/games-puzzle/bastet/Manifest b/games-puzzle/bastet/Manifest index caac8ee082e3..de808fae8bed 100644 --- a/games-puzzle/bastet/Manifest +++ b/games-puzzle/bastet/Manifest @@ -1,4 +1,5 @@ -AUX bastet-0.43-gentoo.patch 474 BLAKE2B e05a58a66f3cb5df6dcbbb00c550ed322ee526b207f1e564edfb41af597eeccab1e80b5c45204d37ac73d4f46bd472c5bd1ede35f3a5a7bffaba51ef4bfa8c99 SHA512 8d381ecb59f141cfc16f64ec21eac18d91ece99e01e2ae327117545c8ea354e6e50a17cf966e43dc7bb5fe7ec6b1b3008fcf385098a222791cb15ec67bab400b -DIST bastet-0.43.tgz 29115 BLAKE2B df8c866da77be5ecbee9ed24c26f506a26d84a218af3916ece8e6b1ea18dc6ff51e3d76a9553ddfe404212e0bed63073892cb53bdbd334e207ee115877ae4989 SHA512 a3683c2cea4df592d9cef2be1b0006acc2b6eddbe6b64aba1c21e81ba39df9bcff6494e0949b67a84f3d1a0fa6837f0d1b7cebb2eb8a551b54392e4a45f2e172 -EBUILD bastet-0.43.ebuild 732 BLAKE2B dd2a3dccf5853d8a5da1711b52ac867c284045857a19c2686b4926eccf3ab37a9ca104540a4ab1e868837160d5df1b807e46941e9068ab4a40af26bed35e01f7 SHA512 900f6161e7232a30624cc82eba64f534a4e8fa67111019f16abd515be3e962c54835da90163f0ff599faaf4149ea5ee3065a4d0ee0373168542a7cab7f8a889a +AUX bastet-0.43.2-Makefile.patch 1064 BLAKE2B 01fd876030b450c2b6cff52ce0547cdf886f52952ac1aaf5e2deec1f9eecea598aff541ffddbc1ce3b8c90831938aed3257ec868c097a39b03dceec0aae2bba2 SHA512 803e4ab5e2201bbb905dc5527bf5a1b233fbfb63a1cbcf3a74c3521bb63fb9fd95b92e6d61ecee2bf417917d27bb96c538106849b18e44ec58dbcabe496b8de0 +AUX bastet-0.43.2-boost_include.patch 1049 BLAKE2B 46cc528ffbe1b26c71aae5c70941869260e268b294c9dcfe8d565a1a6c03d1c3ab90ca7f7e45553e3b3d90b98ad384925542727ef725b042eb16e141c0382832 SHA512 98008a5781ba27dc318dc991921fe834241b92c493d72b713027834a96fba236e6326aee3c57101b52d53246a3669638ea5a404e8d0da76fcacd5543ede316e3 +DIST bastet-0.43.2.tar.gz 87496 BLAKE2B 3d599751740af033b44aa9266a9c5782223aafc6d9ac104d92acb41a1642fd0f80867b7d2abfcdca2f39acffd68c17af40057fa45b2d3303285f966b4ac7d442 SHA512 e81ca8bf674b537b539b7f6b35b1233a714f03750ce1b3947f84e70ca5f98ed4583902e7b4800c5bdde66ee95a4ef8ed0f5854675c2d149cd26d2498dc187a41 +EBUILD bastet-0.43.2.ebuild 759 BLAKE2B 7394c9b59e89728c45281750b4aa4a1c0d0ede9ec2f026246699a5393e2ffb6b5be1bce76436ff13bc49172241d7a854e61ad4557e739e93b9c595778fd29a42 SHA512 661846be875a89c4d898b9eb7a292829124ef59a0e394751cbf50bd02cd2ff932ada7bdb67e8bf35cebfd7f6b721c78215a824736970ad13604b69bb07f355c7 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-puzzle/bastet/bastet-0.43.2.ebuild b/games-puzzle/bastet/bastet-0.43.2.ebuild new file mode 100644 index 000000000000..13a2fe47c44e --- /dev/null +++ b/games-puzzle/bastet/bastet-0.43.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="a simple, evil, ncurses-based Tetris(R) clone" +HOMEPAGE="http://fph.altervista.org/prog/bastet.shtml" +SRC_URI="https://github.com/fph/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="" + +DEPEND=" + sys-libs/ncurses:0= + dev-libs/boost:0= +" +RDEPEND="${DEPEND}" + +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.43.2-Makefile.patch + "${FILESDIR}"/${P}-boost_include.patch +) + +src_install() { + dobin bastet + doman bastet.6 + dodoc AUTHORS NEWS README + dodir /var/games + touch "${ED}/var/games/bastet.scores" || die "touch failed" + fperms 664 /var/games/bastet.scores +} diff --git a/games-puzzle/bastet/bastet-0.43.ebuild b/games-puzzle/bastet/bastet-0.43.ebuild deleted file mode 100644 index c395170fbcbe..000000000000 --- a/games-puzzle/bastet/bastet-0.43.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils games - -DESCRIPTION="a simple, evil, ncurses-based Tetris(R) clone" -HOMEPAGE="http://fph.altervista.org/prog/bastet.shtml" -SRC_URI="http://fph.altervista.org/prog/files/${P}.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="" - -DEPEND="sys-libs/ncurses:0 - dev-libs/boost:0" -RDEPEND=${DEPEND} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch -} - -src_install() { - dogamesbin bastet - doman bastet.6 - dodoc AUTHORS NEWS README - dodir "${GAMES_STATEDIR}" - touch "${D}${GAMES_STATEDIR}/bastet.scores" || die "touch failed" - fperms 664 "${GAMES_STATEDIR}/bastet.scores" - prepgamesdirs -} diff --git a/games-puzzle/bastet/files/bastet-0.43-gentoo.patch b/games-puzzle/bastet/files/bastet-0.43-gentoo.patch deleted file mode 100644 index db7671592224..000000000000 --- a/games-puzzle/bastet/files/bastet-0.43-gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.old 2010-12-02 15:43:29.000000000 +0100 -+++ Makefile 2010-12-02 15:47:18.000000000 +0100 -@@ -11,10 +11,10 @@ - depend: *.hpp $(SOURCES) - $(CXX) -MM $(SOURCES) > depend - --include depend -+-include depend - - $(PROGNAME): $(SOURCES:.cpp=.o) -- $(CXX) -ggdb -o $(PROGNAME) $(SOURCES:.cpp=.o) $(LDFLAGS) -lboost_program_options -+ $(CXX) ${CXXFLAGS} -o $(PROGNAME) $(SOURCES:.cpp=.o) $(LDFLAGS) -lboost_program_options - - clean: - rm -f $(SOURCES:.cpp=.o) $(PROGNAME) diff --git a/games-puzzle/bastet/files/bastet-0.43.2-Makefile.patch b/games-puzzle/bastet/files/bastet-0.43.2-Makefile.patch new file mode 100644 index 000000000000..d3cac50adc2b --- /dev/null +++ b/games-puzzle/bastet/files/bastet-0.43.2-Makefile.patch @@ -0,0 +1,33 @@ +--- bastet-0.43.2/Makefile ++++ bastet-0.43.2/Makefile +@@ -2,8 +2,10 @@ + MAIN=main.cpp + TESTS=Test.cpp + PROGNAME=bastet ++PKG_CONFIG?=pkg-config + BOOST_PO?=-lboost_program_options +-LDFLAGS+=-lncurses $(BOOST_PO) ++NCURSES_LIBS=$(shell $(PKG_CONFIG) --libs ncurses) ++LIBS=$(NCURSES_LIBS) $(BOOST_PO) + #CXXFLAGS+=-ggdb -Wall + CXXFLAGS+=-DNDEBUG -Wall + #CXXFLAGS+=-pg +@@ -12,15 +14,15 @@ + all: $(PROGNAME) $(TESTS:.cpp=) + + Test: $(SOURCES:.cpp=.o) $(TESTS:.cpp=.o) +- $(CXX) -ggdb -o $(TESTS:.cpp=) $(SOURCES:.cpp=.o) $(TESTS:.cpp=.o) $(LDFLAGS) ++ $(CXX) $(CXXFLAGS) -o $(TESTS:.cpp=) $(SOURCES:.cpp=.o) $(TESTS:.cpp=.o) $(LDFLAGS) $(LIBS) + + depend: *.hpp $(SOURCES) $(MAIN) $(TESTS) + $(CXX) -MM $(SOURCES) $(MAIN) $(TESTS)> depend + +-include depend ++-include depend + + $(PROGNAME): $(SOURCES:.cpp=.o) $(MAIN:.cpp=.o) +- $(CXX) -ggdb -o $(PROGNAME) $(SOURCES:.cpp=.o) $(MAIN:.cpp=.o) $(LDFLAGS) ++ $(CXX) $(CXXFLAGS) -o $(PROGNAME) $(SOURCES:.cpp=.o) $(MAIN:.cpp=.o) $(LDFLAGS) $(LIBS) + + clean: + rm -f $(SOURCES:.cpp=.o) $(TESTS:.cpp=.o) $(MAIN:.cpp=.o) $(PROGNAME) diff --git a/games-puzzle/bastet/files/bastet-0.43.2-boost_include.patch b/games-puzzle/bastet/files/bastet-0.43.2-boost_include.patch new file mode 100644 index 000000000000..d1c8d5774cc0 --- /dev/null +++ b/games-puzzle/bastet/files/bastet-0.43.2-boost_include.patch @@ -0,0 +1,33 @@ +From 0e03f8d4d6bc6949cf1c447e632ce0d1b98c4be1 Mon Sep 17 00:00:00 2001 +From: Federico Poloni +Date: Wed, 4 Oct 2017 19:35:01 +0200 +Subject: [PATCH] Changed source of unordered_set (should hopefully fix #6 + without reopening #1) + +--- + BastetBlockChooser.hpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/BastetBlockChooser.hpp b/BastetBlockChooser.hpp +index 992e556..7ee3b7c 100644 +--- a/BastetBlockChooser.hpp ++++ b/BastetBlockChooser.hpp +@@ -23,8 +23,7 @@ + + #include "Well.hpp" + +-#include +-#include ++#include + #include + + namespace Bastet{ +@@ -75,7 +74,7 @@ namespace Bastet{ + public: + Searcher(BlockType b, const Well *well, Vertex v, WellVisitor *visitor); + private: +- std::tr1::unordered_set _visited; ++ boost::unordered_set _visited; + //std::set _visited; ^^ the above is more efficient, we need to do many inserts + BlockType _block; + const Well *_well; -- cgit v1.2.3