gentoo resync : 21.05.2019

5 files changed, 2 insertions, 121 deletions

diff --git a/net-irc/scrollz/Manifest b/net-irc/scrollz/Manifest
index 7f8db88e5de9..b45c1b3d6c9f 100644
--- a/net-irc/scrollz/Manifest
+++ b/net-irc/scrollz/Manifest
@@ -1,7 +1,3 @@
-AUX scrollz-2.2-cppflags.patch 492 BLAKE2B 1612cd82da3373b4c392c5c8fe72125c318a3f1714e1d89f49a4483d482603398836b205f3d3a8319e48f05424a4cc6416d322f5a1aadfab49be7befdee50824 SHA512 f6888bfc7fe2d96c9f9f85fa953d1b8fa60d5f0406f285114c3bf7eb18322028afafd167d459abef7f3def74e8c649697e3be70c10a8004abe1dc4d331e949cd
-AUX scrollz-2.2-make-install.patch 714 BLAKE2B 10941de185355132346e2049b6dae60cd9678dccb232a023621c7c824f9dda39fa0557fdcd90fe276415b028852caf6703c2b8aee006afb14e2fd238be4804d1 SHA512 11772827d81bbe3e4184861f9091a31a32589d598e2c2f85a83ea042dc1efe750ea8140d8c0dc28dcb808f3c4ddd243f2f28ac44ce0d7fa07dd06b75f65de685
-DIST ScrollZ-2.2.1.tar.gz 940738 BLAKE2B eaac2b2d990dade73f036a71534f624bf9b6fb6be04d6c19ad8d458f6a2aa035cbd97af305925db42586091ada6eb6ea3415b97819b57a68fa0dda07718122ee SHA512 38eac6a2ecf8789b2d5e042a6ff59463aecf65646c3b07ca1980f60dc47f153dd5f6e42f5a0c1edbef7d1b6743a368f9f4b25be57406353b8e34919e82c7bc21
 DIST ScrollZ-2.3.tar.gz 981707 BLAKE2B ee7c1955dbd2515204d805052d091274c3c7e08257a798c357c5a195c12d7ebc85a160cd40ddf1b2aa87a1b628bebf630c3b7428bde1f230bf9b372f74cc74d2 SHA512 cb3dc2f462452c605c688805ed5128e0197eb4daae895c03f00631c4e9a0994f89a9c55b7e0591588f3f313dab66fcbeb1683b42ef75c3b714185b40703b1979
