gentoo resync : 25.12.2017

3 files changed, 73 insertions, 6 deletions

diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 7e0a5858326b..35ce29b42f40 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,8 @@
+DIST eselect-1.4.10.tar.xz 177212 BLAKE2B 25f548d56ecfdc5ccf18167ebdeb50cccc77fbdc65ab8683e293242de0083e6036714ae9d173f507da0404dbad0e48f2ac09d542dbdf92d8a5d7e9868b31fa07 SHA512 09e4196959cfb42e0fe4536939ad8e0d1a49d500e3d42634cd959c544f2ed5beaa006100fffaf10eaba121901d36a42721da42504d496de8d157690b7ab7f9fb
 DIST eselect-1.4.8.tar.xz 176692 BLAKE2B d24f87ecd7fed1f23a26f9017ecaecaf5b69c02ffbcf9cf7d7b93fa8cad6364d934de8196aff1af955076c167ac4fa8911be03473c757f6a623c63820f3b8255 SHA512 13faa3b21d352975498eb2ea62dfb8d371f30afd6e283c30ff4e89cef035598a8cfe8fafbc6763f39081c547f6743c7f4731d21170625781b89d64eb46c22194
 DIST eselect-1.4.9.tar.xz 176776 BLAKE2B 0e30f1d55470c49ee9c93da294cc66dbfb5638a3aa0677665936a5eb6f1d253c38736b4037c8676da526a01c75dec86f09fe37cebae954d41f2ae9b6955a088d SHA512 88e9d81086596849ef6daf87da3f782886286b1b829d0d6378c3c3c7d9f044a2eb2dc4e1596c2f49eb2ee4e443eebaab3be4bdb223a36bb5f7b66ac0686e2640
+EBUILD eselect-1.4.10.ebuild 1659 BLAKE2B 08caf31182bf2c672d82031328e3068f30465a68a5f2fa1883cac6b744b1c8be69f27d35ba70b528798482f699680c1e922d9706e6b372fc11793d9118578aed SHA512 1e9d9c9b857ca698882210565b9a178cfac83553e1b90a22485ab866891e2eeabda2fe9ef6c6514555db10024ca30bd665d0f0c9c38908fa3f1fec8812b4ac70
 EBUILD eselect-1.4.8.ebuild 1656 BLAKE2B 5568f397be49a06b8b81fd1d09dda9a7141e65d3c8e9f0e2901f851a26fe1a3af037edffdd4437a4689e222ad39dca53707995677cb6343f556c437d64ef9c50 SHA512 4fb3a040832c75da4389cd20ee315cbf8e8d0b85e7a7964cc461fbec008c4e87616b4e33ed0d0d8e0ed84a5fdf170125e415a292eb94195782394efa14472aa4
 EBUILD eselect-1.4.9.ebuild 1666 BLAKE2B 50d5f7993886cc9321667996626b1a9f63ab0aab3183a5a931efd230ed85763cdea503eeea3234aeabcc8e2d0b93f8f24cf1e0ba175c88ee5c978c6b2c873b3f SHA512 37ff35a9765872c8d96fa2129f1e7632106d40d6439dc85da2cd612fba4d198f47c4911ec1096a5ae199f0ef2315c4eb38fa9be04760e6469b975587060b66c7
-EBUILD eselect-9999.ebuild 1381 BLAKE2B 93f111c4ffd2754e2e3295b8f1863d82a2834bc7676168da66f18d8a3dcb3f98551314f668cc9e2cf8ea35f4b20d37c7eda3f7ee3cc6a402bdfa0e0885b50864 SHA512 275045fa854a7857f7db9fa8974add64248c588d461b5fb94ab148d3bf869a10206e1c0a95b1084fb4d2a92ebcb1bf7a974e33fd9b280d5bb1d6926759a991f4
+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.10.ebuild b/app-admin/eselect/eselect-1.4.10.ebuild
new file mode 100644
index 000000000000..9d5ea613a470
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.10.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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-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 ~sparc-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
+}
diff --git a/app-admin/eselect/eselect-9999.ebuild b/app-admin/eselect/eselect-9999.ebuild
index cf5d48bc58ce..238cf0896ada 100644
--- a/app-admin/eselect/eselect-9999.ebuild
+++ b/app-admin/eselect/eselect-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/eselect.git"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/eselect.git"
 
 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-2.5 )"
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
 IUSE="doc emacs vim-syntax"
 
@@ -30,6 +30,7 @@ PDEPEND="emacs? ( app-emacs/eselect-mode )
 	vim-syntax? ( app-vim/eselect-syntax )"
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
@@ -42,7 +43,10 @@ src_install() {
 	emake DESTDIR="${D}" install
 	newbashcomp misc/${PN}.bashcomp ${PN}
 	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	use doc && dohtml *.html doc/*
+	if use doc; then
+		docinto html
+		dodoc *.html doc/*.html doc/*.css
+	fi
 
 	# needed by news module
 	keepdir /var/lib/gentoo/news