4 files changed, 95 insertions, 1 deletions
diff --git a/games-roguelike/hengband/Manifest b/games-roguelike/hengband/Manifest
index 6d3fe0d9ac75..775be8755cd7 100644
--- a/games-roguelike/hengband/Manifest
+++ b/games-roguelike/hengband/Manifest
@@ -1,2 +1,3 @@
 DIST hengband-1.6.2-mispellings.patch.gz 11964 BLAKE2B a409161c70d655078396c8774b251cbb467802eaa9d6c96322a49ba1956fb3c9a5ba24d8de74907afea96c1df62fdfee3fe581a45e19b77e51f917e862c63531 SHA512 73838981616e09deca7afc3911386e665ac38fafcdcea42d87bc41e4bc187551278efeaa608a772a444e0c178c3f990e16dd302b6a8dc6dfdd8625d463b9b3b5
 DIST hengband-1.6.2.tar.bz2 2029169 BLAKE2B 3a25a829f3fba8bd265d0b13fc81becbbf505dcb4efd78010d6cc8db29bb4be22911d18bf7c4496e4b408c3742aa12c36060bacd62bb79de0be4fa5c36191afa SHA512 24c67f00556d7899b4f18f3071c4bd50bc754566c4c4736c18248ced243b1332e6c84381250c1a59358e7a914e5d62db05c47ab0921bcf40fbd6cfe4b6717520
+DIST hengband-2.2.1.tar.gz 2977622 BLAKE2B 229dbae112e733c0f8de0210fb311a0f8a0306f0b84866386fd00fedc75e72721dc5d3f79b271e90b848d01165746b8d5fa21e4ec50d4b50a824151749595095 SHA512 a84aa9a01efd787f2a459b70ac8cf6db3eb8f17d10276bc38c026276f446ada8ff6db3902ae970c2ef263187e9cd7f51b9a59c8bd6fa2d96161ba6bfe0914cab
diff --git a/games-roguelike/hengband/files/hengband-2.1.2-autoconf-ncurses.patch b/games-roguelike/hengband/files/hengband-2.1.2-autoconf-ncurses.patch
new file mode 100644
index 000000000000..4f695310d7b5
--- /dev/null
+++ b/games-roguelike/hengband/files/hengband-2.1.2-autoconf-ncurses.patch
@@ -0,0 +1,28 @@
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2018-03-19 11:04:42.000000000 +0000
++++ b/configure.ac	2022-05-31 22:18:52.959822579 +0100
+@@ -51,16 +51,14 @@
+ 
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lncurses:
+-AC_CHECK_LIB(ncursesw, initscr, [AC_DEFINE(USE_GCU, 1, [Allow -mGCU environment]) AC_DEFINE(USE_NCURSES, 1, [Use ncurses]) LIBS="$LIBS -lncursesw"])
+-if test "$ac_cv_lib_ncursesw_initscr" != yes; then
+-  AC_CHECK_LIB(ncurses, initscr, [AC_DEFINE(USE_GCU, 1, [Allow -mGCU environment]) AC_DEFINE(USE_NCURSES, 1, [Use ncurses]) LIBS="$LIBS -lncurses"])
+-  if test "$ac_cv_lib_ncurses_initscr" != yes; then
+-    AC_CHECK_LIB(curses, initscr, [AC_DEFINE(USE_GCU, 1, [Allow -mGCU environment]) LIBS="$LIBS -lcurses"])
+-    if test "$ac_cv_lib_curses_initscr" != yes; then
+-      AC_CHECK_LIB(termcap, tgetent, [AC_DEFINE(USE_CAP, 1, [Allow -mCAP environment]) LIBS="$LIBS -ltermcap"])
+-    fi
+-  fi
+-fi
++PKG_CHECK_MODULES(
++    [NCURSES],
++    [ncurses],
++    [AC_DEFINE(USE_GCU, 1, [Allow -mGCU environment])
++     AC_DEFINE(USE_NCURSES, 1, [Use ncurses])
++     [LIBS="${LIBS} ${NCURSES_LIBS}"]
++    ]
++)
+ 
+ AC_CHECK_LIB(iconv, iconv_open)
+ 
diff --git a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild b/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
index e6fb57c68472..8b526ce1d82e 100644
--- a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
+++ b/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="An Angband variant, with a Japanese/fantasy theme"
-HOMEPAGE="http://hengband.sourceforge.jp/en/"
+HOMEPAGE="https://hengband.github.io/"
 SRC_URI="mirror://sourceforge.jp/hengband/10331/${P}.tar.bz2
 	mirror://gentoo/${P}-mispellings.patch.gz"
 
diff --git a/games-roguelike/hengband/hengband-2.2.1.ebuild b/games-roguelike/hengband/hengband-2.2.1.ebuild
new file mode 100644
index 000000000000..adcef5288ffb
--- /dev/null
+++ b/games-roguelike/hengband/hengband-2.2.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="An Angband variant, with a Japanese/fantasy theme"
+HOMEPAGE="https://hengband.github.io/"
+SRC_URI="https://github.com/hengband/hengband/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Moria"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X l10n_ja"
+
+RDEPEND="
+	>=sys-libs/ncurses-5:0=
+	X? ( x11-libs/libX11 )
+"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-libs/libXt )
+"
+BDEPEND="
+	virtual/pkgconfig
+	l10n_ja? ( app-i18n/nkf )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.2-autoconf-ncurses.patch"
+)
+
+src_prepare() {
+	# Fix syntax for chown.
+	sed -i '/chown/s/\./:/' lib/*/Makefile.am || die
+	# Don't use the games sub-dir since we're not using games.eclass any more.
+	sed -i 's:/games/:/:g' configure.ac || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--bindir="${EPREFIX}"/usr/bin
+		--with-setgid="nobody"
+		$(use_with X x)
+	)
+	use l10n_ja || myconf+=( --disable-japanese )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dodoc lib/help/faq.txt
+
+	if use l10n_ja ; then
+		dodoc readme.txt autopick.txt readme_eng.txt autopick_eng.txt
+	else
+		newdoc readme_eng.txt readme.txt
+		newdoc autopick_eng.txt autopick.txt
+	fi
+}