[gentoo-commits] repo/gentoo:master commit in: games-roguelike/angband/files/, games-roguelike/angband/

2020-08-10 Thread Stefan Strogin
commit: 5232b263fac17e1d5041347109706a0fad45fd28
Author: Stefan Strogin  gentoo  org>
AuthorDate: Mon Aug 10 22:22:58 2020 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Mon Aug 10 22:23:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5232b263

games-roguelike/angband: drop old 4.2.0

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Stefan Strogin  gentoo.org>

 games-roguelike/angband/Manifest   |   1 -
 games-roguelike/angband/angband-4.2.0.ebuild   | 129 -
 .../angband/files/angband-4.2.0-gcc-10.patch   |  22 
 games-roguelike/angband/metadata.xml   |   1 -
 4 files changed, 153 deletions(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index b14097e874f..17c6cad788a 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,4 +1,3 @@
 DIST angband-4.1.3.tar.gz 19924395 BLAKE2B 
573181ab9b3a01abdc34cfac9e69a757eb7558c67c9490240890bc920c6c2a8ebea6268b733f06a6e421829d807fa135131c1512edfc344610a269139cc5ac47
 SHA512 
7810e1f04e337c1b5d1ddb6013785c953e0149dfa536c75dd8816fdfd304c37a09103d653cee0c150225c6ba702e121300a65012d8034079cd41f86a730f9c2a
-DIST angband-4.2.0.tar.gz 24727127 BLAKE2B 
4bdd5cfe49080fc38b988e6606eadddc2e872ca7b01f34e692ca299a420689310e9e972355986e802e654a27837ac2621eb3bc0823b7e771dc0a851a5c5a8bc6
 SHA512 
b5c4884ce765bc45d7c21b8be06bc29c7d84c16e48341967b5d6a847f250db104ef509fc28e8887d4f1cd9ed545e504781186936a1f38931d5113e2fb58b32c3
 DIST angband-4.2.1-man.tar.gz 104660 BLAKE2B 
ac7a413b1ec29cb3740fb1e57c238a5f87b9bc6965c4180a62e4089eb4b2cf7fa8f4eb2017d605255eacbb2856e64449745144ce0d9848a3b5cfd123fa1e39da
 SHA512 
2dd9e40e6bd4804162fb810d40a81932c65d01b8c8f019e73194f83b222e3ae319fe4b22ad8f59f88cb473426ad59efd4988d0bfaf289726453fa83d678e9ae8
 DIST angband-4.2.1.tar.gz 24938593 BLAKE2B 
ecacf4bd3681f205a3eb0a5b5ddf0fb7ff92600c26dffec3fc8addaccf7da26fd4f805e5fc11803c165c35e8adff9ae6bced08381ddde0e39bc914fac043e11c
 SHA512 
e13681bcd74fa56fe5c606d62f1e9761c9fc5367194e0e46894a5ebf108e1553a1f96191e139f1574238b72c635436c3108c80bc656aba8e328fe4e5b301c6bc

diff --git a/games-roguelike/angband/angband-4.2.0.ebuild 
b/games-roguelike/angband/angband-4.2.0.ebuild
deleted file mode 100644
index f9dfb300662..000
--- a/games-roguelike/angband/angband-4.2.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg-utils
-
-MAJOR_PV=$(ver_cut 1-2)
-
-DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
-HOMEPAGE="https://rephial.org/;
-SRC_URI="https://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ncurses sdl sdl2 sound +X"
-
-REQUIRED_USE="sdl2? ( sdl )
-   sound? ( sdl )
-   || ( X ncurses )"
-
-RDEPEND="X? (
-   media-fonts/font-misc-misc
-   x11-libs/libX11
-   )
-   ncurses? ( sys-libs/ncurses:0=[unicode] )
-   sdl? (
-   !sdl2? (
-   media-libs/libsdl[video,X]
-   media-libs/sdl-image
-   media-libs/sdl-ttf
-   sound? (
-   media-libs/libsdl[sound]
-   media-libs/sdl-mixer[mp3]
-   )
-   )
-   sdl2? (
-   media-libs/libsdl2[video,X]
-   media-libs/sdl2-image
-   media-libs/sdl2-ttf
-   sound? (
-   media-libs/libsdl2[sound]
-   media-libs/sdl2-mixer[mp3]
-   )
-   )
-   )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
-
-src_prepare() {
-   default
-
-   sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
-   sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
-
-   if use !sound ; then
-   sed -i -e 's/sounds//' lib/Makefile || die
-   fi
-
-   # Game constant files are now system config files in Angband, but
-   # users will be hidden from applying updates by default
-   {
-   echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/customize/\""
-   echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/gamedata/\""
-   } > "${T}"/99${PN} || die
-
-   eautoreconf
-}
-
-src_configure() {
-   local myconf=(
-   --bindir="${EPREFIX}"/usr/bin
-   --with-private-dirs
-   $(use_enable X x11)
-   $(use_enable ncurses curses)
-   )
-   if use sdl; then
-   if use sdl2; then
-   myconf+=(
-   --enable-sdl2
-   $(use_enable sound sdl2-mixer)
- 

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/angband/files/, games-roguelike/angband/

2019-04-04 Thread Michał Górny
commit: f3045e7b24b7c267ad7152c2b964f20a59beb88d
Author: Stefan Strogin  gmail  com>
AuthorDate: Thu Apr  4 01:48:42 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Apr  5 05:13:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3045e7b

games-roguelike/angband: fix build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/679942
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gmail.com>
Signed-off-by: Michał Górny  gentoo.org>

 games-roguelike/angband/angband-4.1.3.ebuild   |  2 ++
 .../angband/files/angband-4.1.3-tinfo.patch| 29 ++
 2 files changed, 31 insertions(+)

diff --git a/games-roguelike/angband/angband-4.1.3.ebuild 
b/games-roguelike/angband/angband-4.1.3.ebuild
index 8a55a747063..29f6be451fb 100644
--- a/games-roguelike/angband/angband-4.1.3.ebuild
+++ b/games-roguelike/angband/angband-4.1.3.ebuild
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="dev-python/docutils
virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
+
 src_prepare() {
default
 

diff --git a/games-roguelike/angband/files/angband-4.1.3-tinfo.patch 
b/games-roguelike/angband/files/angband-4.1.3-tinfo.patch
new file mode 100644
index 000..8a1f487e6f6
--- /dev/null
+++ b/games-roguelike/angband/files/angband-4.1.3-tinfo.patch
@@ -0,0 +1,29 @@
+From de53f9644323af0ff084bc82ef17b26aa6db250e Mon Sep 17 00:00:00 2001
+From: Stefan Strogin 
+Date: Thu, 4 Apr 2019 04:24:49 +0300
+Subject: [PATCH] Link against tinfow or tinfo if needed
+
+It is needed on systems where libtinfo is separate from libncurses.
+See: https://bugs.gentoo.org/679942
+
+Upstream-Status: Submitted [https://github.com/angband/angband/pull/522]
+Signed-off-by: Stefan Strogin 
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4a671f33..04fa8cae 100644
+--- a/configure.ac
 b/configure.ac
+@@ -244,6 +244,7 @@ if test "$enable_curses" = "yes"; then
+   LIBS="${LIBS} -lncursesw"
+   MAINFILES="${MAINFILES} \$(GCUMAINFILES)"
+   ])
++  AC_SEARCH_LIBS([keypad], [tinfow tinfo])
+   fi
+ fi
+ 
+-- 
+2.21.0
+