-EBUILD scrollz-2.2.1.ebuild 1235 BLAKE2B 2f9103f10c2370f0f4af98fc37b4bc96bb64f48804be8cbbd87d2423ff6e689cb9796b2370ad512ecda2deaa124736e2e8aad6bb9b9f16ad82688a281bd5eb15 SHA512 bbc8404ce6b6175eb36a13c4bb35993ab79078c8cf3bd88b97ecc9dcce04837ccecc81a545bda1b0a36e4fbc4cd7c4aaae7570d60744ad1996421d684353dd41
-EBUILD scrollz-2.3.ebuild 1143 BLAKE2B 93c63fdb523e9a614de3d729396493183110f3e9345cc482d29327b0814898e98fd29bbfc2d3b78ec3ed069a9bc3e4f3263142604e3c8caf85b70c206e3707ee SHA512 2015d7bea3f1c008f2906ddfe4e68436f93809ee3f5ff1081d55089b8644c17b4360dfadb975079f684331a7aa99c6719055c2fd4402e1c293f6379340b5808e
+EBUILD scrollz-2.3.ebuild 1141 BLAKE2B 091e7262a599f9eb2ac0f099d8dbe59e65682b6f3a477b6c30d783137bcabb846631ee6961d3ba0e63f7c071c33ac57ba5aa0813d0c6797715e476abb90b4349 SHA512 fb42d38a1eeae19b5cea833cc0fda80c693f21f79376b8932c5edb1e26be9143ab13fc0626b45b236598c7ce4f5d75e1a0c629fa4226862095ac9b8631ca901d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/scrollz/files/scrollz-2.2-cppflags.patch b/net-irc/scrollz/files/scrollz-2.2-cppflags.patch
deleted file mode 100644
index a6727544eca5..000000000000
--- a/net-irc/scrollz/files/scrollz-2.2-cppflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Subject: [PATCH] Respect CPPFLAGS.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -68,7 +68,7 @@
- IRCDOC = ${IRCSHARE}/doc
- 
- CC = @CC@
--DEFS = @DEFS@
-+DEFS = @DEFS@ @CPPFLAGS@
- LIBS = @LIBS@
- 
- # Set this to -g if you want to be able to debug the client, otherwise
-
---- a/source/Makefile.in
-+++ b/source/Makefile.in
-@@ -11,7 +11,7 @@
- LDFLAGS	= @LDFLAGS@
- LEX	= @LEX@
- LEXLIB	= @LEXLIB@
--DEFS	= @DEFS@
-+DEFS	= @DEFS@ @CPPFLAGS@
- LN	= @LN@
- RM	= @RM@
- 
diff --git a/net-irc/scrollz/files/scrollz-2.2-make-install.patch b/net-irc/scrollz/files/scrollz-2.2-make-install.patch
deleted file mode 100644
index f5591f2a8212..000000000000
--- a/net-irc/scrollz/files/scrollz-2.2-make-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Date: 2011-01-03
-Subject: [PATCH] Fix parallel make install.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -179,7 +179,7 @@
- 	@(cd $(DESTDIR)/$(bindir) ; $(LN) scrollz-$(VERSION) scrollz)
- 	@cp doc/ScrollZ.doc $(DESTDIR)/$(IRCDOC)
- 
--installman: scrollz.1
-+installman: installdirs scrollz.1
- 	$(INSTALL) scrollz.1 $(DESTDIR)/$(mandir)
- 
- installserv: installio
-@@ -197,7 +197,7 @@
- 		$(DESTDIR)/$(INSTALL_SCRIPT) \
- 		$(DESTDIR)/$(HELP_DIR) $(DESTDIR)/$(IRCDOC) $(DESTDIR)/$(mandir)
- 
--installhelp:
-+installhelp: installdirs
- 	$(INSTALL_HELP_CMD)
- 	find $(DESTDIR)/$(HELP_DIR) -type d -print | xargs chmod a+rx
- 	find $(DESTDIR)/$(HELP_DIR) -type f -print | xargs chmod a+r
diff --git a/net-irc/scrollz/scrollz-2.2.1.ebuild b/net-irc/scrollz/scrollz-2.2.1.ebuild
deleted file mode 100644
index 988aa51efb5b..000000000000
--- a/net-irc/scrollz/scrollz-2.2.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-MY_P=ScrollZ-${PV}
-
-DESCRIPTION="Advanced IRC client based on ircII"
-HOMEPAGE="http://scrollz.com/"
-SRC_URI="http://www.scrollz.com/download/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="gmp gnutls ipv6 socks5 ssl"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-RDEPEND="sys-libs/ncurses
-	gmp? ( dev-libs/gmp )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl )
-		)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2-cppflags.patch
-	epatch "${FILESDIR}"/${PN}-2.2-make-install.patch
-}
-
-src_configure() {
-	local _myssl
-
-	if use ssl; then
-		if use gnutls; then
-			_myssl="--with-ssl"
-		else
-			_myssl="--with-openssl"
-		fi
-	fi
-
-	tc-export CC #397441, ancient autoconf
-	econf \
-		--with-default-server=irc.gentoo.org \
-		$(use_enable socks5) \
-		$(use_enable ipv6) \
-		--enable-regexp \
-		$(use_enable gmp fish) \
-		${_myssl}
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		mandir="${EPREFIX}/usr/share/man/man1" \
-		install
-
-	dodoc ChangeLog* NEWS README* todo
-}
diff --git a/net-irc/scrollz/scrollz-2.3.ebuild b/net-irc/scrollz/scrollz-2.3.ebuild
index a7a4b03e80b7..706cb974e6fd 100644
--- a/net-irc/scrollz/scrollz-2.3.ebuild
+++ b/net-irc/scrollz/scrollz-2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.scrollz.info/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 IUSE="gmp gnutls ipv6 socks5 ssl"
 REQUIRED_USE="gnutls? ( ssl )"