From ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Feb 2020 18:01:47 +0000 Subject: gentoo (leap year) resync : 29.02.2020 --- games-puzzle/Manifest.gz | Bin 16943 -> 16939 bytes games-puzzle/seatris/Manifest | 2 +- games-puzzle/seatris/seatris-0.0.14.ebuild | 4 +- games-puzzle/twindistress/Manifest | 4 +- .../files/twindistress-1.1.0-ldflags.patch | 38 ++++++++++-- .../twindistress/twindistress-1.1.0.ebuild | 65 +++++++++------------ 6 files changed, 67 insertions(+), 46 deletions(-) (limited to 'games-puzzle') diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz index 2a54a55e263b..ea9906171e33 100644 Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ diff --git a/games-puzzle/seatris/Manifest b/games-puzzle/seatris/Manifest index 2faca1e489c0..740b8ac30545 100644 --- a/games-puzzle/seatris/Manifest +++ b/games-puzzle/seatris/Manifest @@ -1,4 +1,4 @@ AUX seatris-0.0.14-as-needed.patch 215 BLAKE2B 3d2ea91214f6f00ec767aa00bfce6c77c7a42132a94f0e394d0a7f89c1eeaa3ff9d8638cce1321f6fb97bec614fbdb0f07fcbc68a2cd65fbd48373887aaa5846 SHA512 587f8f4f555b6a97d38a0c7bb8069674e6612ff5e3027b7c7327a02178aabdc20a6d32f63b7a667eac31480e435f575844afdd79523707d0fcf586417d8fd38b DIST seatris-0.0.14.tar.gz 53056 BLAKE2B 8efbc4531f98f06857815c86e2833ede03de3206bfc89efe387e2b388252c05d11b404e4a72fe6b33f215908cf03bc5687c627fa61943cb549c59bfb82455939 SHA512 105722ddbeaa8ae3863331126cf816e7d590ebe4ca244b32d3275071c2537c2865183a90f60f8dbf46cfacbcee4e811b653ff9cc6d2eae51c9ed6efa9263fac2 -EBUILD seatris-0.0.14.ebuild 916 BLAKE2B 13f466c641404c7abd4c2dddeae48c93dceef273c709291b803d49caef50013bfdf437c079c79fd42352c4b5e865a0bad5b7548b73c979ff4dd7b28eb283086e SHA512 a4fd27855ebd40034b4d7878dd953019148d6c5ed7b1403c4a75b2ead6c8840b0776ab2bf340348268ee1dc9eb440841acf77f237728d5c41e89976e3347378f +EBUILD seatris-0.0.14.ebuild 912 BLAKE2B 8d64cfe1eaf2152baacfefaef54a78d3eb09f2b20ca92bc794d1a30671e4122ba85c9016797adc4ebd855ec6c175ea125d7c603a4b31c0aeafaf42cfcef699bf SHA512 0662065d8e7ba815074e0609078833aaa549f6a6e1370cced0bad5cf4604bdc54aae9ea0627c3db4d2e3bd91106716badbce6e786cec62c02d5551c90b60ebd7 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-puzzle/seatris/seatris-0.0.14.ebuild b/games-puzzle/seatris/seatris-0.0.14.ebuild index 30d84fd4afed..d13a963fa7c4 100644 --- a/games-puzzle/seatris/seatris-0.0.14.ebuild +++ b/games-puzzle/seatris/seatris-0.0.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -28,7 +28,7 @@ src_compile() { emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" } -src_install () { +src_install() { dogamesbin seatris doman seatris.6 dodoc ACKNOWLEDGEMENTS HISTORY README TODO example.seatrisrc diff --git a/games-puzzle/twindistress/Manifest b/games-puzzle/twindistress/Manifest index 1eb8b6364ce8..f1fed05c5a13 100644 --- a/games-puzzle/twindistress/Manifest +++ b/games-puzzle/twindistress/Manifest @@ -1,5 +1,5 @@ -AUX twindistress-1.1.0-ldflags.patch 372 BLAKE2B 7966bd989fefdc13bf433f33ebcbada98723990d7779f6674a8ded1952ffcaf522b0c9df1795773f25e511fe22a8c9b33f31563cb0261e9a3eaaae040829d497 SHA512 5c19ffcfe2e9a451e95ac4d03da20cf54bf46ddc7bd369cc9e6c49a3215f8c39f50632d9e60167389859156c4df35ed7b813e1beb7a884c8ec0198f56a8d9f56 +AUX twindistress-1.1.0-ldflags.patch 1434 BLAKE2B cb30b0231ee143592b363eff803ed2d1a4b6ad2fb2da4c50490486a4e66afcc6dabe1ef851adbf7edc403fbb99ca93732277b0896be8c1f98b9d700b91a616a3 SHA512 5468984f7635a6dfe0b3871cf414a377cea01490b9956c171f1702b6d3266167247c6dafb122480719ab927528d3ef5879747d69462bac2c63a1b3e8de73a8f8 AUX twindistress-1.1.0-warnings.patch 3342 BLAKE2B 3c96cb1a4f9c8073f493798ff653a7172294ceac58a283f08f12183cae498e3d2ef3f1bb091a7d18ade256d1ab7652baf4f3d9b743422382652292cf458c9566 SHA512 20bb973c6dea47436333f9449c7b924c38744e74b8eed6646062e4a48c74156cba8fd17150f5a4f8dc19de68ee1c394eee8aa0f2f867a72bddbbb32278e9c304 DIST twind-1.1.0.tar.gz 2837845 BLAKE2B 2c5d0eff1fba42be02aeece2552f343ecfbba9e14484f78d3ef1acc08f313cb3bd9cfc7c4bc2033697bd3ae7792853d1c1206dc3b8e374215eb7d89365dae02b SHA512 f1b3be3e5706ce244dd291b6fba2160605593e51b60344521025daf882509e164aa5c201c8d696e56a64d6f3525d16ecd3fd78cc1b86f39f401d4137b615fe8f -EBUILD twindistress-1.1.0.ebuild 1379 BLAKE2B 00dc5e4866c8dec94aad7a148819cfa9b4a3c2492afa3c533172cf897778fb012056c4f0c930022a882150135ebf1bc2c7b5da0df74edd58bcd5929b52d8ec06 SHA512 48ceef2f202934a39dd5920f5e20dd0db6b538a69173a07641a55e3102bdde4cf4ad0732344dec423efea875b650ff82f181d260da34def12d9798902dd1b215 +EBUILD twindistress-1.1.0.ebuild 999 BLAKE2B fb02d98754936d4c595689a34d043f42bcde64a2729d61d35f03baa84122ee8ef8bd6517fc349743b9bc24f10f8e008b4dc32934a948bb2fb3c71889f3a07107 SHA512 979b30dabad85b365777f53260129c81b9bc1991cc51713d9ecc4624e48cb63bb2c4f4383c4d5b223e6c1e9b02db294ca6ec3cbcd8ae326d95af826f7d8b49f6 MISC metadata.xml 328 BLAKE2B c47ffd007164600a4f8e9ecabd1c8b29c65513a0fff46d5a4b2e2978ac8922263d3d10e6c5303e9a60e3645bb8ad030b561b1aaf5dfd5d69f4bb97998db024e7 SHA512 a7244b86047c6854bbec72296e625cc10aefa30a2e901dbc2f15083ab1532dc7b3e5fe91ae344fe8b4f0d1019b6f4c91def98cbeffb8fe4a044cc34cd9b03e38 diff --git a/games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch b/games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch index 0ac589d88368..1a77572836d2 100644 --- a/games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch +++ b/games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch @@ -1,6 +1,32 @@ ---- Makefile.old 2010-10-19 09:06:48.000000000 +0200 -+++ Makefile 2010-10-19 09:06:59.000000000 +0200 -@@ -50,7 +50,7 @@ +--- a/Makefile ++++ b/Makefile +@@ -2,20 +2,20 @@ + BIN_PREFIX = /usr/local/bin/ + # if you don't have privileges to install systemwide, comment out both + # lines below and the game will then play from the current directory +-DATA_PREFIX = /usr/local/share/games/twind/ +-HIGH_SCORE_PREFIX = /var/lib/games/twind/ ++DATA_PREFIX = $(EPREFIX)/usr/share/twindistress/ ++HIGH_SCORE_PREFIX = $(EPREFIX)/var/lib/twindistress/ + # uncomment out the EXTENSION if you don't have the png libs on your system + #EXTENSION = ".bmp" + AUDIOFLAG = AUDIO +-CC = gcc + ifdef EXTENSION +-CFLAGS = -Wall -g -DDATA_PREFIX=\"$(DATA_PREFIX)\" \ ++CPPFLAGS += -DDATA_PREFIX=\"$(DATA_PREFIX)\" \ + -DEXTENSION=\"$(EXTENSION)\" -D$(AUDIOFLAG) -DLINUX \ + -DHIGH_SCORE_PREFIX=\"$(HIGH_SCORE_PREFIX)\" + else +-CFLAGS = -Wall -g -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(AUDIOFLAG) -DLINUX \ ++CPPFLAGS += -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(AUDIOFLAG) -DLINUX \ + -DHIGH_SCORE_PREFIX=\"$(HIGH_SCORE_PREFIX)\" + endif ++CFLAGS += -Wall + LIBS = -lm + SDL_CFLAGS = `sdl-config --cflags` + SDL_LIBS = `sdl-config --libs` -lSDL_image +@@ -50,10 +50,10 @@ make twind MIXER_LIB= AUDIOFLAG=NOAUDIO twind: twind.o @@ -8,4 +34,8 @@ + $(CC) $(LDFLAGS) twind.o $(LIBS) $(SDL_LIBS) $(MIXER_LIB) -o twind twind.o: twind.c - $(CC) $(CFLAGS) $(SDL_CFLAGS) -c twind.c +- $(CC) $(CFLAGS) $(SDL_CFLAGS) -c twind.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -c twind.c + + clean: + rm -f twind *.o diff --git a/games-puzzle/twindistress/twindistress-1.1.0.ebuild b/games-puzzle/twindistress/twindistress-1.1.0.ebuild index cdc296985750..cc4e08909d20 100644 --- a/games-puzzle/twindistress/twindistress-1.1.0.ebuild +++ b/games-puzzle/twindistress/twindistress-1.1.0.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=7 + +inherit desktop toolchain-funcs MY_P="twind-${PV}" + DESCRIPTION="Match and remove all of the blocks before time runs out" HOMEPAGE="http://twind.sourceforge.net/" SRC_URI="mirror://sourceforge/twind/${MY_P}.tar.gz" @@ -12,48 +14,37 @@ SRC_URI="mirror://sourceforge/twind/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="media-libs/libsdl[video] - media-libs/sdl-mixer - media-libs/sdl-image[png]" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - sed -i \ - -e '/^CC/d' \ - -e "/^CFLAGS/s:-g:${CFLAGS}:" \ - -e "/^DATA_PREFIX/s:/.*$:${GAMES_DATADIR}/${PN}/:" \ - -e "/^HIGH_SCORE_PREFIX/s:/.*$:${GAMES_STATEDIR}/${PN}/:" \ - Makefile || die "sed failed" - epatch \ - "${FILESDIR}"/${P}-ldflags.patch \ - "${FILESDIR}"/${P}-warnings.patch + +RDEPEND=" + media-libs/libsdl[video] + media-libs/sdl-image[png] + media-libs/sdl-mixer[vorbis]" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-warnings.patch +) + +src_configure() { + tc-export CC } src_install() { - dogamesbin twind + dobin twind - insinto "${GAMES_DATADIR}/${PN}" + insinto /usr/share/twindistress doins -r graphics music sound doicon graphics/twind.png make_desktop_entry twind "Twin Distress" - dodoc AUTHORS ChangeLog CREDITS NEWS README TODO - - dodir "${GAMES_STATEDIR}/${PN}" - touch "${D}/${GAMES_STATEDIR}/${PN}/twind.hscr" - fperms 660 "${GAMES_STATEDIR}/${PN}/twind.hscr" - prepgamesdirs -} + einstalldocs -pkg_postinst() { - games_pkg_postinst - if ! has_version "media-libs/sdl-mixer[vorbis]" ; then - ewarn "Music support will be disabled since sdl-mixer" - ewarn "wasn't built with USE=vorbis" - fi + dodir /var/lib/twindistress/ + touch "${ED}"/var/lib/twindistress/twind.hscr || die + fowners root:users /var/lib/twindistress/twind.hscr + fperms 660 /var/lib/twindistress/twind.hscr } -- cgit v1.2.3