gentoo resync : 11.05.2018

3 files changed, 2 insertions, 38 deletions

diff --git a/app-misc/vcp/Manifest b/app-misc/vcp/Manifest
index 02bb655484f7..b8b3d340d759 100644
--- a/app-misc/vcp/Manifest
+++ b/app-misc/vcp/Manifest
@@ -1,5 +1,4 @@
 AUX vcp-2.2-tinfo.patch 310 BLAKE2B 31ebbb498615f7eb9c0472cd99f85643a44a84e94dcae7d671044cc2aea9001e31e925506958db397516074f45d62ea834b28302448d158ab87038c0208244b8 SHA512 886a20474591c5fee3c70bf978977b2bc19f362dc38898eff6f44365b6edebd2eaff1cf09befc764163d32f0f2a84a80d032647266af0e7fb343b9ee6c5f82d3
 DIST vcp-2.2.tar.gz 20075 BLAKE2B 862ed1a816c45e50374e17d387d33bda3d758e155e6a38c1636000ce87de3b54928acaac5f89b0580098acb9b796e803406c9d95dec76c029fdc580d65a496b2 SHA512 3f9f60bce875f16a825b935fd241b11cc75d45b85b66133b27d16b86644c4bbfe69fa5f22571703e0ed6d235498f920a8796f6d74259db51a1abbd626c6f5137
-EBUILD vcp-2.2-r1.ebuild 829 BLAKE2B c8df56cefd1edaf23cc6f9a2168438e6a7b6c1f94ea8a778af5e141f23ab3c74f4494445cc4547a6ff3572264864bae65ba849d99fed5eeceae43cd36c8e14e7 SHA512 a25a27c4cfe12343c4aed26eda370effdd57520622a664bf96d8af67642af2f63ac4fa7a746913045fd6ed205094a6444e3c3c2fb88c302199a7245b9249079c
-EBUILD vcp-2.2-r2.ebuild 742 BLAKE2B ef12366da20df5f554d2463ad905073789f9f7dca967f0b5eae1975c17e4c10029a0f4c5ecc9fee2468908d0d496aa825cbd9fcddee80498370275eb18e52a2c SHA512 001a8dcec3d4b11bb984f3236a892e40b2a410018a669463e1d1a8fb9985e4e6c411fb4efbe82eb453f39f3d4b396e62e8fa480b5e324a26272070b90d5cc816
+EBUILD vcp-2.2-r2.ebuild 741 BLAKE2B df056f3fcae3294a5b77a485f758ae3c9a253368541777c08178d5e2adf0d8b59cbe65134cab5f63cd1907b0a055dd5bdf3a3d62c9f591856df91cad2f51c02d SHA512 69900311ae134a54d5eddb17898e90e3921cfbd3c72845d09df88c0e81b1690f9645143c8c09c75813d6589d5d8242a2c4202ba63278d5b3cf5d673f0e80a29c
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vcp/vcp-2.2-r1.ebuild b/app-misc/vcp/vcp-2.2-r1.ebuild
deleted file mode 100644
index f7d2773df7a4..000000000000
--- a/app-misc/vcp/vcp-2.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="copy files/directories in a curses interface"
-HOMEPAGE="http://members.iinet.net.au/~lynx/vcp/"
-SRC_URI="http://members.iinet.net.au/~lynx/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i Makefile -e '/-o vcp/s|$(CFLAGS)|& $(LDFLAGS)|' || die "sed Makefile"
-}
-
-src_compile() {
-	filter-lfs-flags
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dobin vcp || die "dobin failed"
-	doman vcp.1 || die "doman failed"
-	insinto /etc
-	newins vcp.conf.sample vcp.conf || die "newins failed"
-	dodoc Changelog README INSTALL || die "dodoc failed"
-}
diff --git a/app-misc/vcp/vcp-2.2-r2.ebuild b/app-misc/vcp/vcp-2.2-r2.ebuild
index a430bd10e3bd..c53cc103faa9 100644
--- a/app-misc/vcp/vcp-2.2-r2.ebuild
+++ b/app-misc/vcp/vcp-2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://members.iinet.net.au/~lynx/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~sparc x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"