From a01f4694e14e5b45c3158c625caf45476c301ee3 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 28 Oct 2021 00:00:18 +0100 Subject: games-roguelike/angband: Revbump following the earlier fix Turns out the other issue is in a different package. Signed-off-by: James Le Cuirot --- games-roguelike/angband/angband-4.2.2-r1.ebuild | 104 ------------------------ games-roguelike/angband/angband-4.2.2-r2.ebuild | 104 ++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 104 deletions(-) delete mode 100644 games-roguelike/angband/angband-4.2.2-r1.ebuild create mode 100644 games-roguelike/angband/angband-4.2.2-r2.ebuild diff --git a/games-roguelike/angband/angband-4.2.2-r1.ebuild b/games-roguelike/angband/angband-4.2.2-r1.ebuild deleted file mode 100644 index 4fad7e5591c7..000000000000 --- a/games-roguelike/angband/angband-4.2.2-r1.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 -} - -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/angband-4.2.2-r2.ebuild b/games-roguelike/angband/angband-4.2.2-r2.ebuild new file mode 100644 index 000000000000..4fad7e5591c7 --- /dev/null +++ b/games-roguelike/angband/angband-4.2.2-r2.ebuild @@ -0,0 +1,104 @@ +# 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 +} + +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 +} -- cgit v1.2.3-65-gdbad