gentoo resync : 22.01.2019

3 files changed, 122 insertions, 15 deletions

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 4ee11e8d2f5c..e1928342a988 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -13,5 +13,6 @@ EBUILD layman-2.0.0-r3.ebuild 1668 BLAKE2B 9132c3dc910abfadf07e6fd9b3a69ea6234bd
 EBUILD layman-2.2.0-r7.ebuild 2178 BLAKE2B 2b3959e9f03c436dd07d7db4cc36b6d0a147cc0e3d35dfc9363e2baa1e869b9092c4eadda6a5424ea53c50667add23622065222ac4ade7142bc34cebc2e08f5f SHA512 04c77e388d73a53034fce76018c09d79ff67e1ece9719afb381bb79a4566b45873ba3acab4040f64b4012e0a442f72d9bb534f1cfe19840a461e5b607678b255
 EBUILD layman-2.4.1-r1.ebuild 2116 BLAKE2B 4f16a3e6aa26701a653c3b2e103085edd6420676f0667db18ccd87cf3aba8a858827f85f5fce383c379c658faeb82b736a77f17790a5ba95eaeafea72a1aa9f2 SHA512 5ecb7a7786ca0354090a20f4fc63def960d27a2a47b77d2d69742f905109a06f693154694967229ab3dcfbb52ec4ddfbfcee7260c426afe2253011f329035b60
 EBUILD layman-2.4.2-r1.ebuild 2290 BLAKE2B d0b14efa34f39d9e290cb5c0aa1f412da1f52c97bd711c09ce769784af9c1a6774edf38f61e50e58434a8ea9aebc4cedc72bd460b0084988070348551613dfce SHA512 e53e629e613c8507fabc046cc1549b3f8ab9334e43fb23e3a049ed76ab9b3f43b0f24111ed1bd3af683ecb6da1504779952a217d0d299c8f5d0f2cb6819709ef
-EBUILD layman-9999.ebuild 2223 BLAKE2B 1d32d63d9c99593e03dc8e3ed8b31d775918593bc115129433eee7dec66d115eba0424eba42864e187a2796e5bc3ea54aa5c3ac13a2d851fc81dcb18ad8d3342 SHA512 ac5a21aa58ae616b661f92ed4dfcd9cd15413be55778e496a22dded16de24efa26f707008d50a2e0bbe43a4c615dcff1333d972cde8eca2671b3c1f480c3b8d4
+EBUILD layman-2.4.2-r2.ebuild 2427 BLAKE2B b2a1f619050ef6fff19eaca05d7886c7c9cda04c61814b02a0d98f2c8185e161ba4abbd58f8de19ed5bb503007b0a79415d1042bce36fa20eb28d371c9be5dcf SHA512 8c936dc9f1f08e2bbc5b7af848b8fcf5a545f14a4d0e2bb0c925491b485a3c9cb017efa15b8a401b312068927bfe4b2f8a67c1468ff5d51f206bd1d82ef76c33
+EBUILD layman-9999.ebuild 2427 BLAKE2B b2a1f619050ef6fff19eaca05d7886c7c9cda04c61814b02a0d98f2c8185e161ba4abbd58f8de19ed5bb503007b0a79415d1042bce36fa20eb28d371c9be5dcf SHA512 8c936dc9f1f08e2bbc5b7af848b8fcf5a545f14a4d0e2bb0c925491b485a3c9cb017efa15b8a401b312068927bfe4b2f8a67c1468ff5d51f206bd1d82ef76c33
 MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
diff --git a/app-portage/layman/layman-2.4.2-r2.ebuild b/app-portage/layman/layman-2.4.2-r2.ebuild
new file mode 100644
index 000000000000..2c9b4823a37d
--- /dev/null
+++ b/app-portage/layman/layman-2.4.2-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+PYTHON_REQ_USE="xml(+),sqlite?"
+
+inherit eutils distutils-r1 linux-info prefix
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Tool to manage Gentoo overlays"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
+
+DEPEND="test? ( dev-vcs/subversion )
+	"
+
+RDEPEND="
+	bazaar? ( dev-vcs/bzr )
+	cvs? ( dev-vcs/cvs )
+	darcs? ( dev-vcs/darcs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	g-sorcery? ( app-portage/g-sorcery )
+	subversion? (
+		|| (
+			>=dev-vcs/subversion-1.5.4[http]
+			>=dev-vcs/subversion-1.5.4[webdav-neon]
+			>=dev-vcs/subversion-1.5.4[webdav-serf]
+		)
+	)
+	gpg? ( >=dev-python/pyGPG-0.2 )
+	sync-plugin-portage? (
+		|| (
+			>=sys-apps/portage-2.2.16[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)
+	!sync-plugin-portage? (
+		|| (
+			sys-apps/portage[${PYTHON_USEDEP}]
+			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
+		)
+	)
+	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
+	"
+
+layman_check_kernel_config() {
+	local CONFIG_CHECK
+	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
+	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
+}
+
+pkg_pretend() {
+	layman_check_kernel_config
+}
+
+pkg_setup() {
+	layman_check_kernel_config
+}
+
+python_prepare_all()  {
+	python_setup
+	esetup.py setup_plugins
+	distutils-r1_python_prepare_all
+	eprefixify etc/layman.cfg layman/config.py
+}
+
+python_test() {
+	suite=layman/tests/external.py
+	PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
+	unset suite
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/layman
+	doins etc/layman.cfg
+
+	doman doc/layman.8
+	docinto html
+	dodoc doc/layman.8.html
+
+	keepdir /var/lib/layman
+	keepdir /etc/layman/overlays
+}
+
+pkg_postinst() {
+	# now run layman's update utility
+	einfo "Running layman-updater..."
+	"${EROOT}"/usr/bin/layman-updater
+	einfo
+}
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 41753c3c8898..2c9b4823a37d 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -1,24 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 PYTHON_REQ_USE="xml(+),sqlite?"
 
-inherit eutils distutils-r1 git-r3 linux-info prefix
+inherit eutils distutils-r1 linux-info prefix
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
 
 DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net"
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
 
 DEPEND="test? ( dev-vcs/subversion )
-	app-text/asciidoc
 	"
 
 RDEPEND="
@@ -78,11 +83,6 @@ python_test() {
 	unset suite
 }
 
-python_compile_all() {
-	# override MAKEOPTS to prevent build failure
-	emake -j1 -C doc
-}
-
 python_install_all() {
 	distutils-r1_python_install_all
 
@@ -90,7 +90,8 @@ python_install_all() {
 	doins etc/layman.cfg
 
 	doman doc/layman.8
-	dohtml doc/layman.8.html
+	docinto html
+	dodoc doc/layman.8.html
 
 	keepdir /var/lib/layman
 	keepdir /etc/layman/overlays