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

2024-08-08 Thread James Le Cuirot
commit: ee46c33ce6e4e3f0e9d3912cd6aa7d7d88a63645
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Aug  8 19:34:33 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Aug  8 19:36:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee46c33c

games-roguelike/angband: Add new man page with note on how to generate it

Signed-off-by: James Le Cuirot  gentoo.org>

 games-roguelike/angband/Manifest | 1 +
 games-roguelike/angband/angband-4.2.5.ebuild | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index c3cae4aedbc4..77d03f98313d 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,3 +1,4 @@
 DIST angband-4.2.4-man.tar.gz 116832 BLAKE2B 
1ae72aa88b38e4f13b6f2c1131dc53367a28d60440b03f9eb655ba5d06e1bc41e0ec9575194b7ab7892727268a11800d65175bedd73ae296f8babd3174bdf127
 SHA512 
92391b32cb619dae8f5274b9390593530c0138c250ddfe5642a450d35f810b0fa5c24c0e888c836975eba3981346469a43b3ba15ff36b750d4ced8bdf2377385
 DIST angband-4.2.4.tar.gz 25271611 BLAKE2B 
97c19f23aff3aa1e9aedcbe33da0e9806f923c251e80dde54492d62dc5d54c58943483ea3b0da1913043deef9d3d52f89bdc3dced0870142f06c6ab6edc33615
 SHA512 
5b47cfa95f779aa3f1e89f02f203b8eafd2dc1376b7aab1b62e37122fb83640d1de25f39817863a74c246d7de35bb3f26868f5f5e8906e92788a6dd74a85a4c5
+DIST angband-4.2.5-man.tar.gz 120256 BLAKE2B 
76846be139835d5979e777d9e02b2232f36457eff4555ceb40b8ec271804829f3b4fd83c00dff2cd7853e071296e39b617f192383cc0f1c4dd7a3d33eb3f5baf
 SHA512 
18ab4cfa3cf2cb9273cc9e5abc7c2059382b8ca3c7934498333dd200f91ec38a9486905adcc8751274eb6e229aa78faf43c389e4abe1e471015d6964bb56c05f
 DIST angband-4.2.5.tar.gz 25801900 BLAKE2B 
00bfc6a23f785ca524807cee595c71cb64dc642263092270338f1e39ff6fe00e53e27a8df7f66bd200afd949e91f2026bac0557b602e4b5825c76604b732ac4d
 SHA512 
4bd92f583cbebe5b0159ef9af9cd1df2ddf136e226b0560408d1409ac57a84c49302983ca44b0bc25b749b8c6120c892a557d0021b015b405cc8f17143f08119

diff --git a/games-roguelike/angband/angband-4.2.5.ebuild 
b/games-roguelike/angband/angband-4.2.5.ebuild
index d4223af2b843..8e5d46e4301e 100644
--- a/games-roguelike/angband/angband-4.2.5.ebuild
+++ b/games-roguelike/angband/angband-4.2.5.ebuild
@@ -3,12 +3,16 @@
 
 EAPI=8
 
+# Generate the man page from the source tree with:
+# sudo emerge -u dev-python/sphinx
+# DOC_HTML_THEME=classic sphinx-build -b man docs .
+
 inherit autotools desktop xdg-utils
 
 DESCRIPTION="Roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
 HOMEPAGE="https://rephial.org/";
 SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
-   https://dev.gentoo.org/~steils/distfiles/${PN}-4.2.4-man.tar.gz";
+   https://dev.gentoo.org/~chewi/distfiles/${P}-man.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"



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

2024-08-08 Thread James Le Cuirot
commit: 997696c70ecf6e9e65b4bf86d528199e6f294cad
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Aug  8 17:54:49 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Aug  8 19:36:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=997696c7

games-roguelike/angband: add 4.2.5

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-roguelike/angband/Manifest |   1 +
 games-roguelike/angband/angband-4.2.5.ebuild | 104 +++
 2 files changed, 105 insertions(+)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 11db3055f54f..c3cae4aedbc4 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,2 +1,3 @@
 DIST angband-4.2.4-man.tar.gz 116832 BLAKE2B 
1ae72aa88b38e4f13b6f2c1131dc53367a28d60440b03f9eb655ba5d06e1bc41e0ec9575194b7ab7892727268a11800d65175bedd73ae296f8babd3174bdf127
 SHA512 
92391b32cb619dae8f5274b9390593530c0138c250ddfe5642a450d35f810b0fa5c24c0e888c836975eba3981346469a43b3ba15ff36b750d4ced8bdf2377385
 DIST angband-4.2.4.tar.gz 25271611 BLAKE2B 
97c19f23aff3aa1e9aedcbe33da0e9806f923c251e80dde54492d62dc5d54c58943483ea3b0da1913043deef9d3d52f89bdc3dced0870142f06c6ab6edc33615
 SHA512 
5b47cfa95f779aa3f1e89f02f203b8eafd2dc1376b7aab1b62e37122fb83640d1de25f39817863a74c246d7de35bb3f26868f5f5e8906e92788a6dd74a85a4c5
+DIST angband-4.2.5.tar.gz 25801900 BLAKE2B 
00bfc6a23f785ca524807cee595c71cb64dc642263092270338f1e39ff6fe00e53e27a8df7f66bd200afd949e91f2026bac0557b602e4b5825c76604b732ac4d
 SHA512 
4bd92f583cbebe5b0159ef9af9cd1df2ddf136e226b0560408d1409ac57a84c49302983ca44b0bc25b749b8c6120c892a557d0021b015b405cc8f17143f08119

diff --git a/games-roguelike/angband/angband-4.2.5.ebuild 
b/games-roguelike/angband/angband-4.2.5.ebuild
new file mode 100644
index ..d4223af2b843
--- /dev/null
+++ b/games-roguelike/angband/angband-4.2.5.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg-utils
+
+DESCRIPTION="Roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
+HOMEPAGE="https://rephial.org/";
+SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
+   https://dev.gentoo.org/~steils/distfiles/${PN}-4.2.4-man.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="+ncurses sdl sound +X"
+
+REQUIRED_USE="sound? ( sdl )
+   || ( X ncurses )"
+
+RDEPEND="X? (
+   media-fonts/font-misc-misc
+   x11-libs/libX11
+   )
+   ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+   sdl? (
+   media-libs/libsdl2[video,X]
+   media-libs/sdl2-image[png]
+   media-libs/sdl2-ttf
+   sound? (
+   media-libs/libsdl2[sound]
+   media-libs/sdl2-mixer[mp3]
+   )
+   )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+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
+   myconf+=(
+   --enable-sdl2
+   $(use_enable sound sdl2-mixer)
+   )
+   fi
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+
+   dodoc changes.txt README.md
+   doman "${WORKDIR}"/${PN}.1
+   doenvd "${T}"/99${PN}
+
+   if use X || use sdl; then
+   use X && make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
+   use sdl && make_desktop_entry "angband -msdl2" "Angband (SDL2)" 
"${PN}"
+
+   local s
+   for s in 16 32 128 256 512; do
+   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
+   done
+   newicon -s scalable lib/icons/att.svg "${PN}.svg"
+   fi
+}
+
+pkg_postinst() {
+   if use X || use sdl; then
+   xdg_icon_cache_update
+   fi
+}
+
+pkg_postrm() {
+   if use X || use sdl; then
+   xdg_icon_cache_update
+   fi
+}



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

2024-08-08 Thread James Le Cuirot
commit: 1d6b382a0bf47b71a33129f81d69bacc98b912f1
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Aug  8 19:35:02 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Aug  8 19:36:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d6b382a

games-roguelike/angband: Drop old 4.2.4

Signed-off-by: James Le Cuirot  gentoo.org>

 games-roguelike/angband/Manifest |   2 -
 games-roguelike/angband/angband-4.2.4.ebuild | 104 ---
 2 files changed, 106 deletions(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 77d03f98313d..f349a3d2c7d8 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,4 +1,2 @@
-DIST angband-4.2.4-man.tar.gz 116832 BLAKE2B 
1ae72aa88b38e4f13b6f2c1131dc53367a28d60440b03f9eb655ba5d06e1bc41e0ec9575194b7ab7892727268a11800d65175bedd73ae296f8babd3174bdf127
 SHA512 
92391b32cb619dae8f5274b9390593530c0138c250ddfe5642a450d35f810b0fa5c24c0e888c836975eba3981346469a43b3ba15ff36b750d4ced8bdf2377385
-DIST angband-4.2.4.tar.gz 25271611 BLAKE2B 
97c19f23aff3aa1e9aedcbe33da0e9806f923c251e80dde54492d62dc5d54c58943483ea3b0da1913043deef9d3d52f89bdc3dced0870142f06c6ab6edc33615
 SHA512 
5b47cfa95f779aa3f1e89f02f203b8eafd2dc1376b7aab1b62e37122fb83640d1de25f39817863a74c246d7de35bb3f26868f5f5e8906e92788a6dd74a85a4c5
 DIST angband-4.2.5-man.tar.gz 120256 BLAKE2B 
76846be139835d5979e777d9e02b2232f36457eff4555ceb40b8ec271804829f3b4fd83c00dff2cd7853e071296e39b617f192383cc0f1c4dd7a3d33eb3f5baf
 SHA512 
18ab4cfa3cf2cb9273cc9e5abc7c2059382b8ca3c7934498333dd200f91ec38a9486905adcc8751274eb6e229aa78faf43c389e4abe1e471015d6964bb56c05f
 DIST angband-4.2.5.tar.gz 25801900 BLAKE2B 
00bfc6a23f785ca524807cee595c71cb64dc642263092270338f1e39ff6fe00e53e27a8df7f66bd200afd949e91f2026bac0557b602e4b5825c76604b732ac4d
 SHA512 
4bd92f583cbebe5b0159ef9af9cd1df2ddf136e226b0560408d1409ac57a84c49302983ca44b0bc25b749b8c6120c892a557d0021b015b405cc8f17143f08119

diff --git a/games-roguelike/angband/angband-4.2.4.ebuild 
b/games-roguelike/angband/angband-4.2.4.ebuild
deleted file mode 100644
index 95c89f792a68..
--- a/games-roguelike/angband/angband-4.2.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools desktop xdg-utils
-
-DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
-HOMEPAGE="https://rephial.org/";
-SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
-   https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="+ncurses sdl sound +X"
-
-REQUIRED_USE="sound? ( sdl )
-   || ( X ncurses )"
-
-RDEPEND="X? (
-   media-fonts/font-misc-misc
-   x11-libs/libX11
-   )
-   ncurses? ( sys-libs/ncurses:=[unicode(+)] )
-   sdl? (
-   media-libs/libsdl2[video,X]
-   media-libs/sdl2-image[png]
-   media-libs/sdl2-ttf
-   sound? (
-   media-libs/libsdl2[sound]
-   media-libs/sdl2-mixer[mp3]
-   )
-   )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-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
-   myconf+=(
-   --enable-sdl2
-   $(use_enable sound sdl2-mixer)
-   )
-   fi
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-
-   dodoc changes.txt README.md
-   doman "${WORKDIR}"/${PN}.1
-   doenvd "${T}"/99${PN}
-
-   if use X || use sdl; then
-   use X && make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
-   use sdl && make_desktop_entry "angband -msdl2" "Angband (SDL2)" 
"${PN}"
-
-   local s
-   for s in 16 32 128 256 512; do
-   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
-   done
-   newicon -s scalable lib/icons/att.svg "${PN}.svg"
-   fi
-}
-
-pkg_post

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

2024-08-08 Thread James Le Cuirot
commit: e4e5c98df6a1c65cb3b5673024f4003b231549d4
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Aug  8 17:55:35 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Aug  8 19:36:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4e5c98d

games-roguelike/angband: add missing remote-id

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/38019
Signed-off-by: James Le Cuirot  gentoo.org>

 games-roguelike/angband/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/games-roguelike/angband/metadata.xml 
b/games-roguelike/angband/metadata.xml
index 29b7d95473a1..6e5d6f0e6e82 100644
--- a/games-roguelike/angband/metadata.xml
+++ b/games-roguelike/angband/metadata.xml
@@ -12,4 +12,7 @@

Enable and install sounds

+   
+   angband/angband
+   
 



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

2022-07-28 Thread Stefan Strogin
commit: b326320558b0c17b004b0cf5d19133e1c1df489b
Author: Stefan Strogin  gentoo  org>
AuthorDate: Thu Jul 28 20:08:46 2022 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Thu Jul 28 20:18:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3263205

games-roguelike/angband: upgrade 4.2.3 -> 4.2.4

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

 games-roguelike/angband/Manifest  | 4 ++--
 .../angband/{angband-4.2.3-r1.ebuild => angband-4.2.4.ebuild} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 029283ba45bf..11db3055f54f 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,2 +1,2 @@
