gentoo resync : 11.02.2018

4 files changed, 7 insertions, 46 deletions

diff --git a/app-shells/rrs/Manifest b/app-shells/rrs/Manifest
index 888ee7b5ef2d..4f1ac797b4a5 100644
--- a/app-shells/rrs/Manifest
+++ b/app-shells/rrs/Manifest
@@ -1,5 +1,4 @@
-AUX rrs-1.70-asneeded.patch 1437 BLAKE2B 7c475dee125d2d394bbf9ff5c95c5952731ea70d6d299e96f7e3d7b57dd9d463a22f5fc81974f3ee523fc93657d0d7695ddfbb64f42b3d656b0660c36524bd38 SHA512 f72670f986887a04efaec8ba8b4d8a5c725ae21dd25217f67268973487556f757d0e24a4b81bdc573d0dd85bdf0f35c4148b3d553298046696aa4571ab511363
+AUX rrs-1.70-asneeded.patch 1436 BLAKE2B ab35e22a351024935c13433d49e9c7e1ae452b597e179810a58a9e181895d6731a81d472abd2147865ff76bd4ad338429d41eadcead229a5ce243a66b66e8c17 SHA512 05972478d2e27290a430b0d80343f25c494a9f0f82ad87df2bc400dc652775dff447d8914e367d3092db2fcb5c4700e5d5873452767943e3d0b27410bef51188
 DIST rrs-1.70.tar.gz 49579 BLAKE2B 0345f559239f64d51891100c11f3b80d2b41277eaa0e283c86dbd990496f083e1da60aa6937c870c133bfe8e7f905848d0da1a17b827a2bb07bd8ee1be4b36de SHA512 58a3d34bd80f2ddaa62112819d83ab2175daf1b9e66605d0b629a15d1fc6b43b482e1a4a763b99a07d85bbb0fa6df339d0dfcc203e3a3da3d5cfdabbd14a4bfa
-EBUILD rrs-1.70-r1.ebuild 711 BLAKE2B 87f27933c5e6414668dddb8f99876b2bafd6952a00b84135f417c190f1edb324fe9967c4bf3e99ef9b494f2ca535459224a420bf4dec5d0c388dc62dcacd024b SHA512 9a503747336f3cbbf0321448690bb31ce88c69b0e2430d690b3193c014e7667508b3ab5a4b36fcaa6273219f52292802df801b5722638f73c05effbbe451a269
-EBUILD rrs-1.70-r2.ebuild 746 BLAKE2B cccb1d96ae78a5b84d36ab3cfa3b9f13de2ea43b5cf7b6c068874ba9893991f3aa8249ac36ea43be1abedd16947e67566708fab09744a2abea3fcd14e453ad01 SHA512 335e07e3a4a2d7fb043155aabf311bd3c452635fd6d06536ba96cd7539feed94d2d3ba9f45028ec73ce6f37732ba5c29c4a8eb4d6ed9500e003a9421126f7bf5
+EBUILD rrs-1.70-r2.ebuild 721 BLAKE2B f3adb0826e4243789287286c4258aafa8da95030148cce06b2a9a56f9cc748ac924b67212cd5a611c4b6ea1b0ff28cf1a3616671b2bf0df4a7acb50164fadbd1 SHA512 466f0c10175cd675bf54af6cc727ba9bd2101a24cff53d9fc41da3a0adf7a8a7bcc20e4876b41179f05788762325e0451ce0581ac3734caa8c81e2c24e60c9d3
 MISC metadata.xml 317 BLAKE2B 79bf68384cb06bb254c6bd8757a368e929ae41d5dcd793c7123ea0e336c9187c9062013fc4feeb032c18515fa865d05f1f61272555f2e137e419c23b289246e7 SHA512 b80e5e730f8ee1225f73e1c1651c9cec243f117f3b983ef0814699ba367f373ada228e1fe2b6b8f1928eeb5cd854c1a7bf07d59075607a992a4a0e0dd3482ee4
diff --git a/app-shells/rrs/files/rrs-1.70-asneeded.patch b/app-shells/rrs/files/rrs-1.70-asneeded.patch
index 9ed9ee16fbee..8c55d17678e1 100644
--- a/app-shells/rrs/files/rrs-1.70-asneeded.patch
+++ b/app-shells/rrs/files/rrs-1.70-asneeded.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2004-05-30 02:14:14.000000000 +0200
-+++ Makefile	2009-01-03 15:02:19.253460887 +0100
+--- a/Makefile	2004-05-30 02:14:14.000000000 +0200
++++ b/Makefile	2009-01-03 15:02:19.253460887 +0100
 @@ -8,8 +8,8 @@
  # if your system doesn't have GNU's getopt_long(), add -DWITHOUT_GNU_GETOPT
  CFLAGS=-I/usr/local/include -Wall -O2
diff --git a/app-shells/rrs/rrs-1.70-r1.ebuild b/app-shells/rrs/rrs-1.70-r1.ebuild
deleted file mode 100644
index 1bc50a484efe..000000000000
--- a/app-shells/rrs/rrs-1.70-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Reverse Remote Shell"
-HOMEPAGE="http://freecode.com/projects/rrs"
-SRC_URI="http://www.cycom.se/uploads/36/19/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/"${P}"-asneeded.patch
-	sed -i -e "s/-s //g" Makefile || die
-}
-
-src_compile() {
-	local target=""
-	use ssl || target="-nossl"
-
-	emake generic${target} CFLAGS="${CFLAGS}" LDEXTRA="${LDFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin rrs
-	dodoc CHANGES README
-	doman rrs.1
-}
diff --git a/app-shells/rrs/rrs-1.70-r2.ebuild b/app-shells/rrs/rrs-1.70-r2.ebuild
index 36ca714b57e3..efc3d8c7394f 100644
--- a/app-shells/rrs/rrs-1.70-r2.ebuild
+++ b/app-shells/rrs/rrs-1.70-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,15 +11,13 @@ SRC_URI="http://www.cycom.se/uploads/36/19/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="ssl"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
 
-PATCH=( "${FILESDIR}"/"${P}"-asneeded.patch)
-
-DOCS=( CHANGES README )
+PATCHES=( "${FILESDIR}"/"${P}"-asneeded.patch )
 
 src_prepare() {
 	default