gentoo resync : 29.12.2022

5 files changed, 100 insertions, 4 deletions

diff --git a/games-roguelike/hengband/Manifest b/games-roguelike/hengband/Manifest
index 16d5a26b5b9a..c2643d80c43c 100644
--- a/games-roguelike/hengband/Manifest
+++ b/games-roguelike/hengband/Manifest
@@ -1,7 +1,10 @@
 AUX hengband-1.6.2-added_faq.patch 6371 BLAKE2B 322267980e2b9ddc75245528a1a29fae0936e6cb3a6d87287e4e4d475090c37c47b9d8268fbe52cc5e6725f6a2d034d28c4fdecba57a23137384340a5e5c3fcb SHA512 254283e117f6bf7d050ec152d7bb04cdcbd23235f56da8ed8aa587e23ef21de0a556cac4027e8a3b0fa32d66448c96ac18e9e76d242b9d1a921befcaf78195a1
 AUX hengband-1.6.2-autoconf-ncurses.patch 939 BLAKE2B 434adedaf4e301ba504ef4af113e8466634f468e29572a0dbc08f7cfe3a4c1c108df9e2cf2ccc5c15e784ff6fe291d285331f9741a231da66b52ad27763988a6 SHA512 509d50cb3e9080d2e060da3efdc0a8b96e921b0668389f797ec23657a8617932f245ed0da9eb0a9cf1ec97c4f5adfc45d05c8ae4fa45677ed10e02226aabee6b
 AUX hengband-1.6.2-ovflfix.patch 308 BLAKE2B 9ba098376a067d919a569d3fc104f5deff57524e22609871842c244aaf816db076456af16917ec0b6c03b6f42e9e07e0b69d51d60f18b8cd62f86483632a243e SHA512 f50e4d247dfac9df2b0f292f15488179b490db57f2ef919173325e8fd4c0dcd47be1b6a96313940aec06790cefe4c26ce1a26029182691981d2927e58e7ef00d
+AUX hengband-2.1.2-autoconf-ncurses.patch 1189 BLAKE2B 0ecf5bd59b4426dc489e281ce3a56e0e04d35c1a210e79be09bde87e36219b0c112cd9da839bb16db5aa9502913361a033ce00564f4b575f90466c47fbf31908 SHA512 09cf2efdd1b3b0f83709b422479fc44cc4f660ca7a0b73db0f4c08e9888ccce590c5bab04efa9a7179915e78d9a1aff2a2a43ea3ea75f4945e7dfcdcb2d88b1c
 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
-EBUILD hengband-1.6.2-r1.ebuild 1446 BLAKE2B 46baa4715f6e4e074170c3083efcf883ef068a75618579ce2daf7f734f373689bc7d547fe9370ff73a5215297b18421e23c6ef1cb1c77f162c59576cdd67ceed SHA512 58fc37dbbd377fc40f481c1d30bfe35a4303dc9d9856a8298606236cf21db90ac5e207817bd7a19f02d4f0b12f218e1290e6faa4abd82ba71d5caf434a193198
-MISC metadata.xml 335 BLAKE2B 36bbe1145fd3906ec765307b18c168c0cce6956cb88c3807cb48ba53604ad8932bd7e2a4d6095ed1ea6eac693ad65e7151e36be8a81eff7caed2bf3e6c858625 SHA512 089640e668500338eda9d1585d25347bcb37dbbf51107452abb365312dc1bce57cae528e98271f84c1ae9e24c0c8021f70ae2f626ee1fd30cdc8d79397a89a8b
+DIST hengband-2.2.1.tar.gz 2977622 BLAKE2B 229dbae112e733c0f8de0210fb311a0f8a0306f0b84866386fd00fedc75e72721dc5d3f79b271e90b848d01165746b8d5fa21e4ec50d4b50a824151749595095 SHA512 a84aa9a01efd787f2a459b70ac8cf6db3eb8f17d10276bc38c026276f446ada8ff6db3902ae970c2ef263187e9cd7f51b9a59c8bd6fa2d96161ba6bfe0914cab
+EBUILD hengband-1.6.2-r1.ebuild 1439 BLAKE2B a4c64b6d0883a1690d7a017d508deae2a4b7815dcb32bf7d590807e9fa3cb5417de41bf27021f6edeea9a96db8574d7abeb54b924ca59d9e7143173a3471c600 SHA512 c05a4ab8c1de48cb3ca5ffdb5b01cf2fde1fd848cc7766e2c0ce34a40208dee865acc10eec9dd927fa2f3cc55db7657d64aaf941411d9f64b13076066aa64437
+EBUILD hengband-2.2.1.ebuild 1270 BLAKE2B 03e875ba80bb9f539405d669d2ddc34c24f483d6e2a881a6513958ced396b725cd87e13e82e97ecf94225f7203397f50541ca4cb3cf88f854921046d6566face SHA512 ba5dfc4469686d7b74e0e7a1c6e53a8b2aa96c88e33d64126d746145f86ea7c43a7ce7ca8fdc0696fb245cc1d43dc3fc9907b673b9d170a377f81161bae60743
+MISC metadata.xml 325 BLAKE2B faf40c9ebc4d9eb31c2cb4d9d8b82728efec0a780f5c6ca3c3b5d6a8a83e4e2eba8afc2f94b67b121725a5851ebdb1298d222a6ec744a183763c6c216b7ba257 SHA512 99e72bc23012663d16b895d55f7f888ed7e9829a28707a69d279667e9dba5e4ce54c7156f8a5ca078bbc6b31b7e4770ebef332243d811602701a4b9c03da1992
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
+}
diff --git a/games-roguelike/hengband/metadata.xml b/games-roguelike/hengband/metadata.xml
index 8f0fc036cdbc..c1857cbd91cf 100644
--- a/games-roguelike/hengband/metadata.xml
+++ b/games-roguelike/hengband/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge-jp">hengband</remote-id>
+		<remote-id type="osdn">hengband</remote-id>
 	</upstream>
 </pkgmetadata>