-DIST angband-4.2.3-man-r1.tar.gz 112117 BLAKE2B 
2d90660cf0784435c4a8fbb04505e5ed47f79ebfcb0215e779b2d8b54ae5b556f820919c27f1d410d92b94476772e23a3a7fe15aaf6c2e56d5c9ceb723359bba
 SHA512 
d85c0b2f0808ba8ee1f979bd9b51ffe2aaff4332471533f93478bf3853aa92eb326b57f195fa2f47d2163486c5005cf4e0865bca2bc3a75fc6005eb93e5d2dec
-DIST angband-4.2.3.tar.gz 25175745 BLAKE2B 
ee9878bb93fd268c5fdd8535750d6446ebf8e30a4bc794170b60cf6a77fc0470f91261f4963dda8865c95ead1b522210c8536da36866adeb084689fcf2bc7e5c
 SHA512 
f80a16c40d877c50194be370795acb437778ca88a658a8c95bef637625ab8a88ceb98f45d742e698709b6c81e8b5de6f563f88e957cd71eca208673bb4179e88
+DIST angband-4.2.4-man.tar.gz 116832 BLAKE2B 
1ae72aa88b38e4f13b6f2c1131dc53367a28d60440b03f9eb655ba5d06e1bc41e0ec9575194b7ab7892727268a11800d65175bedd73ae296f8babd3174bdf127
 SHA512 
92391b32cb619dae8f5274b9390593530c0138c250ddfe5642a450d35f810b0fa5c24c0e888c836975eba3981346469a43b3ba15ff36b750d4ced8bdf2377385
+DIST angband-4.2.4.tar.gz 25271611 BLAKE2B 
97c19f23aff3aa1e9aedcbe33da0e9806f923c251e80dde54492d62dc5d54c58943483ea3b0da1913043deef9d3d52f89bdc3dced0870142f06c6ab6edc33615
 SHA512 
5b47cfa95f779aa3f1e89f02f203b8eafd2dc1376b7aab1b62e37122fb83640d1de25f39817863a74c246d7de35bb3f26868f5f5e8906e92788a6dd74a85a4c5

diff --git a/games-roguelike/angband/angband-4.2.3-r1.ebuild 
b/games-roguelike/angband/angband-4.2.4.ebuild
similarity index 95%
rename from games-roguelike/angband/angband-4.2.3-r1.ebuild
rename to games-roguelike/angband/angband-4.2.4.ebuild
index a281466f56af..95c89f792a68 100644
--- a/games-roguelike/angband/angband-4.2.3-r1.ebuild
+++ b/games-roguelike/angband/angband-4.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit autotools desktop xdg-utils
 DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
 HOMEPAGE="https://rephial.org/";
 SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
-   https://dev.gentoo.org/~steils/distfiles/${P}-man-r1.tar.gz";
+   https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"



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

2021-12-28 Thread Ionen Wolkens
commit: f2b55ae97fa31db9938c7e14100fce5b14721364
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 28 15:13:29 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 28 17:00:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b55ae9

games-roguelike/angband: drop 4.2.2-r2

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-roguelike/angband/Manifest|   2 -
 games-roguelike/angband/angband-4.2.2-r2.ebuild | 104 
 2 files changed, 106 deletions(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index d751ffb605b4..029283ba45bf 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,4 +1,2 @@
-DIST angband-4.2.2-man.tar.gz 105892 BLAKE2B 
226210bd45f463e2b6bc099f889393832b5ce9bf5f95b5de1bc38fbcef61287515435ceef83a717bd62220fe01d5acf33e3fe240c08e3cf7d04e9d59fee132f1
 SHA512 
f373ea55c5f2349c615c47207c1dbbcc6a77246fbb0615d00a1fcb2a2a0cdf839bb5d57c2e29a2f2698f2d6b72698fbaec6bb221994566be04046ce03ea6253a
-DIST angband-4.2.2.tar.gz 24992436 BLAKE2B 
6beab7d0481167538714f540e9825e930d57457c923b77e2a9be71e8a6e382b70f375e85e68f0ebf9a65b61b835d62df0a5958a21198d9049088cdbe32c81efc
 SHA512 
07a9b6a10a47afafde8f5db1e463c70198d386e07737666e044de291eab4b425d76bc8124153b7c371248f0c9aedc01578a90e513d744e3f30d26ab22c940698
 DIST angband-4.2.3-man-r1.tar.gz 112117 BLAKE2B 
2d90660cf0784435c4a8fbb04505e5ed47f79ebfcb0215e779b2d8b54ae5b556f820919c27f1d410d92b94476772e23a3a7fe15aaf6c2e56d5c9ceb723359bba
 SHA512 
d85c0b2f0808ba8ee1f979bd9b51ffe2aaff4332471533f93478bf3853aa92eb326b57f195fa2f47d2163486c5005cf4e0865bca2bc3a75fc6005eb93e5d2dec
 DIST angband-4.2.3.tar.gz 25175745 BLAKE2B 
ee9878bb93fd268c5fdd8535750d6446ebf8e30a4bc794170b60cf6a77fc0470f91261f4963dda8865c95ead1b522210c8536da36866adeb084689fcf2bc7e5c
 SHA512 
f80a16c40d877c50194be370795acb437778ca88a658a8c95bef637625ab8a88ceb98f45d742e698709b6c81e8b5de6f563f88e957cd71eca208673bb4179e88

diff --git a/games-roguelike/angband/angband-4.2.2-r2.ebuild 
b/games-roguelike/angband/angband-4.2.2-r2.ebuild
deleted file mode 100644
index 4fad7e5591c7..
--- a/games-roguelike/angband/angband-4.2.2-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg-utils
-
-DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
-HOMEPAGE="https://rephial.org/";
-SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
-   https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="+ncurses sdl sound +X"
-
-REQUIRED_USE="sound? ( sdl )
-   || ( X ncurses )"
-
-RDEPEND="X? (
-   media-fonts/font-misc-misc
-   x11-libs/libX11
-   )
-   ncurses? ( sys-libs/ncurses:=[unicode(+)] )
-   sdl? (
-   media-libs/libsdl2[video,X]
-   media-libs/sdl2-image[png]
-   media-libs/sdl2-ttf
-   sound? (
-   media-libs/libsdl2[sound]
-   media-libs/sdl2-mixer[mp3]
-   )
-   )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-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
-   myconf+=(
-   --enable-sdl2
-   $(use_enable sound sdl2-mixer)
-   )
-   fi
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-
-   dodoc changes.txt README.md
-   doman "${WORKDIR}"/${PN}.1
-   doenvd "${T}"/99${PN}
-
-   if use X || use sdl; then
-   use X && make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
-   use sdl && make_desktop_entry "angband -msdl2" "Angband (SDL2)" 
"${PN}"
-
-   local s
-   for s in 16 32 128 256 512; do
-   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
-   done
-   newicon -s scalable lib/icons/att.svg "${PN}.svg"
-   fi
-}
-
-

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

2021-11-01 Thread Stefan Strogin
commit: 3d0fe745e91f2b81bd45b4ef7e32ab9525734801
Author: Stefan Strogin  gentoo  org>
AuthorDate: Tue Nov  2 02:43:22 2021 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Tue Nov  2 02:43:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d0fe745

games-roguelike/angband: update man pages

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

 games-roguelike/angband/Manifest| 2 +-
 .../angband/{angband-4.2.3.ebuild => angband-4.2.3-r1.ebuild}   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 2b412b4f29c..d751ffb605b 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,4 +1,4 @@
 DIST angband-4.2.2-man.tar.gz 105892 BLAKE2B 
226210bd45f463e2b6bc099f889393832b5ce9bf5f95b5de1bc38fbcef61287515435ceef83a717bd62220fe01d5acf33e3fe240c08e3cf7d04e9d59fee132f1
 SHA512 
f373ea55c5f2349c615c47207c1dbbcc6a77246fbb0615d00a1fcb2a2a0cdf839bb5d57c2e29a2f2698f2d6b72698fbaec6bb221994566be04046ce03ea6253a
 DIST angband-4.2.2.tar.gz 24992436 BLAKE2B 
6beab7d0481167538714f540e9825e930d57457c923b77e2a9be71e8a6e382b70f375e85e68f0ebf9a65b61b835d62df0a5958a21198d9049088cdbe32c81efc
 SHA512 
07a9b6a10a47afafde8f5db1e463c70198d386e07737666e044de291eab4b425d76bc8124153b7c371248f0c9aedc01578a90e513d744e3f30d26ab22c940698
-DIST angband-4.2.3-man.tar.gz 112114 BLAKE2B 
1e203386a5aa01f70b2906a8641e47cd01fdfc5132c18d580ea12f9d9bf82e9241bd34db171c6a206e623a0788f86449ac14c27c35515de3cfcb953fc9a9e199
 SHA512 
a2ee36daffbca36d9b72e157fe2b986346ea27bc6382c8a24fe2873d3319ff29a06d9a98d9d55c2ac7be8cc0f7d5959688a5504a4df47a8e9caa8dd69a61842f
+DIST angband-4.2.3-man-r1.tar.gz 112117 BLAKE2B 
2d90660cf0784435c4a8fbb04505e5ed47f79ebfcb0215e779b2d8b54ae5b556f820919c27f1d410d92b94476772e23a3a7fe15aaf6c2e56d5c9ceb723359bba
 SHA512 
d85c0b2f0808ba8ee1f979bd9b51ffe2aaff4332471533f93478bf3853aa92eb326b57f195fa2f47d2163486c5005cf4e0865bca2bc3a75fc6005eb93e5d2dec
 DIST angband-4.2.3.tar.gz 25175745 BLAKE2B 
ee9878bb93fd268c5fdd8535750d6446ebf8e30a4bc794170b60cf6a77fc0470f91261f4963dda8865c95ead1b522210c8536da36866adeb084689fcf2bc7e5c
 SHA512 
f80a16c40d877c50194be370795acb437778ca88a658a8c95bef637625ab8a88ceb98f45d742e698709b6c81e8b5de6f563f88e957cd71eca208673bb4179e88

diff --git a/games-roguelike/angband/angband-4.2.3.ebuild 
b/games-roguelike/angband/angband-4.2.3-r1.ebuild
similarity index 97%
rename from games-roguelike/angband/angband-4.2.3.ebuild
rename to games-roguelike/angband/angband-4.2.3-r1.ebuild
index bf8f6601deb..a281466f56a 100644
--- a/games-roguelike/angband/angband-4.2.3.ebuild
+++ b/games-roguelike/angband/angband-4.2.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools desktop xdg-utils
 DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
 HOMEPAGE="https://rephial.org/";
 SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
-   https://dev.gentoo.org/~chewi/distfiles/${P}-man.tar.gz";
+   https://dev.gentoo.org/~steils/distfiles/${P}-man-r1.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"



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

2021-11-01 Thread James Le Cuirot
commit: 34d9730cf7287e2a9b361e7709a44232c68e6a0c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Nov  1 22:06:45 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Nov  1 22:06:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34d9730c

games-roguelike/angband: Version bump to 4.2.3, EAPI 8

Bug: https://bugs.gentoo.org/820500
Signed-off-by: James Le Cuirot  gentoo.org>

 games-roguelike/angband/Manifest |   2 +
 games-roguelike/angband/angband-4.2.3.ebuild | 104 +++
 2 files changed, 106 insertions(+)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 0b221405b67..2b412b4f29c 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,2 +1,4 @@
 DIST angband-4.2.2-man.tar.gz 105892 BLAKE2B 
226210bd45f463e2b6bc099f889393832b5ce9bf5f95b5de1bc38fbcef61287515435ceef83a717bd62220fe01d5acf33e3fe240c08e3cf7d04e9d59fee132f1
 SHA512 
f373ea55c5f2349c615c47207c1dbbcc6a77246fbb0615d00a1fcb2a2a0cdf839bb5d57c2e29a2f2698f2d6b72698fbaec6bb221994566be04046ce03ea6253a
 DIST angband-4.2.2.tar.gz 24992436 BLAKE2B 
6beab7d0481167538714f540e9825e930d57457c923b77e2a9be71e8a6e382b70f375e85e68f0ebf9a65b61b835d62df0a5958a21198d9049088cdbe32c81efc
 SHA512 
07a9b6a10a47afafde8f5db1e463c70198d386e07737666e044de291eab4b425d76bc8124153b7c371248f0c9aedc01578a90e513d744e3f30d26ab22c940698
+DIST angband-4.2.3-man.tar.gz 112114 BLAKE2B 
1e203386a5aa01f70b2906a8641e47cd01fdfc5132c18d580ea12f9d9bf82e9241bd34db171c6a206e623a0788f86449ac14c27c35515de3cfcb953fc9a9e199
 SHA512 
a2ee36daffbca36d9b72e157fe2b986346ea27bc6382c8a24fe2873d3319ff29a06d9a98d9d55c2ac7be8cc0f7d5959688a5504a4df47a8e9caa8dd69a61842f
+DIST angband-4.2.3.tar.gz 25175745 BLAKE2B 
ee9878bb93fd268c5fdd8535750d6446ebf8e30a4bc794170b60cf6a77fc0470f91261f4963dda8865c95ead1b522210c8536da36866adeb084689fcf2bc7e5c
 SHA512 
