From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 2 Sep 2020 14:09:07 +0100
Subject: gentoo resync : 02.09.2020

---
 net-irc/scrollz/Manifest                        |  3 ++-
 net-irc/scrollz/files/scrollz-2.3-fcommon.patch | 17 +++++++++++++++++
 net-irc/scrollz/scrollz-2.3.ebuild              | 19 +++++++++++--------
 3 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 net-irc/scrollz/files/scrollz-2.3-fcommon.patch

(limited to 'net-irc/scrollz')

diff --git a/net-irc/scrollz/Manifest b/net-irc/scrollz/Manifest
index a370b4882db5..bc63161c9ff3 100644
--- a/net-irc/scrollz/Manifest
+++ b/net-irc/scrollz/Manifest
@@ -1,3 +1,4 @@
+AUX scrollz-2.3-fcommon.patch 566 BLAKE2B 454bbb7beec42378855dd64cd4a9826dd39deb549a75006dda80cec99463b45eaacf666c2ac25b3285ab71e2a57256e8c640c427373f56c6780d3172257c1071 SHA512 839109aaf8bc3429e7a215de5b7018dbcb718181d9e4026bd918fbb86665df20542d0f5e7884bf582cbd63238185d9e4fb180c6b16797200dd972ee1ea679dd4
 DIST ScrollZ-2.3.tar.gz 981707 BLAKE2B ee7c1955dbd2515204d805052d091274c3c7e08257a798c357c5a195c12d7ebc85a160cd40ddf1b2aa87a1b628bebf630c3b7428bde1f230bf9b372f74cc74d2 SHA512 cb3dc2f462452c605c688805ed5128e0197eb4daae895c03f00631c4e9a0994f89a9c55b7e0591588f3f313dab66fcbeb1683b42ef75c3b714185b40703b1979
-EBUILD scrollz-2.3.ebuild 1143 BLAKE2B ffa1e5be97f837e55335a41c1908f6188b6df8b7caff8f8468e25660f0c1eebb56c87be4be5ec37c674e0de6dda9e76bacf7e4a7b446015ffac5dbece2f37d7f SHA512 9244ac7e58ed293eae4023d29f56cb59e9549e0336ab8ffc25fbdd435ad13f5b7b8b26c434a4996d915ecb34a174873b574ad6e4ea649f69e246c85a040cc47e
+EBUILD scrollz-2.3.ebuild 1173 BLAKE2B 3a82216bbc79ed79e0875c2e77898ca9aa49de9ec3f7dd1484f7d6b9a6d94be3abf44ae96e41d4d345c6874575f9165d32aa545127bc078b8a25144425b5e7da SHA512 68e1022b504437b0ea4c80f1d2e5c16a3330d60ec8125a9b49e19cc868735c2e3265324428db307961d4be88c083333b4464e76c27a26783e6bc36e0571aa06f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/scrollz/files/scrollz-2.3-fcommon.patch b/net-irc/scrollz/files/scrollz-2.3-fcommon.patch
new file mode 100644
index 000000000000..2c0c85f0b96b
--- /dev/null
+++ b/net-irc/scrollz/files/scrollz-2.3-fcommon.patch
@@ -0,0 +1,17 @@
+https://svnweb.freebsd.org/ports/head/irc/scrollz/files/patch-a8b05aab?view=markup&pathrev=545768
+https://bugs.gentoo.org/708640
+----
+--- a/include/ircterm.h
++++ b/include/ircterm.h
+@@ -89,9 +89,9 @@ extern	char	*CM,
+ extern	int	SG;
+ /**************************** PATCHED by Flier ******************************/
+ #ifdef WANTANSI
+-char            *SETAF,
++extern char     *SETAF,
+                 *SETAB;
+-int             NUMCOLORS;
++extern int      NUMCOLORS;
+ #endif /* WANTANSI */
+ /****************************************************************************/
+ 
diff --git a/net-irc/scrollz/scrollz-2.3.ebuild b/net-irc/scrollz/scrollz-2.3.ebuild
index b45a5957d957..a76e2d53cdc3 100644
--- a/net-irc/scrollz/scrollz-2.3.ebuild
+++ b/net-irc/scrollz/scrollz-2.3.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 MY_P="ScrollZ-${PV}"
@@ -14,23 +15,26 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-IUSE="gmp gnutls ipv6 socks5 ssl"
+IUSE="gmp gnutls ipv6 ssl"
 REQUIRED_USE="gnutls? ( ssl )"
 
-RDEPEND="
+BDEPEND="virtual/pkgconfig"
+DEPEND="
 	sys-libs/ncurses:0=
 	gmp? ( dev-libs/gmp:0= )
 	ssl? (
 		gnutls? ( net-libs/gnutls:0= )
 		!gnutls? ( dev-libs/openssl:0= )
-		)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+	)
 "
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/ScrollZ-${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3-fcommon.patch"
+)
+
 src_configure() {
 	local _myssl
 
@@ -45,7 +49,6 @@ src_configure() {
 	tc-export CC #397441, ancient autoconf
 	econf \
 		--with-default-server="irc.gentoo.org" \
-		$(use_with socks5) \
 		$(use_enable ipv6) \
 		--enable-regexp \
 		$(use_enable gmp fish) \
@@ -54,7 +57,7 @@ src_configure() {
 
 src_install() {
 	emake \
-		DESTDIR="${D}" \
+		DESTDIR="${ED}" \
 		mandir="${EPREFIX}/usr/share/man/man1" \
 		install
 
-- 
cgit v1.2.3