| 1 |
commit: 5284495bcc20ee27aa9925605db781156ccc4f4c |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 31 21:22:06 2022 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 31 21:22:32 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5284495b |
| 7 |
|
| 8 |
games-roguelike/hengband: Version bump to 2.1.2, EAPI 8 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/846815 |
| 11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 12 |
|
| 13 |
games-roguelike/hengband/Manifest | 1 + |
| 14 |
.../files/hengband-2.1.2-autoconf-ncurses.patch | 28 +++++++++++++++++ |
| 15 |
games-roguelike/hengband/hengband-1.6.2-r1.ebuild | 2 +- |
| 16 |
...gband-1.6.2-r1.ebuild => hengband-2.2.1.ebuild} | 35 ++++++++++------------ |
| 17 |
4 files changed, 45 insertions(+), 21 deletions(-) |
| 18 |
|
| 19 |
diff --git a/games-roguelike/hengband/Manifest b/games-roguelike/hengband/Manifest |
| 20 |
index 6d3fe0d9ac75..775be8755cd7 100644 |
| 21 |
--- a/games-roguelike/hengband/Manifest |
| 22 |
+++ b/games-roguelike/hengband/Manifest |
| 23 |
@@ -1,2 +1,3 @@ |
| 24 |
DIST hengband-1.6.2-mispellings.patch.gz 11964 BLAKE2B a409161c70d655078396c8774b251cbb467802eaa9d6c96322a49ba1956fb3c9a5ba24d8de74907afea96c1df62fdfee3fe581a45e19b77e51f917e862c63531 SHA512 73838981616e09deca7afc3911386e665ac38fafcdcea42d87bc41e4bc187551278efeaa608a772a444e0c178c3f990e16dd302b6a8dc6dfdd8625d463b9b3b5 |
| 25 |
DIST hengband-1.6.2.tar.bz2 2029169 BLAKE2B 3a25a829f3fba8bd265d0b13fc81becbbf505dcb4efd78010d6cc8db29bb4be22911d18bf7c4496e4b408c3742aa12c36060bacd62bb79de0be4fa5c36191afa SHA512 24c67f00556d7899b4f18f3071c4bd50bc754566c4c4736c18248ced243b1332e6c84381250c1a59358e7a914e5d62db05c47ab0921bcf40fbd6cfe4b6717520 |
| 26 |
+DIST hengband-2.2.1.tar.gz 2977622 BLAKE2B 229dbae112e733c0f8de0210fb311a0f8a0306f0b84866386fd00fedc75e72721dc5d3f79b271e90b848d01165746b8d5fa21e4ec50d4b50a824151749595095 SHA512 a84aa9a01efd787f2a459b70ac8cf6db3eb8f17d10276bc38c026276f446ada8ff6db3902ae970c2ef263187e9cd7f51b9a59c8bd6fa2d96161ba6bfe0914cab |
| 27 |
|
| 28 |
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 |
| 29 |
new file mode 100644 |
| 30 |
index 000000000000..4f695310d7b5 |
| 31 |
--- /dev/null |
| 32 |
+++ b/games-roguelike/hengband/files/hengband-2.1.2-autoconf-ncurses.patch |
| 33 |
@@ -0,0 +1,28 @@ |
| 34 |
+diff -Naur a/configure.ac b/configure.ac |
| 35 |
+--- a/configure.ac 2018-03-19 11:04:42.000000000 +0000 |
| 36 |
++++ b/configure.ac 2022-05-31 22:18:52.959822579 +0100 |
| 37 |
+@@ -51,16 +51,14 @@ |
| 38 |
+ |
| 39 |
+ dnl Checks for libraries. |
| 40 |
+ dnl Replace `main' with a function in -lncurses: |
| 41 |
+-AC_CHECK_LIB(ncursesw, initscr, [AC_DEFINE(USE_GCU, 1, [Allow -mGCU environment]) AC_DEFINE(USE_NCURSES, 1, [Use ncurses]) LIBS="$LIBS -lncursesw"]) |
| 42 |
+-if test "$ac_cv_lib_ncursesw_initscr" != yes; then |
| 43 |
+- AC_CHECK_LIB(ncurses, initscr, [AC_DEFINE(USE_GCU, 1, [Allow -mGCU environment]) AC_DEFINE(USE_NCURSES, 1, [Use ncurses]) LIBS="$LIBS -lncurses"]) |
| 44 |
+- if test "$ac_cv_lib_ncurses_initscr" != yes; then |
| 45 |
+- AC_CHECK_LIB(curses, initscr, [AC_DEFINE(USE_GCU, 1, [Allow -mGCU environment]) LIBS="$LIBS -lcurses"]) |
| 46 |
+- if test "$ac_cv_lib_curses_initscr" != yes; then |
| 47 |
+- AC_CHECK_LIB(termcap, tgetent, [AC_DEFINE(USE_CAP, 1, [Allow -mCAP environment]) LIBS="$LIBS -ltermcap"]) |
| 48 |
+- fi |
| 49 |
+- fi |
| 50 |
+-fi |
| 51 |
++PKG_CHECK_MODULES( |
| 52 |
++ [NCURSES], |
| 53 |
++ [ncurses], |
| 54 |
++ [AC_DEFINE(USE_GCU, 1, [Allow -mGCU environment]) |
| 55 |
++ AC_DEFINE(USE_NCURSES, 1, [Use ncurses]) |
| 56 |
++ [LIBS="${LIBS} ${NCURSES_LIBS}"] |
| 57 |
++ ] |
| 58 |
++) |
| 59 |
+ |
| 60 |
+ AC_CHECK_LIB(iconv, iconv_open) |
| 61 |
+ |
| 62 |
|
| 63 |
diff --git a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild b/games-roguelike/hengband/hengband-1.6.2-r1.ebuild |
| 64 |
index e6fb57c68472..8b526ce1d82e 100644 |
| 65 |
--- a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild |
| 66 |
+++ b/games-roguelike/hengband/hengband-1.6.2-r1.ebuild |
| 67 |
@@ -6,7 +6,7 @@ EAPI=7 |
| 68 |
inherit autotools |
| 69 |
|
| 70 |
DESCRIPTION="An Angband variant, with a Japanese/fantasy theme" |
| 71 |
-HOMEPAGE="http://hengband.sourceforge.jp/en/" |
| 72 |
+HOMEPAGE="https://hengband.github.io/" |
| 73 |
SRC_URI="mirror://sourceforge.jp/hengband/10331/${P}.tar.bz2 |
| 74 |
mirror://gentoo/${P}-mispellings.patch.gz" |
| 75 |
|
| 76 |
|
| 77 |
diff --git a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild b/games-roguelike/hengband/hengband-2.2.1.ebuild |
| 78 |
similarity index 51% |
| 79 |
copy from games-roguelike/hengband/hengband-1.6.2-r1.ebuild |
| 80 |
copy to games-roguelike/hengband/hengband-2.2.1.ebuild |
| 81 |
index e6fb57c68472..adcef5288ffb 100644 |
| 82 |
--- a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild |
| 83 |
+++ b/games-roguelike/hengband/hengband-2.2.1.ebuild |
| 84 |
@@ -1,18 +1,17 @@ |
| 85 |
-# Copyright 1999-2021 Gentoo Authors |
| 86 |
+# Copyright 1999-2022 Gentoo Authors |
| 87 |
# Distributed under the terms of the GNU General Public License v2 |
| 88 |
|
| 89 |
-EAPI=7 |
| 90 |
+EAPI=8 |
| 91 |
|
| 92 |
inherit autotools |
| 93 |
|
| 94 |
DESCRIPTION="An Angband variant, with a Japanese/fantasy theme" |
| 95 |
-HOMEPAGE="http://hengband.sourceforge.jp/en/" |
| 96 |
-SRC_URI="mirror://sourceforge.jp/hengband/10331/${P}.tar.bz2 |
| 97 |
- mirror://gentoo/${P}-mispellings.patch.gz" |
| 98 |
+HOMEPAGE="https://hengband.github.io/" |
| 99 |
+SRC_URI="https://github.com/hengband/hengband/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" |
| 100 |
|
| 101 |
LICENSE="Moria" |
| 102 |
SLOT="0" |
| 103 |
-KEYWORDS="~x86" |
| 104 |
+KEYWORDS="~amd64 ~x86" |
| 105 |
IUSE="X l10n_ja" |
| 106 |
|
| 107 |
RDEPEND=" |
| 108 |
@@ -23,27 +22,22 @@ DEPEND=" |
| 109 |
${RDEPEND} |
| 110 |
X? ( x11-libs/libXt ) |
| 111 |
" |
| 112 |
-BDEPEND="virtual/pkgconfig" |
| 113 |
+BDEPEND=" |
| 114 |
+ virtual/pkgconfig |
| 115 |
+ l10n_ja? ( app-i18n/nkf ) |
| 116 |
+" |
| 117 |
|
| 118 |
PATCHES=( |
| 119 |
- "${FILESDIR}/${PN}-1.6.2-added_faq.patch" |
| 120 |
- "${FILESDIR}/${PN}-1.6.2-autoconf-ncurses.patch" |
| 121 |
- "${FILESDIR}/${PN}-1.6.2-ovflfix.patch" |
| 122 |
+ "${FILESDIR}/${PN}-2.1.2-autoconf-ncurses.patch" |
| 123 |
) |
| 124 |
|
| 125 |
src_prepare() { |
| 126 |
- # Removing Xaw dependency as is not used |
| 127 |
- sed -i -e '/Xaw/d' src/main-xaw.c || die |
| 128 |
- # Fix syntax for chown |
| 129 |
- sed -i -e 's|root\.|root:|' lib/*/Makefile.in || die |
| 130 |
- # Don't target the games sub-dir, since we're not using games.eclass any |
| 131 |
- # more |
| 132 |
- sed -i -e 's:/games/:/:g' configure.in || die |
| 133 |
+ # Fix syntax for chown. |
| 134 |
+ sed -i '/chown/s/\./:/' lib/*/Makefile.am || die |
| 135 |
+ # Don't use the games sub-dir since we're not using games.eclass any more. |
| 136 |
+ sed -i 's:/games/:/:g' configure.ac || die |
| 137 |
|
| 138 |
default |
| 139 |
- |
| 140 |
- mv configure.in configure.ac || die |
| 141 |
- |
| 142 |
eautoreconf |
| 143 |
} |
| 144 |
|
| 145 |
@@ -60,6 +54,7 @@ src_configure() { |
| 146 |
|
| 147 |
src_install() { |
| 148 |
default |
| 149 |
+ dodoc lib/help/faq.txt |
| 150 |
|
| 151 |
if use l10n_ja ; then |
| 152 |
dodoc readme.txt autopick.txt readme_eng.txt autopick_eng.txt |
Archives