f80a16c40d877c50194be370795acb437778ca88a658a8c95bef637625ab8a88ceb98f45d742e698709b6c81e8b5de6f563f88e957cd71eca208673bb4179e88

diff --git a/games-roguelike/angband/angband-4.2.3.ebuild 
b/games-roguelike/angband/angband-4.2.3.ebuild
new file mode 100644
index 000..bf8f6601deb
--- /dev/null
+++ b/games-roguelike/angband/angband-4.2.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg-utils
+
+DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
+HOMEPAGE="https://rephial.org/";
+SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
+   https://dev.gentoo.org/~chewi/distfiles/${P}-man.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="+ncurses sdl sound +X"
+
+REQUIRED_USE="sound? ( sdl )
+   || ( X ncurses )"
+
+RDEPEND="X? (
+   media-fonts/font-misc-misc
+   x11-libs/libX11
+   )
+   ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+   sdl? (
+   media-libs/libsdl2[video,X]
+   media-libs/sdl2-image[png]
+   media-libs/sdl2-ttf
+   sound? (
+   media-libs/libsdl2[sound]
+   media-libs/sdl2-mixer[mp3]
+   )
+   )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+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
+   myconf+=(
+   --enable-sdl2
+   $(use_enable sound sdl2-mixer)
+   )
+   fi
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+
+   dodoc changes.txt README.md
+   doman "${WORKDIR}"/${PN}.1
+   doenvd "${T}"/99${PN}
+
+   if use X || use sdl; then
+   use X && make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
+   use sdl && make_desktop_entry "angband -msdl2" "Angband (SDL2)" 
"${PN}"
+
+   local s
+   for s in 16 32 128 256 512; do
+   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
+   done
+   newicon -s scalable lib/icons/at

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

2021-10-27 Thread James Le Cuirot
commit: a01f4694e14e5b45c3158c625caf45476c301ee3
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Oct 27 23:00:18 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Oct 27 23:00:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a01f4694

games-roguelike/angband: Revbump following the earlier fix

Turns out the other issue is in a different package.

Signed-off-by: James Le Cuirot  gentoo.org>

 .../angband/{angband-4.2.2-r1.ebuild => angband-4.2.2-r2.ebuild}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/games-roguelike/angband/angband-4.2.2-r1.ebuild 
b/games-roguelike/angband/angband-4.2.2-r2.ebuild
similarity index 100%
rename from games-roguelike/angband/angband-4.2.2-r1.ebuild
rename to games-roguelike/angband/angband-4.2.2-r2.ebuild



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

2021-10-27 Thread James Le Cuirot
commit: c38832193a7b7d14d2d992294b5b039ab55d09e6
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Oct 27 22:47:36 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Oct 27 22:48:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3883219

games-roguelike/angband: Depend on sdl2-image[png]

The game uses PNG images. No revbump as there is another issue to fix.

Closes: https://bugs.gentoo.org/820479
Signed-off-by: James Le Cuirot  gentoo.org>

 games-roguelike/angband/angband-4.2.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/angband/angband-4.2.2-r1.ebuild 
b/games-roguelike/angband/angband-4.2.2-r1.ebuild
index 8f5865d8994..4fad7e5591c 100644
--- a/games-roguelike/angband/angband-4.2.2-r1.ebuild
+++ b/games-roguelike/angband/angband-4.2.2-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="X? (
ncurses? ( sys-libs/ncurses:=[unicode(+)] )
sdl? (
media-libs/libsdl2[video,X]
-   media-libs/sdl2-image
+   media-libs/sdl2-image[png]
media-libs/sdl2-ttf
sound? (
media-libs/libsdl2[sound]



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

2021-07-04 Thread Stefan Strogin
commit: 8183d70cf4dd71abbeb29df5cb113a67d5c43a5f
Author: Stefan Strogin  gentoo  org>
AuthorDate: Sun Jul  4 09:29:02 2021 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Sun Jul  4 09:29:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8183d70c

games-roguelike/angband: upgrade 4.2.1 -> 4.2.2

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

 games-roguelike/angband/Manifest   |  4 +-
 ...ngband-4.2.1-r1.ebuild => angband-4.2.2.ebuild} |  8 +---
 .../angband/files/angband-4.2.1-sdl2-sound.patch   | 50 --
 3 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 6964bef4177..0b221405b67 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,2 +1,2 @@
-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
+DIST angband-4.2.2-man.tar.gz 105892 BLAKE2B 
226210bd45f463e2b6bc099f889393832b5ce9bf5f95b5de1bc38fbcef61287515435ceef83a717bd62220fe01d5acf33e3fe240c08e3cf7d04e9d59fee132f1
 SHA512 
f373ea55c5f2349c615c47207c1dbbcc6a77246fbb0615d00a1fcb2a2a0cdf839bb5d57c2e29a2f2698f2d6b72698fbaec6bb221994566be04046ce03ea6253a
+DIST angband-4.2.2.tar.gz 24992436 BLAKE2B 
6beab7d0481167538714f540e9825e930d57457c923b77e2a9be71e8a6e382b70f375e85e68f0ebf9a65b61b835d62df0a5958a21198d9049088cdbe32c81efc
 SHA512 
07a9b6a10a47afafde8f5db1e463c70198d386e07737666e044de291eab4b425d76bc8124153b7c371248f0c9aedc01578a90e513d744e3f30d26ab22c940698

diff --git a/games-roguelike/angband/angband-4.2.1-r1.ebuild 
b/games-roguelike/angband/angband-4.2.2.ebuild
similarity index 92%
rename from games-roguelike/angband/angband-4.2.1-r1.ebuild
rename to games-roguelike/angband/angband-4.2.2.ebuild
index 5261fcba166..e4bebd7a381 100644
--- a/games-roguelike/angband/angband-4.2.1-r1.ebuild
+++ b/games-roguelike/angband/angband-4.2.2.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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
+SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz";
 
 LICENSE="GPL-2"
@@ -37,8 +35,6 @@ RDEPEND="X? (
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-sdl2-sound.patch" )
-
 src_prepare() {
default
 

diff --git a/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch 
b/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch
deleted file mode 100644
index accbc835557..000
--- a/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bbfe78654e2f67da264d81d25fe1e6332302e51a Mon Sep 17 00:00:00 2001
-From: Eric Branlund 
-Date: Sat, 11 Jul 2020 11:07:24 -0700
-Subject: [PATCH] Adjusted so "./configure --enable-sdl2-mixer" and then
- compiling generates an executable where "angband --help" lists the SDL sound
- module as available.
-
-Upstream-Status: Accepted
-[https://github.com/angband/angband/commit/bbfe78654e2f67da264d81d25fe1e6332302e51a]
-Signed-off-by: Stefan Strogin 

- configure.ac | 2 +-
- src/sound-core.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 968aaa914..9d0b1e600 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -337,7 +337,7 @@ if test "$enable_sdl2_mixer" = "yes"; then
-   SDL2_LIBS=`sdl2-config --libs`
-   LIBS="${LIBS} ${SDL2_LIBS} -lSDL2_mixer"
-   fi
--  MAINFILES="${MAINFILES} \$(SNDSDL2FILES)"
-+  MAINFILES="${MAINFILES} \$(SNDSDLFILES)"
-   fi
- fi
- 
-diff --git a/src/sound-core.c b/src/sound-core.c
-index 261009429..8b8ef7ffd 100644
 a/src/sound-core.c
-+++ b/src/sound-core.c
-@@ -20,7 +20,7 @@
- #include "sound.h"
- #include "main.h"
- #include "ui-prefs.h"
--#ifdef SOUND_SDL
-+#if defined(SOUND_SDL) || defined(SOUND_SDL2)
- #include "snd-sdl.h"
- #endif
- 
-@@ -55,7 +55,7 @@ static struct msg_snd_data 

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

2021-06-22 Thread Ionen Wolkens
commit: ab2e317b8c224d015e945eea9dd79795df698a83
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jun 23 00:20:42 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jun 23 02:22:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab2e317b

games-roguelike/angband: drop 4.2.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-roguelike/angband/angband-4.2.1.ebuild | 106 ---
 1 file changed, 106 deletions(-)

diff --git a/games-roguelike/angband/angband-4.2.1.ebuild 
b/games-roguelike/angband/angband-4.2.1.ebuild
deleted file mode 100644
index 2582bae9915..000
--- a/games-roguelike/angband/angband-4.2.1.ebuild
+++ /dev/null
@@ -1,106 +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
-   https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ncurses sdl sound +X"
-
-REQUIRED_USE="sound? ( sdl )
-   || ( X ncurses )"
-
-RDEPEND="X? (
-   media-fonts/font-misc-misc
-   x11-libs/libX11
-   )
-   ncurses? ( sys-libs/ncurses:0=[unicode] )
-   sdl? (
-   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"
-
-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
-   myconf+=(
-   --enable-sdl2
-   $(use_enable sound sdl2-mixer)
-   )
-   fi
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-
-   dodoc changes.txt README.md
-   doman "${WORKDIR}"/${PN}.1
-   doenvd "${T}"/99${PN}
-
-   if use X || use sdl; then
-   use X && make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
-   use sdl && make_desktop_entry "angband -msdl2" "Angband (SDL2)" 
"${PN}"
-
-   local s
-   for s in 16 32 128 256 512; do
-   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
-   done
-   newicon -s scalable lib/icons/att.svg "${PN}.svg"
-   fi
-}
-
-pkg_postinst() {
-   if use X || use sdl; then
-   xdg_icon_cache_update
-   fi
-}
-
-pkg_postrm() {
-   if use X || use sdl; then
-   xdg_icon_cache_update
-   fi
-}



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

2021-01-05 Thread Andreas K. Hüttel
commit: 91cc87dd2f35e5ca1c8d9959bf0e26621e6a16d4
Author: Andreas K. Huettel  gentoo  org>
AuthorDate: Tue Jan  5 21:30:41 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Tue Jan  5 21:58:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91cc87dd

games-roguelike/angband: Remove old

Bug: https://bugs.gentoo.org/707770
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas K. Huettel  gentoo.org>

 games-roguelike/angband/Manifest   |   1 -
 games-roguelike/angband/angband-4.1.3.ebuild   | 104 -
 .../angband/files/angband-4.1.3-tinfo.patch|  29 --
 3 files changed, 134 deletions(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 17c6cad788a..6964bef4177 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,3 +1,2 @@
-DIST angband-4.1.3.tar.gz 19924395 BLAKE2B 
573181ab9b3a01abdc34cfac9e69a757eb7558c67c9490240890bc920c6c2a8ebea6268b733f06a6e421829d807fa135131c1512edfc344610a269139cc5ac47
 SHA512 
7810e1f04e337c1b5d1ddb6013785c953e0149dfa536c75dd8816fdfd304c37a09103d653cee0c150225c6ba702e121300a65012d8034079cd41f86a730f9c2a
 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.1.3.ebuild 
b/games-roguelike/angband/angband-4.1.3.ebuild
deleted file mode 100644
index 29f6be451fb..000
--- a/games-roguelike/angband/angband-4.1.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 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 sound +X"
-
-REQUIRED_USE="sound? ( sdl )
-   || ( X ncurses )"
-
-RDEPEND="X? (
-   media-fonts/font-misc-misc
-   x11-libs/libX11
-   )
-   ncurses? ( sys-libs/ncurses:0=[unicode] )
-   sdl? (
-   media-libs/libsdl[video,X]
-   media-libs/sdl-image
-   media-libs/sdl-ttf
-   sound? (
-   media-libs/libsdl[sound]
-   media-libs/sdl-mixer[mp3]
-   )
-   )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-python/docutils
-   virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
-
-src_prepare() {
-   default
-
-   sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
-   sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
-   sed -i -e '/^DOC =/s/=.*/=/' doc/Makefile || 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 sdl)
-   $(use_enable sound sdl-mixer)
-   $(use_enable ncurses curses)
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-
-   dodoc changes.txt faq.txt readme.txt thanks.txt doc/manual.html
-   doenvd "${T}"/99${PN}
-
-   if use X || use sdl ; then
-   use X && make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
-   use sdl && make_desktop_entry "angband -msdl" "Angband (SDL)" 
"${PN}"
-
-   local s
-   for s in 16 32 128 256 512; do
-   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
-   done
-   newicon -s scalable lib/icons/att.svg "${PN}.svg"
-   fi
-}
-
-pkg_postinst() {
-   if use X || use sdl ; then
-   xdg_icon_cache_update
-   fi
-}
-
-pkg_postrm() {
-   if use X || use sdl ; then
-   xdg_icon_cache_update
-   fi
-}

diff 

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

2020-08-10 Thread Stefan Strogin
commit: 6052cff30f398cf28089db8988666c6c2a189116
Author: Stefan Strogin  gentoo  org>
AuthorDate: Mon Aug 10 22:14:48 2020 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Mon Aug 10 22:23:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6052cff3

games-roguelike/angband: add patch to fix SDL2 sound

Closes: https://bugs.gentoo.org/728096
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Stefan Strogin  gentoo.org>

 games-roguelike/angband/angband-4.2.1-r1.ebuild| 108 +
 .../angband/files/angband-4.2.1-sdl2-sound.patch   |  50 ++
 2 files changed, 158 insertions(+)

diff --git a/games-roguelike/angband/angband-4.2.1-r1.ebuild 
b/games-roguelike/angband/angband-4.2.1-r1.ebuild
new file mode 100644
index 000..5261fcba166
--- /dev/null
+++ b/games-roguelike/angband/angband-4.2.1-r1.ebuild
@@ -0,0 +1,108 @@
+# 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
+   https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ncurses sdl sound +X"
+
+REQUIRED_USE="sound? ( sdl )
+   || ( X ncurses )"
+
+RDEPEND="X? (
+   media-fonts/font-misc-misc
+   x11-libs/libX11
+   )
+   ncurses? ( sys-libs/ncurses:0=[unicode] )
+   sdl? (
+   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}-sdl2-sound.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
+   myconf+=(
+   --enable-sdl2
+   $(use_enable sound sdl2-mixer)
+   )
+   fi
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+
+   dodoc changes.txt README.md
+   doman "${WORKDIR}"/${PN}.1
+   doenvd "${T}"/99${PN}
+
+   if use X || use sdl; then
+   use X && make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
+   use sdl && make_desktop_entry "angband -msdl2" "Angband (SDL2)" 
"${PN}"
+
+   local s
+   for s in 16 32 128 256 512; do
+   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
+   done
+   newicon -s scalable lib/icons/att.svg "${PN}.svg"
+   fi
+}
+
+pkg_postinst() {
+   if use X || use sdl; then
+   xdg_icon_cache_update
+   fi
+}
+
+pkg_postrm() {
+   if use X || use sdl; then
+   xdg_icon_cache_update
+   fi
+}

