gentoo resync : 22.01.2021

5 files changed, 113 insertions, 0 deletions

diff --git a/games-mud/Manifest.gz b/games-mud/Manifest.gz
index 764011e40875..bf10c1b79a51 100644
--- a/games-mud/Manifest.gz
+++ b/games-mud/Manifest.gz
diff --git a/games-mud/powwow/Manifest b/games-mud/powwow/Manifest
index 650ee96e73e0..62de445cb2e2 100644
--- a/games-mud/powwow/Manifest
+++ b/games-mud/powwow/Manifest
@@ -1,4 +1,8 @@
 AUX powwow-1.2.16-underlinking.patch 540 BLAKE2B b30bc40fdb408686dd2f77e1ade851b1c4c770b895fac7624f97f491d5ba2fffe0467bb6dbd92c6a1ab9e1c010afaafb1b5985ff36cd98320653d12f234a4787 SHA512 2917a553f844d3bd8ef15b3f1e4f0dfeca7ac06371aba5912a40adc8334a74ec81767d3c73d27d27a7f45d8ca27acf279b3d9095dd426ce4c21e93dceea30861
+AUX powwow-1.2.22-linking.patch 1368 BLAKE2B 2a15016d3aeae23f7d372e695878bef767e0cd3c2351af01c53370fdee7ccffeaac9056f19d05fa15857733f213337244a93b32078581e67b81a2ef8f0c930e0 SHA512 22dd8fc41b4108f358a6814b6da8fb0d88f7aa8d237fdcbddf330e6b41de885ac192a42393d2e3c12153fc7ccaef621d6ccea89832c7fa7a86880644af8f0a9b
+AUX powwow-1.2.22-musl-termios.patch 464 BLAKE2B 602932bff5d22699bbf4228196cb6abcbd61431893a0129076a5fe1b68d78a1be4c61340df82c529d293092fd699f805ebe51c417992ae3eecd8e729f98e1abf SHA512 36e4342b26080d6c67887b126159f050f30c446b1509686e1a90d9cac04c9ead80d49f25b5bade4441ee7ccd82d49a92a78a429d6a2090ce016c0fe9f772c696
 DIST powwow-1.2.16.tar.gz 295441 BLAKE2B 36f45e57af83b624e8f061ba7cc10ac7429b42bba56b1f61c737d9541ded788e5d94c76e1c70d00f49aac98a2a1fac6a04965d2eb78e587d53cea8b0d17ea736 SHA512 9bc046ba14760d55a7aabb550229d5f5b234f3ef0690d837f1de8df5e1f404b8483e61981cffdf8e82f164bd5a68f4da3f8342b0c09b98155adaabf14d8b079e
+DIST powwow-1.2.22.tar.gz 339521 BLAKE2B abbad1cdce0f1f8d7c5affdb2665231fd3f4faa2439e90a5f37f23455eea0e687c63476fc63a508cbfff2ffc33ea97c31c66b868255aa60a4a9819c0eebe8844 SHA512 558143ab4dfa06798abe7cb6b18ce3ceb70925214ac0125f0f3823f077a6cbbda50557c954af623a2dae003a57df893325085e53a4ee9322250bc7e695b76fe5
 EBUILD powwow-1.2.16-r1.ebuild 894 BLAKE2B f77ad634c44f3c473d3caa7cd0794cb9dada12a3d81133af7ac88256b3ebbf58aada67e940c2f156bf78f3431f580ee02210885734a15759a40fd9b4b99e51cc SHA512 587b869a71779d18c2f859e17efbce095375b65de27f40a6d4b78dd547657398bf987e3a126b8a1e7f5d43d46757c9a112300f1223992ea56291bb14f5fa494f
+EBUILD powwow-1.2.22.ebuild 1013 BLAKE2B f9509d40f565418007646d9cfb9989971f5e81a55bc7477dbdeb34eaa9a28dddfe6479f57c8b0167503f0df2fc0188ca0251ec24ab5c2a03ce8827cc0c0da42d SHA512 302ea61f09ca0182a6133ecc00bba395b2cd533015afd78d9ada4bff5ef267ac9d1471bb8d3ca70bccf0b1a30a5423ad89542f54d2754e7dc3fc899d2dea705d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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 000000000000..e9dc39177bf4
--- /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 <hasufell@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 000000000000..c8d9192279a6
--- /dev/null
+++ b/games-mud/powwow/files/powwow-1.2.22-musl-termios.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/716584
+--- 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
+--- 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 000000000000..aec8423d0bc7
--- /dev/null
+++ b/games-mud/powwow/powwow-1.2.22.ebuild
@@ -0,0 +1,49 @@
+# 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"
+
+BDEPEND="virtual/pkgconfig"
+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
+}