gentoo resync : 13.05.2018

3 files changed, 2 insertions, 24 deletions

diff --git a/app-vim/dhcpd-syntax/Manifest b/app-vim/dhcpd-syntax/Manifest
index d8aeeb11b457..51134fa806b5 100644
--- a/app-vim/dhcpd-syntax/Manifest
+++ b/app-vim/dhcpd-syntax/Manifest
@@ -1,5 +1,4 @@
 AUX dhcpd-syntax-20030825-multiple-addresses.patch 588 BLAKE2B 1f38da00084f2e3c42ec7c851e0d4798782e7727f4677a289b0db9096d93bcd8fb2a28695c05f390727bca1c1f27ed7f4918472496e94e673009ca8ba40d9600 SHA512 9b6a22f50bb4402fbe63c7971b11a1b1d7dfec5976758897aebf14a8f0025c52daaed9e3c8668a93f5b2c7c61afde600040f6c64aeac62f2e0e9a6b01735a74a
 DIST dhcpd-syntax-20030825.tar.bz2 2761 BLAKE2B 95478de740c28a93e03179e576e2edf02a682a6161bccae676b379dbb5b654d0239c3f8e523925f2e6d36f949847f9ba7cefae20104196d71f42837afcaae76d SHA512 97c1706e0ab2c89ee20618ae0c854347f8674a3008a5c4414aacb78e984e35b0eb6eeb5f641363ed6601ceeac0c794577d518658db9200c7391871ffae5341bc
-EBUILD dhcpd-syntax-20030825-r1.ebuild 524 BLAKE2B 65a6ca667e4004c353f2128236f71188e0a3e8e6018ecf1f48e1cd727414fa98ade302ec34f8d661b9d7f0d8253a3788fafdc4cd8e91538ce1091eeaa2dc81b1 SHA512 51772c9735f458fd3c3bd1b887717607b9160e0edbac340fd26e539b1323d5e9b582dbbb682459129ad13a8508c7ce53ff5ea9b6aaba6a119853bbec740e1688
-EBUILD dhcpd-syntax-20030825.ebuild 572 BLAKE2B b00d2aa67e2a5f21248d80652adcb31c0860c8a37e78550c79abd25c673ae75e50402d66e8489a475796745d7e8dee64e65253d1122d5523e0016ba8add71769 SHA512 18e1a0d93d58900f071095353cc08d8c6352dabf15ed53c3c3f8dfca5357d1a9c92ec7511292bcdd062977a6909569e793c4b2650e259a16528dd7944330dab3
+EBUILD dhcpd-syntax-20030825-r1.ebuild 518 BLAKE2B dd2b46cc48d7053bd2d47302179cac5b1a3b5edd178209494a4fae46d06b8ba447efbf2404f66ad7ace2cfa3ce7000d60d616b47c45a53784b96073521d19256 SHA512 22eab4a129f6a32c519b1b2c71f3325bbe374506043be7bb95ea8cbce27b83968d0ad386281c0a4afc61de30d77d42305c7d00f1aa74b5f8fbcb6db2d9a9fd15
 MISC metadata.xml 451 BLAKE2B d8b36c756c321d18b52d77db7cfcd40b3ee3c9e8cdc282c090f6172f8b58b2639026650c317cbd2f4b1d575353a4b3cd22d80fbcea298d875fa5b737d69976b7 SHA512 cc138ac01df08624272da2daac14b2efd86fa8880e79b76de9fed6798fb5b8f6421fe608e2851af9c1afb7e6586f8d3f27865729960ce82ea76ac29f499e9e9a
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
index 076e66a6f805..543bd478be7a 100644
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: syntax highlighting for dhcpd.conf"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=744"
 LICENSE="vim"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for dhcpd.conf files."
 
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild
deleted file mode 100644
index cfc50bce8649..000000000000
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit vim-plugin eutils
-
-DESCRIPTION="vim plugin: syntax highlighting for dhcpd.conf"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=744"
-LICENSE="vim"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-VIM_PLUGIN_HELPTEXT=\
-"This plugin provides syntax highlighting for dhcpd.conf files."
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-multiple-addresses.patch
-}