diff --git a/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch 
b/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch
new file mode 100644
index 000..accbc835557
--- /dev/null
+++ b/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch
@@ -0,0 +1,50 @@
+From bbfe78654e2f67da264d81d25fe1e6332302e51a Mon Sep 17 00:00:00 2001
+From: Eric Branlund 
+Date: Sat, 11 Jul 2020 11:07:24 -0700
+Subject: [PATCH] Adjusted so "./configure --enable-sdl2-mixer" and then
+ compiling generates an executable where "angband --help" lists the SDL sound
+ module as available.
+
+Upstream-Status: Accepted
+[https://github.com/angband/angband/commit/bbfe78654e2f67da264d81d25fe1e6332302e51a]
+Signed-off-by: Stefan Strogin 
+---
+ configure.ac | 2 +-
+ src/sound-core.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 968aaa914..9d0b1e600 100644
+--- a/configure.ac
 b/configure.ac
+@@ -337,7 +337,7 @@ if test "$enable_sdl2_mixer" = "yes"; then
+   SDL2_LIBS=`sdl2-config --libs`
+   LI

[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/

2020-06-11 Thread Stefan Strogin
commit: a3df3e79a44d2c179dedd118a97f1f3d1fc6ce4c
Author: Stefan Strogin  gentoo  org>
AuthorDate: Fri Jun 12 01:36:52 2020 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Fri Jun 12 01:38:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3df3e79

games-roguelike/angband: upgrade to 4.2.1

- Add manpage; don't install uncompiled RSTs as docs.
- Drop the gcc-10 patch applied upstream.
- Drop SDL 1.2 front end, install SDL 2 with USE=sdl.

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

 games-roguelike/angband/Manifest |   2 +
 games-roguelike/angband/angband-4.2.1.ebuild | 106 +++
 2 files changed, 108 insertions(+)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 0e9b762249c..b14097e874f 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,2 +1,4 @@
 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.1.ebuild 
b/games-roguelike/angband/angband-4.2.1.ebuild
new file mode 100644
index 000..2582bae9915
--- /dev/null
+++ b/games-roguelike/angband/angband-4.2.1.ebuild
@@ -0,0 +1,106 @@
+# 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
+   https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ncurses sdl sound +X"
+
+REQUIRED_USE="sound? ( sdl )
+   || ( X ncurses )"
+
+RDEPEND="X? (
+   media-fonts/font-misc-misc
+   x11-libs/libX11
+   )
+   ncurses? ( sys-libs/ncurses:0=[unicode] )
+   sdl? (
+   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"
+
+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
+   myconf+=(
+   --enable-sdl2
+   $(use_enable sound sdl2-mixer)
+   )
+   fi
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+
+   dodoc changes.txt README.md
+   doman "${WORKDIR}"/${PN}.1
+   doenvd "${T}"/99${PN}
+
+   if use X || use sdl; then
+   use X && make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
+   use sdl && make_desktop_entry "angband -msdl2" "Angband (SDL2)" 
"${PN}"
+
+   local s
+   for s in 16 32 128 256 512; do
+   

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

2020-02-29 Thread Sergei Trofimovich
commit: 03c993729b80cc6835e8213ef80265b3b02e5305
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Feb 29 11:39:27 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Feb 29 11:40:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c99372

games-roguelike/angband: tweak for gcc-10, bug #707770

Closes: https://bugs.gentoo.org/707770
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-roguelike/angband/angband-4.2.0.ebuild   |  4 +++-
 .../angband/files/angband-4.2.0-gcc-10.patch   | 22 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/games-roguelike/angband/angband-4.2.0.ebuild 
b/games-roguelike/angband/angband-4.2.0.ebuild
index acb1f3d093c..f9dfb300662 100644
--- a/games-roguelike/angband/angband-4.2.0.ebuild
+++ b/games-roguelike/angband/angband-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,6 +48,8 @@ RDEPEND="X? (
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+
 src_prepare() {
default
 

diff --git a/games-roguelike/angband/files/angband-4.2.0-gcc-10.patch 
b/games-roguelike/angband/files/angband-4.2.0-gcc-10.patch
new file mode 100644
index 000..6aeb1f7a204
--- /dev/null
+++ b/games-roguelike/angband/files/angband-4.2.0-gcc-10.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/707770
+
+--- a/src/mon-blows.h
 b/src/mon-blows.h
+@@ -41,7 +41,7 @@ struct blow_method {
+   struct blow_method *next;
+ };
+ 
+-struct blow_method *blow_methods;
++extern struct blow_method *blow_methods;
+ 
+ /**
+  * Storage for context information for effect handlers called in
+@@ -83,7 +83,7 @@ struct blow_effect {
+   struct blow_effect *next;
+ };
+ 
+-struct blow_effect *blow_effects;
++extern struct blow_effect *blow_effects;
+ 
+ /* Functions */
+ int blow_index(const char *name);



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

2019-08-19 Thread Stefan Strogin
commit: bb219b0ded728e7d8577b6bf40d933556264a8cb
Author: Stefan Strogin  gentoo  org>
AuthorDate: Tue Aug 20 06:33:53 2019 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Tue Aug 20 06:35:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb219b0d

games-roguelike/angband: bump version to 4.2.0

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

 games-roguelike/angband/Manifest |   1 +
 games-roguelike/angband/angband-4.2.0.ebuild | 127 +++
 games-roguelike/angband/metadata.xml |   1 +
 3 files changed, 129 insertions(+)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 89392c28f50..0e9b762249c 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1 +1,2 @@
 DIST angband-4.1.3.tar.gz 19924395 BLAKE2B 
573181ab9b3a01abdc34cfac9e69a757eb7558c67c9490240890bc920c6c2a8ebea6268b733f06a6e421829d807fa135131c1512edfc344610a269139cc5ac47
 SHA512 
7810e1f04e337c1b5d1ddb6013785c953e0149dfa536c75dd8816fdfd304c37a09103d653cee0c150225c6ba702e121300a65012d8034079cd41f86a730f9c2a
+DIST angband-4.2.0.tar.gz 24727127 BLAKE2B 
4bdd5cfe49080fc38b988e6606eadddc2e872ca7b01f34e692ca299a420689310e9e972355986e802e654a27837ac2621eb3bc0823b7e771dc0a851a5c5a8bc6
 SHA512 
b5c4884ce765bc45d7c21b8be06bc29c7d84c16e48341967b5d6a847f250db104ef509fc28e8887d4f1cd9ed545e504781186936a1f38931d5113e2fb58b32c3

diff --git a/games-roguelike/angband/angband-4.2.0.ebuild 
b/games-roguelike/angband/angband-4.2.0.ebuild
new file mode 100644
index 000..acb1f3d093c
--- /dev/null
+++ b/games-roguelike/angband/angband-4.2.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 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"
+
+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)
+   )
+   else
+   myconf+=(
+   --enable-sdl
+   $(use_enable sound sdl-mixer)
+   )
+   fi
+   fi
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+
+   dodoc changes.txt readme.txt
+   dodoc 
docs/{a-quick-demo,attack,birth,command,customize,dungeon,faq,guide}.rst
+   doenvd "${T}"/99${PN}
+
+   if use X || use sdl; then
+   use X && make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
+   if use sdl; then
+   use sdl2 && make_desktop_entry "angband -msdl2" 
"Angband (SDL2)" "${PN}" \
+  

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

2019-05-06 Thread Stefan Strogin
commit: 846c7a6a23b4d1d74f41c70705588d6b465160ba
Author: Stefan Strogin  gentoo  org>
AuthorDate: Mon May  6 23:37:06 2019 +
Commit: Stefan Strogin  gentoo  org>
CommitDate: Mon May  6 23:41:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846c7a6a

games-roguelike/angband: update metadata.xml

Bug: https://bugs.gentoo.org/670668
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gentoo.org>

 games-roguelike/angband/metadata.xml | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/games-roguelike/angband/metadata.xml 
b/games-roguelike/angband/metadata.xml
index d8e07311265..3f75f809dba 100644
--- a/games-roguelike/angband/metadata.xml
+++ b/games-roguelike/angband/metadata.xml
@@ -6,13 +6,9 @@
Gentoo Games Project


-   stefan.stro...@gmail.com
+   ste...@gentoo.org
Stefan Strogin

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

Enable and install sounds




[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
+



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

2019-04-04 Thread Michał Górny
commit: 7716aae3598cb6d4325ad8369202cada4df132d9
Author: Stefan Strogin  gmail  com>
AuthorDate: Thu Apr  4 20:54:14 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Apr  5 05:13:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7716aae3

games-roguelike/angband: add myself as proxy maintainter

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

 games-roguelike/angband/metadata.xml | 8 
 1 file changed, 8 insertions(+)

diff --git a/games-roguelike/angband/metadata.xml 
b/games-roguelike/angband/metadata.xml
index dc2d1c7d279..d8e07311265 100644
--- a/games-roguelike/angband/metadata.xml
+++ b/games-roguelike/angband/metadata.xml
@@ -5,6 +5,14 @@
ga...@gentoo.org
Gentoo Games Project

+   
+   stefan.stro...@gmail.com
+   Stefan Strogin
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

Enable and install sounds




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

2019-03-09 Thread James Le Cuirot
commit: 67999b34153308d2e18425b0a09dbd2a7f1284f2
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Mar  9 22:33:34 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar  9 22:33:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67999b34

games-roguelike/angband: EAPI bump to 7

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 games-roguelike/angband/angband-4.1.3.ebuild | 16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/games-roguelike/angband/angband-4.1.3.ebuild 
b/games-roguelike/angband/angband-4.1.3.ebuild
index 830cddc683f..8a55a747063 100644
--- a/games-roguelike/angband/angband-4.1.3.ebuild
+++ b/games-roguelike/angband/angband-4.1.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eapi7-ver gnome2-utils
+inherit autotools desktop xdg-utils
 
 MAJOR_PV=$(ver_cut 1-2)
 
@@ -33,8 +33,8 @@ RDEPEND="X? (
media-libs/sdl-mixer[mp3]
)
)"
-DEPEND="${RDEPEND}
-   dev-python/docutils
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/docutils
virtual/pkgconfig"
 
 src_prepare() {
@@ -91,6 +91,12 @@ src_install() {
 
 pkg_postinst() {
if use X || use sdl ; then
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
+   fi
+}
+
+pkg_postrm() {
+   if use X || use sdl ; then
+   xdg_icon_cache_update
fi
 }



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

2019-03-09 Thread James Le Cuirot
commit: 89c0db210e7ecc771db7e4161cccfc9b47f6de6e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Mar  9 22:34:32 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar  9 22:34:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c0db21

games-roguelike/angband: Drop old 4.0.5

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 games-roguelike/angband/Manifest   |   1 -
 games-roguelike/angband/angband-4.0.5-r1.ebuild| 115 -
 .../angband/files/angband-4.0.5-pie-gcc.patch  |  13 ---
 3 files changed, 129 deletions(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 692435871b6..89392c28f50 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,2 +1 @@
-DIST angband-4.0.5.tar.gz 19886562 BLAKE2B 
3b8410187a66dacc5f2310e116f3abe8ca04e1363701d455df68f3daaf2a23b0ad4811cee2a50129e1f8e096c6ee9e40f8879b25e97510946b4e4ac2a9124631
 SHA512 
9ad46430d7e3c4b7676042b28107a2a5b9b2ed967dd1f45b91ca37583fa2d5e9ba25d963a6510ee091b8fdb3a704a60002d851d7898a6298567f804dce36a88b
 DIST angband-4.1.3.tar.gz 19924395 BLAKE2B 
573181ab9b3a01abdc34cfac9e69a757eb7558c67c9490240890bc920c6c2a8ebea6268b733f06a6e421829d807fa135131c1512edfc344610a269139cc5ac47
 SHA512 
7810e1f04e337c1b5d1ddb6013785c953e0149dfa536c75dd8816fdfd304c37a09103d653cee0c150225c6ba702e121300a65012d8034079cd41f86a730f9c2a

diff --git a/games-roguelike/angband/angband-4.0.5-r1.ebuild 
b/games-roguelike/angband/angband-4.0.5-r1.ebuild
deleted file mode 100644
index d8830482e59..000
--- a/games-roguelike/angband/angband-4.0.5-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2-utils versionator
-
-MAJOR_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
-HOMEPAGE="http://rephial.org/";
-SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses sdl +sound X"
-
-RDEPEND="X? ( x11-libs/libX11 )
-   !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) )
-   ncurses? ( sys-libs/ncurses:0=[unicode] )
-   sdl? ( media-libs/libsdl[video,X]
-   media-libs/sdl-image
-   media-libs/sdl-ttf
-   sound? ( media-libs/libsdl[sound] )
-   media-libs/sdl-mixer[mp3] )"
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   virtual/pkgconfig"
-
-PATCHES=("${FILESDIR}"/${P}-pie-gcc.patch)
-
-src_prepare() {
-   default
-
-   sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
-   sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
-   sed -i -e '/^DOC =/s/=.*/=/' doc/Makefile || 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
-
-   if use sdl; then
-   myconf="$(use_enable sound sdl-mixer)"
-   else
-   myconf="--disable-sdl-mixer"
-   fi
-
-   ac_cv_path_NCURSES_CONFIG="pkg-config ncursesw" \
-   econf \
-   --bindir="${EPREFIX}"/usr/bin \
-   --with-private-dirs \
-   $(use_enable X x11) \
-   $(use_enable sdl) \
-   $(use_enable ncurses curses) \
-   $(use !sdl && use !ncurses && use !X && \
-   echo --enable-curses) \
-   ${myconf}
-}
-
-src_install() {
-   DOCS="changes.txt faq.txt readme.txt thanks.txt" \
-   default
-
-   dodoc doc/manual.html
-   doenvd "${T}"/99${PN}
-
-   if use X || use sdl ; then
-   if use X; then
-   make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
-   fi
-
-   if use sdl; then
-   make_desktop_entry "angband -msdl" "Angband (SDL)" 
"${PN}"
-   fi
-
-   local s
-   for s in 16 32 128 256 512
-   do
-   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
-   done
-   newicon -s scalable lib/icons/att.svg "${PN}.svg"
-   fi
-}
-
-pkg_preinst() {
-   if use X || use sdl ; then
-   gnome2_icon_savelist
-   fi
-}
-
-pkg_postinst() {
-   echo
-   elog "Angband now uses private savefiles instead of system-wide ones."
-   elog "This ve

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

2019-03-09 Thread James Le Cuirot
commit: 528be1ea6b33d965547036ff07e5f03cc8900247
Author: Stefan Strogin  gmail  com>
AuthorDate: Wed Feb 13 00:43:02 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar  9 22:16:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528be1ea

games-roguelike/angband: minor improvements

- Empty line after EAPI=6.
- Use https.
- Remove unused eutils eclass.
- Sort RDEPEND list.
- Remove a misplaced bracket so that media-libs/sdl-mixer[mp3] is
required only with USE=sound enabled.
- Remove redundant gnome2_icon_savelist call
- Remove obsolete message in pkg_postinst
- Some stylistic changes.

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-roguelike/angband/angband-4.1.3.ebuild | 50 ++--
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/games-roguelike/angband/angband-4.1.3.ebuild 
b/games-roguelike/angband/angband-4.1.3.ebuild
index 00fd80617c2..e6a478bf942 100644
--- a/games-roguelike/angband/angband-4.1.3.ebuild
+++ b/games-roguelike/angband/angband-4.1.3.ebuild
@@ -2,27 +2,32 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eapi7-ver eutils gnome2-utils
+
+inherit autotools eapi7-ver gnome2-utils
 
 MAJOR_PV=$(ver_cut 1-2)
 
 DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
-HOMEPAGE="http://rephial.org/";
-SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
+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 +sound X"
 
-RDEPEND="X? ( x11-libs/libX11 )
-   !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) )
+RDEPEND="!ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) )
ncurses? ( sys-libs/ncurses:0=[unicode] )
-   sdl? ( media-libs/libsdl[video,X]
+   sdl? (
+   media-libs/libsdl[video,X]
media-libs/sdl-image
media-libs/sdl-ttf
-   sound? ( media-libs/libsdl[sound] )
-   media-libs/sdl-mixer[mp3] )"
+   sound? (
+   media-libs/libsdl[sound]
+   media-libs/sdl-mixer[mp3]
+   )
+   )
+   X? ( x11-libs/libX11 )"
 DEPEND="${RDEPEND}
