gentoo resync : 22.04.2018

4 files changed, 4 insertions, 67 deletions

diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index fc0d54bda7a6..2f3d8656f71b 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,8 +1,6 @@
 DIST eselect-1.4.11.tar.xz 177444 BLAKE2B e6f758e2acd17cea3ae37af48e4b4327a9c9d74784aa0723b003f2e1d84ec4c13167de33c311b785fddf7b045b3312955c4d84cf6e35ef7ec9265ef5de503670 SHA512 eec3091c5e386e8b7a52cb263e3c5ce6f41e285d2ae7974f4876e2ffa93b00f9f939055d978c6b9032ee1be2561992015560cdfa93a1ff2b1720ea0100fcf96d
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
-DIST eselect-1.4.8.tar.xz 176692 BLAKE2B d24f87ecd7fed1f23a26f9017ecaecaf5b69c02ffbcf9cf7d7b93fa8cad6364d934de8196aff1af955076c167ac4fa8911be03473c757f6a623c63820f3b8255 SHA512 13faa3b21d352975498eb2ea62dfb8d371f30afd6e283c30ff4e89cef035598a8cfe8fafbc6763f39081c547f6743c7f4731d21170625781b89d64eb46c22194
-EBUILD eselect-1.4.11.ebuild 1638 BLAKE2B f1876347a7cc6f59eb1bb7ff727145c59177b95ea6d9525db9dab37819336954770b399134e6d38a90e3b98266a611eb9476f13ecf7c58dc4bc3a8de68ec6abc SHA512 5b4482d9d693f62250e9d1ce69744dfb13a08cc588ca1d555e0e12bae5dc84bb25fbd83824864d6c34ca6403f281ba5eed670a0fc2a78251c73ffc230a94c74f
-EBUILD eselect-1.4.12.ebuild 1647 BLAKE2B d8dece0d1f857c5282ce3cbe97239881fbfd7762a0903e1bed9b2dae72cb9c5c7f06cb9cd84cd6b6b0ce337649759605dfb90db12fb83c9031b5968ceb3a8173 SHA512 2f39fe3845cee90e304591ade02b935118be3840fa07f1913741e28914fc0f99b7e41d240afe87006c7c8c65440c9759fe22aef0458b856f7beeb05fcd481e53
-EBUILD eselect-1.4.8.ebuild 1641 BLAKE2B 3bef4d6f93da92e36d99ae5fdcae1fb121cdbd41e1fb1b6a1d0c616a04e5919247872d3164867daa2b16f6f18d128fcdca72fbdf51fa81e4df6bb064ae58bac6 SHA512 3b45491ae813cf8cc99c9103392b2c4ab9e84b4f22f3035affac93e8bf08f3b9e130927333c5cb3bc8874ea90d8a089b542013f86c36c68a09b8a03eb0bdc8d6
+EBUILD eselect-1.4.11.ebuild 1634 BLAKE2B e28298f0caa8e8751385c546d23bebbcf6839481a43a3752c5b1e35e7d62822dbf961c58f8c81b5d7eab01cfbb0ddecf88697670c2c6003ab73906078270b3d9 SHA512 22e4238d5ed8f6229236bdcd3cb6186a1fe80bbf5b51a356392d382fbe83839a5287bf212603214dbd2f40e155dc647c3a4fd366676a707339b4550c0223d8a9
+EBUILD eselect-1.4.12.ebuild 1645 BLAKE2B 16466bef3b4daff53b08d0c2284c0ef3e431667bcd880104e23ff4f51a4a54ac310d20b1dca9635f4967149907d7d7f833d2d098461b63f8615c82462d8516a6 SHA512 10b3d9611d802074323923a6882d4096ca520078be5cd36a5a91b8b041e1e0f790196a425274a505539430718bc1bf044db7fa36c99fdaa52243aa842f239ffa
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.11.ebuild b/app-admin/eselect/eselect-1.4.11.ebuild
index 69b620c0f342..cfe033136423 100644
--- a/app-admin/eselect/eselect-1.4.11.ebuild
+++ b/app-admin/eselect/eselect-1.4.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.12.ebuild b/app-admin/eselect/eselect-1.4.12.ebuild
index 2403e8dc5a8d..bac304223f01 100644
--- a/app-admin/eselect/eselect-1.4.12.ebuild
+++ b/app-admin/eselect/eselect-1.4.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.8.ebuild b/app-admin/eselect/eselect-1.4.8.ebuild
deleted file mode 100644
index c3904da9fc27..000000000000
--- a/app-admin/eselect/eselect-1.4.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
-
-LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs vim-syntax"
-
-RDEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-misc/realpath
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-RDEPEND="${RDEPEND}
-	sys-apps/file
-	sys-libs/ncurses:0"
-
-PDEPEND="emacs? ( app-emacs/eselect-mode )
-	vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp misc/${PN}.bashcomp ${PN}
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	if use doc; then
-		docinto html
-		dodoc *.html doc/*.html doc/*.css
-	fi
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-	if ! use prefix; then
-		fowners root:portage /var/lib/gentoo/news
-		fperms g+w /var/lib/gentoo/news
-	fi
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	if ! use prefix; then
-		chgrp portage "${EROOT}/var/lib/gentoo/news" \
-			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-	fi
-}