commit: 4398db24f18f4f220edf10f546edbe2e9e9e8ff0 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jan 9 16:16:01 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jan 9 16:16:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4398db24
games-mud/powwow: bump to 1.22.22 Closes: https://bugs.gentoo.org/716584 Closes: https://bugs.gentoo.org/690452 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> games-mud/powwow/Manifest | 1 + games-mud/powwow/files/powwow-1.2.22-linking.patch | 39 ++++++++++++++++++ .../powwow/files/powwow-1.2.22-musl-termios.patch | 24 +++++++++++ games-mud/powwow/powwow-1.2.22.ebuild | 48 ++++++++++++++++++++++ 4 files changed, 112 insertions(+) diff --git a/games-mud/powwow/Manifest b/games-mud/powwow/Manifest index 4bdf237f7fb..1aa6fcb5a71 100644 --- a/games-mud/powwow/Manifest +++ b/games-mud/powwow/Manifest @@ -1 +1,2 @@ DIST powwow-1.2.16.tar.gz 295441 BLAKE2B 36f45e57af83b624e8f061ba7cc10ac7429b42bba56b1f61c737d9541ded788e5d94c76e1c70d00f49aac98a2a1fac6a04965d2eb78e587d53cea8b0d17ea736 SHA512 9bc046ba14760d55a7aabb550229d5f5b234f3ef0690d837f1de8df5e1f404b8483e61981cffdf8e82f164bd5a68f4da3f8342b0c09b98155adaabf14d8b079e +DIST powwow-1.2.22.tar.gz 339521 BLAKE2B abbad1cdce0f1f8d7c5affdb2665231fd3f4faa2439e90a5f37f23455eea0e687c63476fc63a508cbfff2ffc33ea97c31c66b868255aa60a4a9819c0eebe8844 SHA512 558143ab4dfa06798abe7cb6b18ce3ceb70925214ac0125f0f3823f077a6cbbda50557c954af623a2dae003a57df893325085e53a4ee9322250bc7e695b76fe5 diff --git a/games-mud/powwow/files/powwow-1.2.22-linking.patch b/games-mud/powwow/files/powwow-1.2.22-linking.patch new file mode 100644 index 00000000000..e9dc39177bf --- /dev/null +++ b/games-mud/powwow/files/powwow-1.2.22-linking.patch @@ -0,0 +1,39 @@ +* Fix ncurses/tinfo linking: https://bugs.gentoo.org/690452 + +* Fix underlinking (refresh of old patch by hasufell@): +From: Julian Ospald <hasuf...@gentoo.org> +Date: Mon Feb 18 02:25:38 UTC 2013 +Subject: fix underlinking +https://bugs.gentoo.org/show_bug.cgi?id=454928 +--- a/configure.ac ++++ b/configure.ac +@@ -93,10 +93,7 @@ AC_PROG_LN_S + AC_CHECK_FUNC(lrand48,,AC_DEFINE(USE_RANDOM)) + + if test "x${enable_vt100}" != "xyes"; then +- AC_SEARCH_LIBS(initscr,[ncurses curses], [], [ +- if test "x${enable_vt100}" = "xno" ; then +- AC_MSG_ERROR([*** curses libraries not found]) +- fi]) ++ PKG_CHECK_MODULES([ncurses], [ncurses]) + fi + + # Dynamic modules +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -6,7 +6,8 @@ bin_PROGRAMS = powwow powwow-muc powwow-movieplay + powwow_SOURCES = beam.c cmd.c log.c edit.c cmd2.c eval.c \ + utils.c main.c tcp.c list.c map.c tty.c \ + ptr.c +-powwow_LDFLAGS = @dl_ldflags@ ++powwow_LDADD = @dl_ldflags@ @ncurses_LIBS@ ++powwow_muc_LDADD = @ncurses_LIBS@ + powwowdir = $(pkgincludedir) + powwow_HEADERS = beam.h cmd.h log.h edit.h cmd2.h eval.h \ + utils.h main.h tcp.h list.h map.h tty.h \ +@@ -26,4 +26,4 @@ catrw_SOURCES = catrw.c + EXTRA_DIST = plugtest.c + + plugtest.so: plugtest.c +- gcc -shared -o plugtest.so plugtest.c ++ $(CC) $(CFLAGS) -shared -o plugtest.so plugtest.c diff --git a/games-mud/powwow/files/powwow-1.2.22-musl-termios.patch b/games-mud/powwow/files/powwow-1.2.22-musl-termios.patch new file mode 100644 index 00000000000..4cab065d27b --- /dev/null +++ b/games-mud/powwow/files/powwow-1.2.22-musl-termios.patch @@ -0,0 +1,24 @@ +diff --git a/src/follow.c b/src/follow.c +index 09456c9..b3363e8 100644 +--- a/src/follow.c ++++ b/src/follow.c +@@ -26,7 +26,6 @@ + * many warnings, but seems to be necessary at times. works anyway. + */ + # include <termios.h> +-# include <termio.h> + # endif + /* #else USE_SGTTY */ + #endif +diff --git a/src/tty.c b/src/tty.c +index 104c780..0d76554 100644 +--- a/src/tty.c ++++ b/src/tty.c +@@ -44,7 +44,6 @@ + * many warnings, but seems to be necessary at times. works anyway. + */ + # include <termios.h> +-# include <termio.h> + # endif + /* #else USE_SGTTY */ + #endif diff --git a/games-mud/powwow/powwow-1.2.22.ebuild b/games-mud/powwow/powwow-1.2.22.ebuild new file mode 100644 index 00000000000..68e69db45e7 --- /dev/null +++ b/games-mud/powwow/powwow-1.2.22.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="PowWow Console MUD Client" +HOMEPAGE="https://www.hoopajoo.net/projects/powwow.html"; +SRC_URI="https://www.hoopajoo.net/static/projects/${P}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="sys-libs/ncurses:0=" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.22-linking.patch + "${FILESDIR}"/${PN}-1.2.22-musl-termios.patch +) + +src_prepare() { + default + + # note that that the extra, seemingly-redundant files installed are + # actually used by in-game help commands + sed -i \ + -e "s/pkgdata_DATA = powwow.doc/pkgdata_DATA = /" \ + Makefile.am || die + + eautoreconf +} + +src_configure() { + econf --includedir="${EPREFIX}"/usr/include +} + +src_install() { + local DOCS=( Hacking powwow.doc powwow.help README.* TODO ) + # Prepend doc/ + DOCS=( ${DOCS[@]/#/doc\//} ) + # Add in the root items + DOCS+=( ChangeLog NEWS ) + + default +}