dev-python/docutils
virtual/pkgconfig"
@@ -70,43 +75,24 @@ src_configure() {
 }
 
 src_install() {
-   DOCS="changes.txt faq.txt readme.txt thanks.txt" \
-   default
+   default
 
-   dodoc doc/manual.html
+   dodoc changes.txt faq.txt readme.txt thanks.txt doc/manual.html
doenvd "${T}"/99${PN}
 
if use X || use sdl ; then
-   if use X; then
-   make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
-   fi
-
-   if use sdl; then
-   make_desktop_entry "angband -msdl" "Angband (SDL)" 
"${PN}"
-   fi
+   use X && make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
+   use sdl && make_desktop_entry "angband -msdl" "Angband (SDL)" 
"${PN}"
 
local s
-   for s in 16 32 128 256 512
-   do
+   for s in 16 32 128 256 512; do
newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
done
newicon -s scalable lib/icons/att.svg "${PN}.svg"
fi
 }
 
-pkg_preinst() {
-   if use X || use sdl ; then
-   gnome2_icon_savelist
-   fi
-}
-
 pkg_postinst() {
-   echo
-   elog "Angband now uses private savefiles instead of system-wide ones."
-   elog "This version of Angband is not compatible with the save files"
-   elog "of previous versions."
-   echo
-
if use X || use sdl ; then
gnome2_icon_cache_update
fi



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

2019-03-09 Thread James Le Cuirot
commit: 8d1a254b46c1c2e33b1a6c21cb882ce2ff570198
Author: Stefan Strogin  gmail  com>
AuthorDate: Wed Feb 13 00:59:54 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar  9 22:16:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1a254b

games-roguelike/angband: drop pkg-config hack

It is no longer needed since configure.ac was fixed upstream:
https://github.com/angband/angband/commit/780d86b2b00baaac0b308783d1be1c2cae117dfe

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-roguelike/angband/angband-4.1.3.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-roguelike/angband/angband-4.1.3.ebuild 
b/games-roguelike/angband/angband-4.1.3.ebuild
index e6a478bf942..34d75a13d94 100644
--- a/games-roguelike/angband/angband-4.1.3.ebuild
+++ b/games-roguelike/angband/angband-4.1.3.ebuild
@@ -62,7 +62,6 @@ src_configure() {
myconf="--disable-sdl-mixer"
fi
 
-   ac_cv_path_NCURSES_CONFIG="pkg-config ncursesw" \
econf \
--bindir="${EPREFIX}"/usr/bin \
--with-private-dirs \



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

2019-03-09 Thread James Le Cuirot
commit: a9a3d0e6172c7b0b58fe6a2582a9d313cd1ac9e2
Author: Stefan Strogin  gmail  com>
AuthorDate: Sun Feb 10 15:26:23 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar  9 22:16:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9a3d0e6

games-roguelike/angband: version bump to 4.1.3

Closes: https://bugs.gentoo.org/674542
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11023
Signed-off-by: James Le Cuirot  gentoo.org>

 games-roguelike/angband/Manifest |   1 +
 games-roguelike/angband/angband-4.1.3.ebuild | 113 +++
 2 files changed, 114 insertions(+)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index cd237b9c89b..692435871b6 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1 +1,2 @@
 DIST angband-4.0.5.tar.gz 19886562 BLAKE2B 
3b8410187a66dacc5f2310e116f3abe8ca04e1363701d455df68f3daaf2a23b0ad4811cee2a50129e1f8e096c6ee9e40f8879b25e97510946b4e4ac2a9124631
 SHA512 
9ad46430d7e3c4b7676042b28107a2a5b9b2ed967dd1f45b91ca37583fa2d5e9ba25d963a6510ee091b8fdb3a704a60002d851d7898a6298567f804dce36a88b
+DIST angband-4.1.3.tar.gz 19924395 BLAKE2B 
573181ab9b3a01abdc34cfac9e69a757eb7558c67c9490240890bc920c6c2a8ebea6268b733f06a6e421829d807fa135131c1512edfc344610a269139cc5ac47
 SHA512 
7810e1f04e337c1b5d1ddb6013785c953e0149dfa536c75dd8816fdfd304c37a09103d653cee0c150225c6ba702e121300a65012d8034079cd41f86a730f9c2a

diff --git a/games-roguelike/angband/angband-4.1.3.ebuild 
b/games-roguelike/angband/angband-4.1.3.ebuild
new file mode 100644
index 000..6b989d03273
--- /dev/null
+++ b/games-roguelike/angband/angband-4.1.3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2-utils versionator
+
+MAJOR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
+HOMEPAGE="http://rephial.org/";
+SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ncurses sdl +sound X"
+
+RDEPEND="X? ( x11-libs/libX11 )
+   !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) )
+   ncurses? ( sys-libs/ncurses:0=[unicode] )
+   sdl? ( media-libs/libsdl[video,X]
+   media-libs/sdl-image
+   media-libs/sdl-ttf
+   sound? ( media-libs/libsdl[sound] )
+   media-libs/sdl-mixer[mp3] )"
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   virtual/pkgconfig"
+
+src_prepare() {
+   default
+
+   sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
+   sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
+   sed -i -e '/^DOC =/s/=.*/=/' doc/Makefile || 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
+
+   if use sdl; then
+   myconf="$(use_enable sound sdl-mixer)"
+   else
+   myconf="--disable-sdl-mixer"
+   fi
+
+   ac_cv_path_NCURSES_CONFIG="pkg-config ncursesw" \
+   econf \
+   --bindir="${EPREFIX}"/usr/bin \
+   --with-private-dirs \
+   $(use_enable X x11) \
+   $(use_enable sdl) \
+   $(use_enable ncurses curses) \
+   $(use !sdl && use !ncurses && use !X && \
+   echo --enable-curses) \
+   ${myconf}
+}
+
+src_install() {
+   DOCS="changes.txt faq.txt readme.txt thanks.txt" \
+   default
+
+   dodoc doc/manual.html
+   doenvd "${T}"/99${PN}
+
+   if use X || use sdl ; then
+   if use X; then
+   make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
+   fi
+
+   if use sdl; then
+   make_desktop_entry "angband -msdl" "Angband (SDL)" 
"${PN}"
+   fi
+
+   local s
+   for s in 16 32 128 256 512
+   do
+   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
+   done
+   newicon -s scalable lib/icons/att.svg "${PN}.svg"
+   fi
+}
+
+pkg_preinst() {
+   if use X || use sdl ; then
+   gnome2_icon_savelist
+   fi
+}
+
+pkg_postinst() {
+   echo
+   elog "Angband now uses private savefiles instead of system-wide ones."
+   elog

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

2019-03-09 Thread James Le Cuirot
commit: bf00ddf28179ed8bab64beaa9a13d1bda577bf79
Author: Stefan Strogin  gmail  com>
AuthorDate: Sun Feb 10 15:33:23 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar  9 22:16:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf00ddf2

games-roguelike/angband: migrate from versionator to eapi7-ver

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-roguelike/angband/angband-4.1.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/angband/angband-4.1.3.ebuild 
b/games-roguelike/angband/angband-4.1.3.ebuild
index 6b989d03273..00fd80617c2 100644
--- a/games-roguelike/angband/angband-4.1.3.ebuild
+++ b/games-roguelike/angband/angband-4.1.3.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils gnome2-utils versionator
+inherit autotools eapi7-ver eutils gnome2-utils
 
-MAJOR_PV=$(get_version_component_range 1-2)
+MAJOR_PV=$(ver_cut 1-2)
 
 DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
 HOMEPAGE="http://rephial.org/";



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

2019-03-09 Thread James Le Cuirot
commit: a075426e95a45f7cb03888bc57f26c2228115479
Author: Stefan Strogin  gmail  com>
AuthorDate: Mon Mar  4 18:32:49 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar  9 22:16:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a075426e

games-roguelike/angband: rework USE flag logic

Add REQUIRED_USE "at least one of" X or ncurses, thanks to it we can
drop some tricky conditions in src_configure and RDEPEND.
Besides that angband simply cannot build with USE="-X -ncurses".

Add sound? ( sdl ) to REQUIRED_USE as SDL is needed for sound.
Add media-fonts/font-misc-misc to RDEPEND with USE=X.

Default USE flags in accordance with the upstream configure options:
set +X, +ncurses; disable sound.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Stefan Strogin  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-roguelike/angband/angband-4.1.3.ebuild | 38 +---
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/games-roguelike/angband/angband-4.1.3.ebuild 
b/games-roguelike/angband/angband-4.1.3.ebuild
index 34d75a13d94..830cddc683f 100644
--- a/games-roguelike/angband/angband-4.1.3.ebuild
+++ b/games-roguelike/angband/angband-4.1.3.ebuild
@@ -14,9 +14,15 @@ 
SRC_URI="https://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ncurses sdl +sound X"
+IUSE="+ncurses sdl sound +X"
 
-RDEPEND="!ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) )
+REQUIRED_USE="sound? ( sdl )
+   || ( X ncurses )"
+
+RDEPEND="X? (
+   media-fonts/font-misc-misc
+   x11-libs/libX11
+   )
ncurses? ( sys-libs/ncurses:0=[unicode] )
sdl? (
media-libs/libsdl[video,X]
@@ -26,8 +32,7 @@ RDEPEND="!ncurses? ( !X? ( !sdl? ( 
sys-libs/ncurses:0=[unicode] ) ) )
media-libs/libsdl[sound]
media-libs/sdl-mixer[mp3]
)
-   )
-   X? ( x11-libs/libX11 )"
+   )"
 DEPEND="${RDEPEND}
