From 121ed4eec41fbf03e1998d09eede1bf449da63b9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jul 2019 22:05:27 +0100 Subject: gentoo resync : 19.07.2019 --- games-misc/Manifest.gz | Bin 12991 -> 12988 bytes games-misc/OilWar/Manifest | 2 +- games-misc/OilWar/OilWar-1.2.1-r2.ebuild | 11 +++---- games-misc/robotfindskitten/Manifest | 5 ++-- .../robotfindskitten-2.7182818.701-gentoo.patch | 32 +++++++++------------ .../robotfindskitten-2.7182818.701-tinfo.patch | 20 +++++++++++++ .../robotfindskitten-2.7182818.701-r1.ebuild | 18 ++++++++---- 7 files changed, 55 insertions(+), 33 deletions(-) create mode 100644 games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-tinfo.patch (limited to 'games-misc') diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz index 14eb66f1ae7a..f4a37200a18f 100644 Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ diff --git a/games-misc/OilWar/Manifest b/games-misc/OilWar/Manifest index c7dee6f042e9..9a4ff5f7e3fc 100644 --- a/games-misc/OilWar/Manifest +++ b/games-misc/OilWar/Manifest @@ -1,4 +1,4 @@ DIST OilWar-1.2.1.tar.gz 515013 BLAKE2B 44c7950168e9ba9d7cc0c068ca0abeba4249bbab43d89663bcf2e752e10e680a7ea8a09eb2c983ce5948e65e0609cd9de920997eddf45702e54109819c019137 SHA512 303581caf1cb59a4623b136595e0c1af6f682ae4c059a8848b481b42dee622083d436edb86ca9073edcf4c573f8a73b284dddea89cb8013943ef4ec81b3e17a1 DIST OilWar.png 2961 BLAKE2B c7270884148e8712b93c44de532a902e807a58507ba5fd509ad020556d90d9a54d24a3243ced7c1de3d41635654397747cbd79d93e82ad6fa231c7eb9c0fb14e SHA512 75bd4c18791593f0bb81b51d87f6f033e2ebebe6de3653276b14e852d3625f01a61fb34257eb3d15ebf265908563f2820793b84196138b39c9329839e8fefe2d -EBUILD OilWar-1.2.1-r2.ebuild 1151 BLAKE2B 6305f09b29baca9f586e1a442caec98792a5a09e702a2ea2adb367ae1611e9a4f3b7f9309fc0c29bfb769fd0ab26c1c688c67ad0d0a0a42e3c40a2e380c67c6f SHA512 fdf072c461e7fc59b418d5db568204b3cf3fd916785734d67e0eda7a038b84c1271a6ba58029c5b50dd1abee49d1833a18d135579c09f056d394c71b07771a15 +EBUILD OilWar-1.2.1-r2.ebuild 1125 BLAKE2B ad7829f1b6de9fe76fa594f2a9444745cbc4c37db40d301728c0352d753c64413b10b2042d8074ec80aeec632031b681006884227bca2e7a88bd991425e182dc SHA512 f07929a0cfe9b28a451936debd4c6b2d4e0a221314c40db527d6b864ae8b7c00b5d7c430242d88b154879f11f5f8c9f6853564d9069c914b69d938903d7c04cc MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-misc/OilWar/OilWar-1.2.1-r2.ebuild b/games-misc/OilWar/OilWar-1.2.1-r2.ebuild index 4b1a9829d608..4e28b012ebf7 100644 --- a/games-misc/OilWar/OilWar-1.2.1-r2.ebuild +++ b/games-misc/OilWar/OilWar-1.2.1-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils gnome2-utils user +inherit eutils gnome2-utils DESCRIPTION="Evil army is attacking your country and tries to steal your oil" HOMEPAGE="http://linux.softpedia.com/get/GAMES-ENTERTAINMENT/RTS/OilWar-15354.shtml" @@ -14,15 +14,12 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="media-libs/libsdl[video] +DEPEND="acct-group/gamestat + media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-mixer" RDEPEND="${DEPEND}" -pkg_setup(){ - enewgroup gamestat 36 -} - src_prepare() { default diff --git a/games-misc/robotfindskitten/Manifest b/games-misc/robotfindskitten/Manifest index dea7203d6ea1..107f525811c1 100644 --- a/games-misc/robotfindskitten/Manifest +++ b/games-misc/robotfindskitten/Manifest @@ -1,4 +1,5 @@ -AUX robotfindskitten-2.7182818.701-gentoo.patch 872 BLAKE2B b741d5ac234798e46436f3f0cad615e4abebc3199bc44cc4dffb622e33f42c66430a452256ede3f1c8a6d452445714a053fff246597f2c4a5a84bcc3fe3c6ecf SHA512 4189fc914f7047599f45b8f6a00968159e14a8c14d3e40f62e217c30ad96db5ab38f389f7cac608db27ba8f67c9841ac8a0927e2654dba9c1e04d997936ce8c2 +AUX robotfindskitten-2.7182818.701-gentoo.patch 671 BLAKE2B 51043d6973dcfe61cd2343ec5bc576f7ebd9d10a48a92a73e61f947baff933f6b7118431d14e3e9e7e5f28b5bf7c22bf36acec740b4b59f7276dbc36f6a8cfb8 SHA512 f76683a61aba34b7ba87354b9561791ef13756caac6a15c6af9ffc30017dbfa7e3fd02c4ce5887a7bbc8c27b88a6c61413c244a5daa65f9bea1640369dac8ed2 +AUX robotfindskitten-2.7182818.701-tinfo.patch 475 BLAKE2B 5b1bdfa15e1f18b70366912d396618485fe806f7c07acc0af6c37c1cf6ae05ac9eee0ff5ff14d152895f7f9da55aadfca19a27903876c98e28cd293e48eb08cf SHA512 c108f39fc0ec8d84e64cc5d59e11eb95c048abc1dd63c1f9acccbee9b55e2e43c4ea48392d3358c09f5e61a3587110458965dcb595b5ce3719eeb73658f7c763 DIST robotfindskitten-2.7182818.701.tar.gz 437810 BLAKE2B d34a72c4120562844e17441ba8e2c4a04863ad5241c04425cf5a83296b047d2b5c0c52d6dbaab253be37534fd4de2f6a0d6cf8dd19124695805b457320b45c32 SHA512 736e44a62f016fb2a0dd03e31e6f1fb7c50a9115182812518666f3e4ad69f5703d7018f28ab14e0cfdbc8741656b15fa6ee577c2a5920e0d9af9acb658ac620b -EBUILD robotfindskitten-2.7182818.701-r1.ebuild 522 BLAKE2B 2cb974c5427a63ae65f2b359c71137ea0d199e00e1d3cc8cfa05ecc0eabf882376c3c5e6a836e51eeba4793a493674ee1ad3c85a5d094cee85eed39c6e1a528d SHA512 7a80e3531a33086aa4a0c8a68a59bcad76a8c2b767df3be94de2258c416630a9bdbf12c464629d01f958f6360ab8691579a5db139fae8cbbc8c55963ecea994a +EBUILD robotfindskitten-2.7182818.701-r1.ebuild 627 BLAKE2B ae0ebc3bac1b7d8f4ed4ea0646c2a5d0fff297ae9087f573838c0b47a02452cc6778d52acb1b42ad935dbaf2a3ff9f50743e1efd04f3370078caccdd3bcf819d SHA512 fd9012237e351d317da4b9f65b0b5de58995fb47a59afddbbbd64318b5f1775b2baa786ce4ff25abebcdb13be6d641909e481fb44250d601aafcecfd44ed68fe MISC metadata.xml 326 BLAKE2B b7e04ad279076c022578833b14abb5f00e1decebe7e7a09f687f03c15cc71e81d1f418d5e81ece7965fff067b1ca42dea0e53f24d65dfc6b55a8e6a5f330b7ee SHA512 1620797c8b2a84b0711c6bda03a739a5a6b1fc5f527077224fe0f3d0e462260d3aa0d1516d11f0dc723f4ad74072cfb5e5e1550c00c4001f78e78b4e3d827080 diff --git a/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-gentoo.patch b/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-gentoo.patch index 6f5aa29a9f51..07e801e2d765 100644 --- a/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-gentoo.patch +++ b/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-gentoo.patch @@ -1,24 +1,20 @@ ---- robotfindskitten-2.7182818.701.orig/nki/Makefile.in -+++ robotfindskitten-2.7182818.701/nki/Makefile.in -@@ -197,7 +197,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ +--- robotfindskitten-2.7182818.701/nki/Makefile.am ++++ robotfindskitten-2.7182818.701/nki/Makefile.am +@@ -1,4 +1,4 @@ -nkidir = $(datadir)/games/robotfindskitten +nkidir = $(datadir)/robotfindskitten nki_DATA = vanilla.nki - all: all-am ---- robotfindskitten-2.7182818.701.orig/src/Makefile.in -+++ robotfindskitten-2.7182818.701/src/Makefile.in -@@ -199,8 +199,8 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --execgamesdir = $(prefix)/games + uninstall: +--- robotfindskitten-2.7182818.701/src/Makefile.am ++++ robotfindskitten-2.7182818.701/src/Makefile.am +@@ -1,7 +1,7 @@ +-execgamesdir= $(prefix)/games ++execgamesdir= $(bindir) + execgames_PROGRAMS=robotfindskitten + -AM_CPPFLAGS = -DSYSTEM_NKI_DIR=\"$(datadir)/games/robotfindskitten\" -+execgamesdir = $(bindir) +AM_CPPFLAGS = -DSYSTEM_NKI_DIR=\"$(datadir)/robotfindskitten\" - robotfindskitten_SOURCES = robotfindskitten.c - SPLINT_SUPPRESSIONS = +charintliteral +charindex - all: all-am + + robotfindskitten_SOURCES= robotfindskitten.c + #robotfindskitten_LDADD= -lncurses diff --git a/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-tinfo.patch b/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-tinfo.patch new file mode 100644 index 000000000000..4ceef27ac948 --- /dev/null +++ b/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-tinfo.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/690114 + +--- robotfindskitten-2.7182818.701/configure.in ++++ robotfindskitten-2.7182818.701/configure.in +@@ -11,9 +11,14 @@ + AC_PROG_CC + AM_PROG_LIBTOOL + AC_PROG_INSTALL ++PKG_PROG_PKG_CONFIG + + dnl Checks for libraries. +-AC_CHECK_LIB(ncurses, initscr, ,curses) ++PKG_CHECK_MODULES(NCURSES, ncurses, [ ++ LIBS="$LIBS $NCURSES_LIBS" ++ ],[ ++ AC_MSG_ERROR([Cannot find ncurses lib]) ++ ]) + + dnl Checks for header files. + AC_CHECK_HEADERS(signal.h) diff --git a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701-r1.ebuild b/games-misc/robotfindskitten/robotfindskitten-2.7182818.701-r1.ebuild index a6195c2f7a8a..66f4a379e6ed 100644 --- a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701-r1.ebuild +++ b/games-misc/robotfindskitten/robotfindskitten-2.7182818.701-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils +EAPI=7 + +inherit autotools DESCRIPTION="Help robot find kitten" HOMEPAGE="http://robotfindskitten.org/" @@ -13,13 +14,20 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="sys-libs/ncurses:0" -RDEPEND=${DEPEND} +DEPEND="sys-libs/ncurses:0=" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-tinfo.patch ) +src_prepare() { + default + eautoreconf +} + src_install() { DOCS="AUTHORS BUGS ChangeLog NEWS" \ default -- cgit v1.2.3