gentoo resync : 18.12.2020

3 files changed, 66 insertions, 8 deletions

diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 216693c16bb6..143baff43ad8 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,8 @@
 DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
 DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
+DIST eselect-1.4.17.tar.xz 178980 BLAKE2B d905ac88bc009080912af75e64c7920d745788866fa3cb35466d68a652efbbd6984d6e1efeed76d9a344aed94705b74c85aa43e9c037d4d548d2e24afa69bd7a SHA512 35dc4c52f44c4f64db9c0dc2aec57b3055a6d36760b1bbbd094ad11b3f9e71a731444802632817b89c3b511f1dc9bb92046b59322d177e13fdc501ed767b591e
 EBUILD eselect-1.4.15.ebuild 1579 BLAKE2B 1cfc3648f6725ef91c4eb5144451088987a5d4e39ea65d56d83f6bfb202ba1e6b5f78e0ca5130196b96b9860296420194a5027f72bf02ca49bb0fa09d1d1e107 SHA512 fdc708d34cab0d77e5661c641f58e3d0994fb65dea43caacc1f0992e1d30e246810f6c97d53a545d9143f66e80a1027a81c4f2d2328f855cc31caf1a40b5909a
 EBUILD eselect-1.4.16.ebuild 1579 BLAKE2B 30c0f10f18b2e18609fe55b090a9b3d76e72fa5e5b29faa87c83995630a3beef8f69f687996a5fbb3ebefd89cf34b8c167169173082e4df8955c47e6e7ef2daf SHA512 9b7c26d5e1bca87f058b0ab2e115eee42caf42659a37356c5fe5e8e6e20e0cb2c79b08f35c80638aa2c1486bce79f053118604eb11bb5e8e38c918daa4ef1cc0
-EBUILD eselect-9999.ebuild 1408 BLAKE2B 428612d4adcac6611b23df171bdf8b7ac578e3ad36f968de94fb978b2df8d8af9d8e487d78d8f6cd41823c68e495caa834fbf309607b5689b85784dc9cd39895 SHA512 3ace7d1f05535b475b2401f37b2e1c74a3fa60d2ce92931169e3da32df31c063ba8bbc0c8431b1b1dca55b9f56fb73c1fb8a2045d7de410084eada71fa68c062
+EBUILD eselect-1.4.17.ebuild 1574 BLAKE2B f631125e558869456c30acd8b8a8673d9ff1d90542daaea5a12f070153b75296a3430e974e107a1477d9314de0d8a6573717da188846bd906e5c61437af20ffa SHA512 0a6cf61b206181a10d6a66c5341725ec57eedb9c3ebccbe47cc00115ebe471a9d923d19cef809f6c2697d0747e456f5f3952b42b92a3af60f0841e9520d49b57
+EBUILD eselect-9999.ebuild 1394 BLAKE2B fb62991371b697680959344974f4d7d4cdedba39337b12d004588d118632be5cd26c2026024fd6a2cc1e448f196c3367b82ba3fe347617149602c4730f8083d1 SHA512 78c75a30e9a8bfb370620b25cd200be9c6a8724858548cd1ab76926194f9d96a25c7441463d1dcb7a2aa3a6c947b1a656d6a0b455eb95e9ad9a1535f8cb349ce
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.17.ebuild b/app-admin/eselect/eselect-1.4.17.ebuild
new file mode 100644
index 000000000000..0ed9a1b499a1
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.17.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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-4.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs vim-syntax"
+
+DEPEND="sys-apps/sed
+	|| (
+		sys-apps/coreutils
+		app-misc/realpath
+	)"
+RDEPEND="${DEPEND}
+	sys-apps/file
+	sys-libs/ncurses:0"
+BDEPEND="doc? ( dev-python/docutils )"
+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
+}
diff --git a/app-admin/eselect/eselect-9999.ebuild b/app-admin/eselect/eselect-9999.ebuild
index 6710d08068a8..5922f93c46e0 100644
--- a/app-admin/eselect/eselect-9999.ebuild
+++ b/app-admin/eselect/eselect-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/eselect.git"
 
@@ -10,21 +10,19 @@ inherit autotools git-r3 bash-completion-r1
 DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
 
-LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
 IUSE="doc emacs vim-syntax"
 
-RDEPEND="sys-apps/sed
+DEPEND="sys-apps/sed
 	|| (
 		sys-apps/coreutils
 		app-misc/realpath
 	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-RDEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	sys-apps/file
 	sys-libs/ncurses:0"
-
+BDEPEND="doc? ( dev-python/docutils )"
 PDEPEND="emacs? ( app-emacs/eselect-mode )
 	vim-syntax? ( app-vim/eselect-syntax )"