dev-python/docutils
virtual/pkgconfig"
@@ -54,23 +59,16 @@ src_prepare() {
 }
 
 src_configure() {
-   local myconf
-
-   if use sdl; then
-   myconf="$(use_enable sound sdl-mixer)"
-   else
-   myconf="--disable-sdl-mixer"
-   fi
+   local myconf=(
+   --bindir="${EPREFIX}"/usr/bin
+   --with-private-dirs
+   $(use_enable X x11)
+   $(use_enable sdl)
+   $(use_enable sound sdl-mixer)
+   $(use_enable ncurses curses)
+   )
 
-   econf \
-   --bindir="${EPREFIX}"/usr/bin \
-   --with-private-dirs \
-   $(use_enable X x11) \
-   $(use_enable sdl) \
-   $(use_enable ncurses curses) \
-   $(use !sdl && use !ncurses && use !X && \
-   echo --enable-curses) \
-   ${myconf}
+   econf "${myconf[@]}"
 }
 
 src_install() {



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

2017-09-29 Thread Sergei Trofimovich
commit: 6aeb5e99cde94717abddead0f4346d04d0c9ce7a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep 30 04:02:12 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep 30 04:03:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aeb5e99

games-roguelike/angband: tweak --bindir location for prefix

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 games-roguelike/angband/angband-4.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/angband/angband-4.0.5-r1.ebuild 
b/games-roguelike/angband/angband-4.0.5-r1.ebuild
index 48866f76317..d8830482e59 100644
--- a/games-roguelike/angband/angband-4.0.5-r1.ebuild
+++ b/games-roguelike/angband/angband-4.0.5-r1.ebuild
@@ -61,7 +61,7 @@ src_configure() {
 
ac_cv_path_NCURSES_CONFIG="pkg-config ncursesw" \
econf \
-   --bindir=/usr/bin \
+   --bindir="${EPREFIX}"/usr/bin \
--with-private-dirs \
$(use_enable X x11) \
$(use_enable sdl) \



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

2017-09-09 Thread Sergei Trofimovich
commit: b2832338426a96d988945b1b8e3af751ff27ba26
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep  9 20:41:13 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep  9 20:41:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2832338

games-roguelike/angband: fix build on pie gcc, bug #617982

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/617982
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 games-roguelike/angband/angband-4.0.5-r1.ebuild   |  4 +++-
 games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch | 13 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/games-roguelike/angband/angband-4.0.5-r1.ebuild 
b/games-roguelike/angband/angband-4.0.5-r1.ebuild
index 473728f8c4a..48866f76317 100644
--- a/games-roguelike/angband/angband-4.0.5-r1.ebuild
+++ b/games-roguelike/angband/angband-4.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
dev-python/docutils
virtual/pkgconfig"
 
+PATCHES=("${FILESDIR}"/${P}-pie-gcc.patch)
+
 src_prepare() {
default
 

diff --git a/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch 
b/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch
new file mode 100644
index 000..b4f3c5707d4
--- /dev/null
+++ b/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch
@@ -0,0 +1,13 @@
+Allow gcc to construct correct partial linking command to ld.
+Otherwise ld gets an incompatible mix of '-pie -r'.
+
+https://bugs.gentoo.org/617982
+diff --git a/src/Makefile b/src/Makefile
+index 79be4cc..d27bb91 100644
+--- a/src/Makefile
 b/src/Makefile
+@@ -33,3 +33,3 @@ win/$(PROGNAME).res: win/$(PROGNAME).rc
+ $(PROGNAME).o: $(OBJECTS)
+-  $(LD) -nostdlib -Wl,-r -o $@ $(OBJECTS)
++  $(LD) -nostdlib -r -o $@ $(OBJECTS)
+   @printf "%10s %-20s\n" LINK $@



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

2016-08-05 Thread Austin English
commit: 56788f810102a008b518ee2bccd949ec6d27703a
Author: Austin English  gentoo  org>
AuthorDate: Fri Aug  5 21:06:00 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Fri Aug  5 21:31:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56788f81

games-roguelike/angband: remove deprecated games eclass

Also update to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/574082

Package-Manager: portage-2.3.0

 games-roguelike/angband/angband-4.0.5-r1.ebuild | 114 
 1 file changed, 114 insertions(+)

diff --git a/games-roguelike/angband/angband-4.0.5-r1.ebuild 
b/games-roguelike/angband/angband-4.0.5-r1.ebuild
new file mode 100644
index 000..6b11f3c
--- /dev/null
+++ b/games-roguelike/angband/angband-4.0.5-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils gnome2-utils versionator
+
+MAJOR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
+HOMEPAGE="http://rephial.org/";
+SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ncurses sdl +sound X"
+
+RDEPEND="X? ( x11-libs/libX11 )
+   !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) )
+   ncurses? ( sys-libs/ncurses:0=[unicode] )
+   sdl? ( media-libs/libsdl[video,X]
+   media-libs/sdl-image
+   media-libs/sdl-ttf
+   sound? ( media-libs/libsdl[sound] )
+   media-libs/sdl-mixer[mp3] )"
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   virtual/pkgconfig"
+
+src_prepare() {
+   default
+
+   sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
+   sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
+   sed -i -e '/^DOC =/s/=.*/=/' doc/Makefile || 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
+
+   if use sdl; then
+   myconf="$(use_enable sound sdl-mixer)"
+   else
+   myconf="--disable-sdl-mixer"
+   fi
+
+   ac_cv_path_NCURSES_CONFIG="pkg-config ncursesw" \
+   econf \
+   --bindir=/usr/bin \
+   --with-private-dirs \
+   $(use_enable X x11) \
+   $(use_enable sdl) \
+   $(use_enable ncurses curses) \
+   $(use !sdl && use !ncurses && use !X && \
+   echo --enable-curses) \
+   ${myconf}
+}
+
+src_install() {
+   DOCS="changes.txt faq.txt readme.txt thanks.txt" \
+   default
+
+   dodoc doc/manual.html
+   doenvd "${T}"/99${PN}
+
+   if use X || use sdl ; then
+   if use X; then
+   make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
+   fi
+
+   if use sdl; then
+   make_desktop_entry "angband -msdl" "Angband (SDL)" 
"${PN}"
+   fi
+
+   local s
+   for s in 16 32 128 256 512
+   do
+   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
+   done
+   newicon -s scalable lib/icons/att.svg "${PN}.svg"
+   fi
+}
+
+pkg_preinst() {
+   if use X || use sdl ; then
+   gnome2_icon_savelist
+   fi
+}
+
+pkg_postinst() {
+   echo
+   elog "Angband now uses private savefiles instead of system-wide ones."
+   elog "This version of Angband is not compatible with the save files"
+   elog "of previous versions."
+   echo
+
+   if use X || use sdl ; then
+   gnome2_icon_cache_update
+   fi
+}



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

2016-05-08 Thread Michael Sterrett
commit: 93ac5a10c6de7338cb828211f8fe7d7372fbf50a
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sun May  8 20:21:44 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sun May  8 20:26:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ac5a10

games-roguelike/angband: version bump (bug #582468)

Package-Manager: portage-2.2.26

 games-roguelike/angband/Manifest |   1 +
 games-roguelike/angband/angband-4.0.5.ebuild | 117 +++
 2 files changed, 118 insertions(+)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 5abfef6..d6c6bb0 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1 +1,2 @@
 DIST angband-4.0.4.tar.gz 19888293 SHA256 
93f95444304d5178d23569dbd3dbe1eb29747201d353c676206f26b5bec4667c SHA512 
73dbf0782f042dbc5ee9fe42430041f447a58ec14076280d2d6a44ec2b338dd4a7c220dc36f1b214380852283fb0d6e56fb338c2da95911b450714fb7f71e680
 WHIRLPOOL 
aafa1fb9f0a54f8a39cb194e86fc4df43f0d773da58703b401cda0856ef2f99db7f351f444a3e0405b140a6130dd2da6fb318fde0e66f143ad38c51b7b91fa73
+DIST angband-4.0.5.tar.gz 19886562 SHA256 
0d769a0f349842b0c78cbcd1804a9e08f064e75ca26b957710e4c2a3eb14f852 SHA512 
9ad46430d7e3c4b7676042b28107a2a5b9b2ed967dd1f45b91ca37583fa2d5e9ba25d963a6510ee091b8fdb3a704a60002d851d7898a6298567f804dce36a88b
 WHIRLPOOL 
f725bc940332b90081583f2eccc4890ce1a7a7426bd9f5ae69272beaaa79741797b46ffd283ec2969d14167c6c50d1ff738a573dade045bda79d0c7f51053e5a

diff --git a/games-roguelike/angband/angband-4.0.5.ebuild 
b/games-roguelike/angband/angband-4.0.5.ebuild
new file mode 100644
index 000..8672d41
--- /dev/null
+++ b/games-roguelike/angband/angband-4.0.5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils gnome2-utils versionator games
+
+MAJOR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
+HOMEPAGE="http://rephial.org/";
+SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ncurses sdl +sound X"
+
+RDEPEND="X? ( x11-libs/libX11 )
+   !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) )
+   ncurses? ( sys-libs/ncurses:0=[unicode] )
+   sdl? ( media-libs/libsdl[video,X]
+   media-libs/sdl-ttf
+   media-libs/sdl-image
+   sound? ( media-libs/sdl-mixer[mp3]
+   media-libs/libsdl[sound] ) )"
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   virtual/pkgconfig"
+
+src_prepare() {
+
+   sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
+   sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
+   sed -i -e '/^DOC =/s/=.*/=/' doc/Makefile || 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=\"${GAMES_SYSCONFDIR}/${PN}/customize/\""
+   echo 
"CONFIG_PROTECT_MASK=\"${GAMES_SYSCONFDIR}/${PN}/gamedata/\""
+   } > "${T}"/99${PN} || die
+
+   eautoreconf
+}
+
+src_configure() {
+   local myconf
+
+   if use sdl; then
+   myconf="$(use_enable sound sdl-mixer)"
+   else
+   myconf="--disable-sdl-mixer"
+   fi
+
+   ac_cv_path_NCURSES_CONFIG="pkg-config ncursesw" \
+   egamesconf \
+   --bindir="${GAMES_BINDIR}" \
+   --with-private-dirs \
+   $(use_enable X x11) \
+   $(use_enable sdl) \
+   $(use_enable ncurses curses) \
+   $(use !sdl && use !ncurses && use !X && \
+   echo --enable-curses) \
+   ${myconf}
+}
+
+src_install() {
+   DOCS="changes.txt faq.txt readme.txt thanks.txt" \
+   default
+
+   dohtml doc/manual.html
+   doenvd "${T}"/99${PN}
+
+   if use X || use sdl ; then
+   if use X; then
+   make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
+   fi
+
+   if use sdl; then
+   make_desktop_entry "angband -msdl" "Angband (SDL)" 
"${PN}"
+   fi
+
+   local s
+   for s in 16 32 128 256 512
+   do
+   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
+   done
+   newicon -s scalable lib/icons/att.svg "${PN}.svg"
+   fi
+
+   prepgamesdirs
+}
+
+pkg_preinst() {
+   games_pkg_preinst
+   if use X || use sdl ; then
+   gnome2_icon_savelist
+   fi
+}
+
+pkg_postinst() {
+   echo
+   elog "Angband now uses private savefiles i

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

2016-03-20 Thread Michael Sterrett
commit: 96e12a6b50cba7b0f93c71ba5d499618d15a202f
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sun Mar 20 20:25:25 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sun Mar 20 20:51:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96e12a6b

games-roguelike/angband: clean old

Package-Manager: portage-2.2.26

 games-roguelike/angband/Manifest |   1 -
 games-roguelike/angband/angband-4.0.3.ebuild | 116 ---
 2 files changed, 117 deletions(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 26cecd0..5abfef6 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,2 +1 @@
-DIST angband-4.0.3.tar.gz 19884304 SHA256 
1752d22a164bb073b9a7be322a2b607b06a4c919c073d012c010a61578081ce8 SHA512 
c900648b6972e27ab30aaac776bbad34aee2196b5b80c4574762ff21c7c42a42061f76379ec4c0c2aefdfd1647aa76f2bd9fdd0286a7bc762616d97799e51a24
 WHIRLPOOL 
45c6eb4b71bf51bf2d41d270a8bb699d924137ccce605df867bf098f8545067c405a4ea851fe25e37304c908a13dd4e41229bf653bb87632f2fedb64323f2363
 DIST angband-4.0.4.tar.gz 19888293 SHA256 
93f95444304d5178d23569dbd3dbe1eb29747201d353c676206f26b5bec4667c SHA512 
73dbf0782f042dbc5ee9fe42430041f447a58ec14076280d2d6a44ec2b338dd4a7c220dc36f1b214380852283fb0d6e56fb338c2da95911b450714fb7f71e680
 WHIRLPOOL 
aafa1fb9f0a54f8a39cb194e86fc4df43f0d773da58703b401cda0856ef2f99db7f351f444a3e0405b140a6130dd2da6fb318fde0e66f143ad38c51b7b91fa73

diff --git a/games-roguelike/angband/angband-4.0.3.ebuild 
b/games-roguelike/angband/angband-4.0.3.ebuild
deleted file mode 100644
index d9cfb5f..000
--- a/games-roguelike/angband/angband-4.0.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils gnome2-utils versionator games
-
-MAJOR_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
-HOMEPAGE="http://rephial.org/";
-SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ncurses sdl +sound X"
-
-RDEPEND="X? ( x11-libs/libX11 )
-   !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) )
-   ncurses? ( sys-libs/ncurses:0=[unicode] )
-   sdl? ( media-libs/libsdl[video,X]
-   media-libs/sdl-ttf
-   media-libs/sdl-image
-   sound? ( media-libs/sdl-mixer[mp3]
-   media-libs/libsdl[sound] ) )"
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   virtual/pkgconfig"
-
-src_prepare() {
-
-   sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
-   sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
-   sed -i -e '/^DOC =/s/=.*/=/' doc/Makefile || 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=\"${GAMES_SYSCONFDIR}/${PN}/customize/\""
-   echo 
"CONFIG_PROTECT_MASK=\"${GAMES_SYSCONFDIR}/${PN}/gamedata/\""
-   } > "${T}"/99${PN} || die
-
-   eautoreconf
-}
-
-src_configure() {
-   local myconf
-
-   if use sdl; then
-   myconf="$(use_enable sound sdl-mixer)"
-   else
-   myconf="--disable-sdl-mixer"
-   fi
-
-   egamesconf \
-   --bindir="${GAMES_BINDIR}" \
-   --with-private-dirs \
-   $(use_enable X x11) \
-   $(use_enable sdl) \
-   $(use_enable ncurses curses) \
-   $(use !sdl && use !ncurses && use !X && \
-   echo --enable-curses) \
-   ${myconf}
-}
-
-src_install() {
-   DOCS="changes.txt faq.txt readme.txt thanks.txt" \
-   default
-
-   dohtml doc/manual.html
-   doenvd "${T}"/99${PN}
-
-   if use X || use sdl ; then
-   if use X; then
-   make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
-   fi
-
-   if use sdl; then
-   make_desktop_entry "angband -msdl" "Angband (SDL)" 
"${PN}"
-   fi
-
-   local s
-   for s in 16 32 128 256 512
-   do
-   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
-   done
-   newicon -s scalable lib/icons/att.svg "${PN}.svg"
-   fi
-
-   prepgamesdirs
-}
-
-pkg_preinst() {
-   games_pkg_preinst
-   if use X || use sdl ; then
-   gnome2_icon_savelist
-   fi
-}
-
-pkg_postinst() {
-   echo
-   elog "Angband now uses private savefiles instead of system-wide ones."
-   elog "This version of Angband is not c

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

2016-03-18 Thread Agostino Sarubbo
commit: 5a9aa7aa03528c5d657a0a03f99bd74bdde7cf35
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Mar 16 11:50:24 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Mar 16 11:51:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a9aa7aa

games-roguelike/angband: ppc stable wrt bug #577022

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-roguelike/angband/angband-4.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/angband/angband-4.0.4.ebuild 
b/games-roguelike/angband/angband-4.0.4.ebuild
index 89d1e31..f8c1cdc 100644
--- a/games-roguelike/angband/angband-4.0.4.ebuild
+++ b/games-roguelike/angband/angband-4.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="ncurses sdl +sound X"
 
 RDEPEND="X? ( x11-libs/libX11 )



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

2016-03-15 Thread Agostino Sarubbo
commit: 04dcf1bce05644bee1422c270120acd027a2e106
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Mar 15 15:26:28 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Mar 15 15:26:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04dcf1bc

games-roguelike/angband: x86 stable wrt bug #577022

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-roguelike/angband/angband-4.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/angband/angband-4.0.4.ebuild 
b/games-roguelike/angband/angband-4.0.4.ebuild
index 7276d47..89d1e31 100644
--- a/games-roguelike/angband/angband-4.0.4.ebuild
+++ b/games-roguelike/angband/angband-4.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="ncurses sdl +sound X"
 
 RDEPEND="X? ( x11-libs/libX11 )



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

2016-03-14 Thread Agostino Sarubbo
commit: 73e586705285f72362ad6ef1c1ad32c770aababa
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar 14 22:12:50 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar 14 22:12:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73e58670

games-roguelike/angband: amd64 stable wrt bug #577022

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-roguelike/angband/angband-4.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/angband/angband-4.0.4.ebuild 
b/games-roguelike/angband/angband-4.0.4.ebuild
index 8672d41..7276d47 100644
--- a/games-roguelike/angband/angband-4.0.4.ebuild
+++ b/games-roguelike/angband/angband-4.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="ncurses sdl +sound X"
 
 RDEPEND="X? ( x11-libs/libX11 )



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

2016-02-09 Thread Michael Sterrett
commit: 553b4617f5a7606f88a868537d6acf682d09ded8
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Feb  9 18:46:46 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Feb  9 22:12:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553b4617

games-roguelike/angband: version bump (bug #573604)

Package-Manager: portage-2.2.26

 games-roguelike/angband/Manifest |   1 +
 games-roguelike/angband/angband-4.0.4.ebuild | 117 +++
 2 files changed, 118 insertions(+)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 663f322..26cecd0 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1 +1,2 @@
 DIST angband-4.0.3.tar.gz 19884304 SHA256 
1752d22a164bb073b9a7be322a2b607b06a4c919c073d012c010a61578081ce8 SHA512 
c900648b6972e27ab30aaac776bbad34aee2196b5b80c4574762ff21c7c42a42061f76379ec4c0c2aefdfd1647aa76f2bd9fdd0286a7bc762616d97799e51a24
 WHIRLPOOL 
45c6eb4b71bf51bf2d41d270a8bb699d924137ccce605df867bf098f8545067c405a4ea851fe25e37304c908a13dd4e41229bf653bb87632f2fedb64323f2363
+DIST angband-4.0.4.tar.gz 19888293 SHA256 
93f95444304d5178d23569dbd3dbe1eb29747201d353c676206f26b5bec4667c SHA512 
73dbf0782f042dbc5ee9fe42430041f447a58ec14076280d2d6a44ec2b338dd4a7c220dc36f1b214380852283fb0d6e56fb338c2da95911b450714fb7f71e680
 WHIRLPOOL 
aafa1fb9f0a54f8a39cb194e86fc4df43f0d773da58703b401cda0856ef2f99db7f351f444a3e0405b140a6130dd2da6fb318fde0e66f143ad38c51b7b91fa73

diff --git a/games-roguelike/angband/angband-4.0.4.ebuild 
b/games-roguelike/angband/angband-4.0.4.ebuild
new file mode 100644
index 000..8672d41
--- /dev/null
+++ b/games-roguelike/angband/angband-4.0.4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils gnome2-utils versionator games
+
+MAJOR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
+HOMEPAGE="http://rephial.org/";
+SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ncurses sdl +sound X"
+
+RDEPEND="X? ( x11-libs/libX11 )
+   !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) )
+   ncurses? ( sys-libs/ncurses:0=[unicode] )
+   sdl? ( media-libs/libsdl[video,X]
+   media-libs/sdl-ttf
+   media-libs/sdl-image
+   sound? ( media-libs/sdl-mixer[mp3]
+   media-libs/libsdl[sound] ) )"
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   virtual/pkgconfig"
+
+src_prepare() {
+
+   sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
+   sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
+   sed -i -e '/^DOC =/s/=.*/=/' doc/Makefile || 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=\"${GAMES_SYSCONFDIR}/${PN}/customize/\""
+   echo 
"CONFIG_PROTECT_MASK=\"${GAMES_SYSCONFDIR}/${PN}/gamedata/\""
+   } > "${T}"/99${PN} || die
+
+   eautoreconf
+}
+
+src_configure() {
+   local myconf
+
+   if use sdl; then
+   myconf="$(use_enable sound sdl-mixer)"
+   else
+   myconf="--disable-sdl-mixer"
+   fi
+
+   ac_cv_path_NCURSES_CONFIG="pkg-config ncursesw" \
+   egamesconf \
+   --bindir="${GAMES_BINDIR}" \
+   --with-private-dirs \
+   $(use_enable X x11) \
+   $(use_enable sdl) \
+   $(use_enable ncurses curses) \
+   $(use !sdl && use !ncurses && use !X && \
+   echo --enable-curses) \
+   ${myconf}
+}
+
+src_install() {
+   DOCS="changes.txt faq.txt readme.txt thanks.txt" \
+   default
+
+   dohtml doc/manual.html
+   doenvd "${T}"/99${PN}
+
+   if use X || use sdl ; then
+   if use X; then
+   make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
+   fi
+
+   if use sdl; then
+   make_desktop_entry "angband -msdl" "Angband (SDL)" 
"${PN}"
+   fi
+
+   local s
+   for s in 16 32 128 256 512
+   do
+   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
+   done
+   newicon -s scalable lib/icons/att.svg "${PN}.svg"
+   fi
+
+   prepgamesdirs
+}
+
+pkg_preinst() {
+   games_pkg_preinst
+   if use X || use sdl ; then
+   gnome2_icon_savelist
+   fi
+}
+
+pkg_postinst() {
+   echo
+   elog "Angband now uses private savefiles i

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

2015-12-28 Thread Michael Sterrett
commit: f1f0a0ec2ab04eb41b5eb591a56071dc6cf558cc
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Dec 29 04:00:55 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Dec 29 07:40:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1f0a0ec

old

Package-Manager: portage-2.2.24

 games-roguelike/angband/Manifest |   2 -
 games-roguelike/angband/angband-3.4.1.ebuild | 100 ---
 games-roguelike/angband/angband-3.5.1.ebuild |  98 --
 3 files changed, 200 deletions(-)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 5c7c7c7..663f322 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,3 +1 @@
 DIST angband-4.0.3.tar.gz 19884304 SHA256 
1752d22a164bb073b9a7be322a2b607b06a4c919c073d012c010a61578081ce8 SHA512 
c900648b6972e27ab30aaac776bbad34aee2196b5b80c4574762ff21c7c42a42061f76379ec4c0c2aefdfd1647aa76f2bd9fdd0286a7bc762616d97799e51a24
 WHIRLPOOL 
45c6eb4b71bf51bf2d41d270a8bb699d924137ccce605df867bf098f8545067c405a4ea851fe25e37304c908a13dd4e41229bf653bb87632f2fedb64323f2363
-DIST angband-v3.4.1.tar.gz 17880537 SHA256 
461e36d22c15df330b4d4eaa850e4f2c2da6731d23e99fa13a056249343fd945 SHA512 
76099c8fa999e88ea1324bb70b4dee5df1faccd1fa256cc0c460ce2c5ddae9634fdef876bd0d826e99e6dcc54a9f9cf619d82552dc658d0115b97e0e644c19d3
 WHIRLPOOL 
4e74092deb1868a7c172c206058ebf198f5bdf08f50ebfa5cd3a4a4200998283d9d1896ff39f41fa88f74b78940bee16a3f8a2ce949a69b3e01417017cc32545
-DIST angband-v3.5.1.tar.gz 20539732 SHA256 
c5ca3ab75fd820a49eb2b9ab8b1c2a811ff992276f9800cc61c686e90bd4d447 SHA512 
a45a64b4de1161f327594b93177432c22a00301e7e6058a5e9c1407343c4448217564303578d46f3ea15c94b86aeaf813685a04a70a5dae58511cbf0427b86dc
 WHIRLPOOL 
b5f32d90b9923c8ea00eae762b3e743f3d1175290feb5bd38064a29954e8685545eb2129eabcb98e2386f7d425c9ce966c8824634844d23dd91dbbd8b32586bd

diff --git a/games-roguelike/angband/angband-3.4.1.ebuild 
b/games-roguelike/angband/angband-3.4.1.ebuild
deleted file mode 100644
index 7d383dc..000
--- a/games-roguelike/angband/angband-3.4.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils versionator games
-
-MAJOR_PV=$(get_version_component_range 1-2)
-MY_P=${PN}-v${PV}
-
-DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
-HOMEPAGE="http://rephial.org/";
-SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${MY_P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ncurses sdl +sound X"
-
-RDEPEND="X? ( x11-libs/libX11 )
-   !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses ) ) )
-   ncurses? ( sys-libs/ncurses )
-   sdl? ( media-libs/libsdl[video,X]
-   media-libs/sdl-ttf
-   media-libs/sdl-image
-   sound? ( media-libs/sdl-mixer
-   media-libs/libsdl[sound] ) )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( changes.txt faq.txt readme.txt thanks.txt )
-
-src_prepare() {
-   # fix paths
-   sed -i \
-   -e '/libpath/s#datarootdir#datadir#' \
-   -e '/X_PRE_LIBS/s:-lSM -lICE::' \
-   configure || die
-
-   sed -i \
-   -e "/^.SILENT/d" \
-   mk/buildsys.mk.in || die
-}
-
-src_configure() {
-   local myconf
-
-   if use sdl; then
-   myconf="$(use_enable sound sdl-mixer)"
-   else
-   myconf="--disable-sdl-mixer"
-   fi
-
-   egamesconf \
-   --bindir="${GAMES_BINDIR}" \
-   --with-private-dirs \
-   $(use_enable X x11) \
-   $(use_enable sdl) \
-   $(use_enable ncurses curses) \
-   $(use !sdl && use !ncurses && use !X && \
-   echo --enable-curses) \
-   ${myconf}
-}
-
-src_install() {
-   default
-
-   # Edit files are now system config files in Angband, but
-   # users will be hidden from applying updates by default
-   echo "CONFIG_PROTECT_MASK=\"${GAMES_SYSCONFDIR}/${PN}/edit/\"" \
-   > "${T}"/99${PN}
-   doenvd "${T}"/99${PN} || die
-
-   # Create desktop entries if required.
-   ICON_LOC="${GAMES_DATADIR}/${PN}/xtra/icon/att-32.png"
-   if use X; then
-   make_desktop_entry "angband -mx11" "Angband (X11)" "${ICON_LOC}"
-   fi
-
-   if use sdl; then
-   make_desktop_entry "angband -msdl" "Angband (SDL)" "${ICON_LOC}"
-   fi
-
-   use ncurses || rm -rf "${D}${GAMES_DATADIR}/${PN}/xtra/graf"
-   use sound || rm -rf "${D}${GAMES_DATADIR}/${PN}/xtra/sound"
-
-   prepgamesdirs
-}
-
-pkg_postinst() {
-   echo
-   elog "Angband now uses private savefiles instead of system-wide ones"
-   elog "This version of Angband is not compatible w

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

2015-12-07 Thread Agostino Sarubbo
commit: 8846ffe907f650d8633077cb1a1284cad8e2ab40
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec  7 11:39:06 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec  7 11:40:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8846ffe9

games-roguelike/angband: ppc stable wrt bug #567668

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-roguelike/angband/angband-4.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/angband/angband-4.0.3.ebuild 
b/games-roguelike/angband/angband-4.0.3.ebuild
index 841ba0a..da72dbb 100644
--- a/games-roguelike/angband/angband-4.0.3.ebuild
+++ b/games-roguelike/angband/angband-4.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE="ncurses sdl +sound X"
 
 RDEPEND="X? ( x11-libs/libX11 )



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

2015-12-07 Thread Agostino Sarubbo
commit: 606994ea73a73af5988fb41544b0e656508427ae
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec  7 10:02:15 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec  7 10:02:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=606994ea

games-roguelike/angband: amd64 stable wrt bug #567668

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-roguelike/angband/angband-4.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-roguelike/angband/angband-4.0.3.ebuild 
b/games-roguelike/angband/angband-4.0.3.ebuild
index a8a4ff6..841ba0a 100644
--- a/games-roguelike/angband/angband-4.0.3.ebuild
+++ b/games-roguelike/angband/angband-4.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="ncurses sdl +sound X"
 
 RDEPEND="X? ( x11-libs/libX11 )



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

2015-11-05 Thread Michael Sterrett
commit: aa2734763bbfc4e87a8f052c88fa452f726991c1
Author: Michael Sterrett  gentoo  org>
AuthorDate: Fri Nov  6 05:29:53 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Fri Nov  6 05:29:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa273476

version bump (bug #564118)

Package-Manager: portage-2.2.20.1

 games-roguelike/angband/Manifest |   1 +
 games-roguelike/angband/angband-4.0.3.ebuild | 116 +++
 2 files changed, 117 insertions(+)

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index e146ae8..5c7c7c7 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,2 +1,3 @@
+DIST angband-4.0.3.tar.gz 19884304 SHA256 
1752d22a164bb073b9a7be322a2b607b06a4c919c073d012c010a61578081ce8 SHA512 
c900648b6972e27ab30aaac776bbad34aee2196b5b80c4574762ff21c7c42a42061f76379ec4c0c2aefdfd1647aa76f2bd9fdd0286a7bc762616d97799e51a24
 WHIRLPOOL 
45c6eb4b71bf51bf2d41d270a8bb699d924137ccce605df867bf098f8545067c405a4ea851fe25e37304c908a13dd4e41229bf653bb87632f2fedb64323f2363
 DIST angband-v3.4.1.tar.gz 17880537 SHA256 
461e36d22c15df330b4d4eaa850e4f2c2da6731d23e99fa13a056249343fd945 SHA512 
76099c8fa999e88ea1324bb70b4dee5df1faccd1fa256cc0c460ce2c5ddae9634fdef876bd0d826e99e6dcc54a9f9cf619d82552dc658d0115b97e0e644c19d3
 WHIRLPOOL 
4e74092deb1868a7c172c206058ebf198f5bdf08f50ebfa5cd3a4a4200998283d9d1896ff39f41fa88f74b78940bee16a3f8a2ce949a69b3e01417017cc32545
 DIST angband-v3.5.1.tar.gz 20539732 SHA256 
c5ca3ab75fd820a49eb2b9ab8b1c2a811ff992276f9800cc61c686e90bd4d447 SHA512 
a45a64b4de1161f327594b93177432c22a00301e7e6058a5e9c1407343c4448217564303578d46f3ea15c94b86aeaf813685a04a70a5dae58511cbf0427b86dc
 WHIRLPOOL 
b5f32d90b9923c8ea00eae762b3e743f3d1175290feb5bd38064a29954e8685545eb2129eabcb98e2386f7d425c9ce966c8824634844d23dd91dbbd8b32586bd

diff --git a/games-roguelike/angband/angband-4.0.3.ebuild 
b/games-roguelike/angband/angband-4.0.3.ebuild
new file mode 100644
index 000..dec221f
--- /dev/null
+++ b/games-roguelike/angband/angband-4.0.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils gnome2-utils versionator games
+
+MAJOR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. 
Tolkien"
+HOMEPAGE="http://rephial.org/";
+SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ncurses sdl +sound X"
+
+RDEPEND="X? ( x11-libs/libX11 )
+   !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses[unicode] ) ) )
+   ncurses? ( sys-libs/ncurses[unicode] )
+   sdl? ( media-libs/libsdl[video,X]
+   media-libs/sdl-ttf
+   media-libs/sdl-image
+   sound? ( media-libs/sdl-mixer[mp3]
+   media-libs/libsdl[sound] ) )"
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   virtual/pkgconfig"
+
+src_prepare() {
+
+   sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
+   sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
+   sed -i -e '/^DOC =/s/=.*/=/' doc/Makefile || 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=\"${GAMES_SYSCONFDIR}/${PN}/customize/\""
+   echo 
"CONFIG_PROTECT_MASK=\"${GAMES_SYSCONFDIR}/${PN}/gamedata/\""
+   } > "${T}"/99${PN} || die
+
+   eautoreconf
+}
+
+src_configure() {
+   local myconf
+
+   if use sdl; then
+   myconf="$(use_enable sound sdl-mixer)"
+   else
+   myconf="--disable-sdl-mixer"
+   fi
+
+   egamesconf \
+   --bindir="${GAMES_BINDIR}" \
+   --with-private-dirs \
+   $(use_enable X x11) \
+   $(use_enable sdl) \
+   $(use_enable ncurses curses) \
+   $(use !sdl && use !ncurses && use !X && \
+   echo --enable-curses) \
+   ${myconf}
+}
+
+src_install() {
+   DOCS="changes.txt faq.txt readme.txt thanks.txt" \
+   default
+
+   dohtml doc/manual.html
+   doenvd "${T}"/99${PN}
+
+   if use X || use sdl ; then
+   if use X; then
+   make_desktop_entry "angband -mx11" "Angband (X11)" 
"${PN}"
+   fi
+
+   if use sdl; then
+   make_desktop_entry "angband -msdl" "Angband (SDL)" 
"${PN}"
+   fi
+
+   local s
+   for s in 16 32 128 256 512
+   do
+   newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
+   done
+ 

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

2015-11-05 Thread Michael Sterrett
commit: 77e0f3c7a277a0746f87f216a98b3e1692d5d5be
Author: Michael Sterrett  gentoo  org>
AuthorDate: Fri Nov  6 05:33:04 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Fri Nov  6 05:33:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77e0f3c7

add slot to ncurses dep

Package-Manager: portage-2.2.20.1

 games-roguelike/angband/angband-4.0.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/angband/angband-4.0.3.ebuild 
b/games-roguelike/angband/angband-4.0.3.ebuild
index dec221f..a8a4ff6 100644
--- a/games-roguelike/angband/angband-4.0.3.ebuild
+++ b/games-roguelike/angband/angband-4.0.3.ebuild
@@ -17,8 +17,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ncurses sdl +sound X"
 
 RDEPEND="X? ( x11-libs/libX11 )
-   !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses[unicode] ) ) )
-   ncurses? ( sys-libs/ncurses[unicode] )
+   !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) )
+   ncurses? ( sys-libs/ncurses:0=[unicode] )
sdl? ( media-libs/libsdl[video,X]
media-libs/sdl-ttf
media-libs/sdl-image



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

2015-08-26 Thread Michael Sterrett
commit: a99a0fab412f08a493b692ba1abc42d7b35579dc
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sat Aug 22 08:12:36 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Wed Aug 26 16:42:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a99a0fab

games-roguelike/angband: sys-libs/ncurses needs unicode use flag (bug #558172)

Package-Manager: portage-2.2.20.1

 games-roguelike/angband/angband-3.5.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-roguelike/angband/angband-3.5.1.ebuild 
b/games-roguelike/angband/angband-3.5.1.ebuild
index a3cbb86..8a7f562 100644
--- a/games-roguelike/angband/angband-3.5.1.ebuild
+++ b/games-roguelike/angband/angband-3.5.1.ebuild
@@ -18,8 +18,8 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE="ncurses sdl +sound X"
 
 RDEPEND="X? ( x11-libs/libX11 )
-   !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses ) ) )
-   ncurses? ( sys-libs/ncurses )
+   !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses[unicode] ) ) )
+   ncurses? ( sys-libs/ncurses[unicode] )
sdl? ( media-libs/libsdl[video,X]
media-libs/sdl-ttf
media-libs/sdl-image