gentoo resync : 02.12.2017

4 files changed, 13 insertions, 75 deletions

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index e04012310caf..70a6d2d2d615 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -2,12 +2,11 @@ AUX catalyst-2.0.18-Do-notuntarwith--acls.patch 6156 BLAKE2B 921e36d63c3a51f212c
 AUX catalyst-2.0.18-fix-quotes.patch 1663 BLAKE2B 3fcd863f94eb9d8e659520d29b8ec9c576b27c25f00adf5d47c60aa6cfa0e6da10b9745e4c6752fc7682f13423180e6f58777c584a7283eee4fc9db02ef34a1f SHA512 185705eba562dfeb52740ad3a0c3ea611648d508079ad54c9e5680d318888cc5123c5ff365b1c575a5348ddfd8210763277daed226b564ed3a59e15f18bff205
 AUX catalyst-2.0.18-remove-machine-id.patch 778 BLAKE2B 1174a6d9c777144d204fed28e912a981b5df93c2c7de983555c53863b5f1baa2a5d1f184fff7f6bb84534f884302ebc97d525d4db2250e0602b841faa7994a41 SHA512 7e5230eacc6ca7b535d416cd2dd846fa9fbc58951ef4cbdb14108afcbcd63f2d8a7b082920d04dc51b9eb47a6d44eeb5a07d704b14e71b6a972d96ca79f807d6
 AUX catalyst-2.0.18-stage1-export-ROOT.patch 1274 BLAKE2B 336c159e54f0a629c73b61814c1d2d9be5996af4367383164c446e9d5067eedff8094724a3830f3e50c922af72e9eacb90168e603d2506c4be4769d1fc549793 SHA512 6372917d395d8129c49c4dd8de7e6a8e7797f6c535e39713fa68059d82f398aa1fb0ffb1b6a65c91f9b5a4861f29cffd4717b7a612276e78d22ac1985ee32113
-DIST catalyst-2.0.18.tar.bz2 861398 SHA256 f3c2583fb8da425a9c57d3a00aac559e6bfde5951f1c7ef30ddf4fa00d6bedbd SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a WHIRLPOOL 73abb541bd9984e26e43dbeee3156ca84104aedfe16a027b97790274aaffa8678a29677da4ada908fe9c2184268eb9c266a8961a5e0681fccc463c47a6d83542
-DIST catalyst-3.0_rc1.tar.bz2 874429 SHA256 b21eabc059ef618b617fdd0fa7c558878393d58ff66ce77a7fc6ff87384608c6 SHA512 ca33a1142785f10471e675c9dce784e1f92d6029f2fcf82d2fb1a14292e7aa9063e7942e187faa5d4253f316c032b066a6aba0f32e29cc0125ef757654cbd845 WHIRLPOOL f7b3e7ea61c1e590141cc2ff1ec1883e8b07727ee52c2e1d64f8fd371312d1ef84806f5b40fc16d2178b4b9ffcdcaa3d4d3cac0e4ef52625e5f41c8b0a3ec25e
+DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
+DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f
 EBUILD catalyst-2.0.18-r1.ebuild 3129 BLAKE2B aab19478081661644cad7ea0614ebabab27086a52f5bdedd85746a09d9495291deea1e8ff77d71d86402587eaab230cd4360113b0a97d9406423b73fbbf22476 SHA512 c70736f23448ff07af62a587c0a3c4c8dabf24e35dfe3c8227c5d89ca9063adbb4bd2a1a7c9749d2b21435f7bc40651c30a00e95a23ef957558fead030b7d31c
 EBUILD catalyst-2.0.18-r4.ebuild 3297 BLAKE2B 77ddebef5817f7eecef4bfb4c4b90c2b2145b09f512f79cbd1b5e30109b41d9b5c5127c6bfe892eb3dfb351e9200007ab65405b31fca8fe39c10d6156d98761d SHA512 e397fb7205d4bf4823b5d328fb9059aa37ed8ad97deb2fa0fd7a7b1cafe694daa2f9f5705ff1a83905101b9679755b875a79063039a63743f6ef2e96dce4efea
 EBUILD catalyst-2.0.9999.ebuild 2930 BLAKE2B dbb778edeca28bda47b827c9cb2ea2c5e395df127e547a3a4e36aa64eb890700b9c6db0d160d7626a9e65fb79d7c53186a3407228a9f2140d2db0e2b7dad262b SHA512 0ce4efc9ff2ce0b394df62b9acf62393d7b277c61067439c3bd095ec0b362c140abdfb54329818e3a3d7eb2f97e1ea9954698eecaca8d093e8b4e5ee5835192f
-EBUILD catalyst-2.9999.ebuild 1537 BLAKE2B 6c66a7241e8704151dc096bed8a492bc79307ea1ac2b740e974fa20f7360a1555966ed77e4b1a6eeea2a327f904c8718d2c723c9627dda0df0eeab687a556747 SHA512 fbf47ebd92a551a9226aad367c5a75cfc079458ef91bd636b870e96376a9cff639540b0e34404f9b3aab5f7a11a33ba4bfb4aa77671d5932e750f084ad671194
-EBUILD catalyst-3.0_rc1.ebuild 1605 BLAKE2B d73cf07fb159d4e8cfee1f543e4d5222af0f3b5e72436b051641bfcaee60db59c2cbb749c70da475e41abfc59b70e461bb4826e8331312f672dc68a32d217c8d SHA512 adf6657e8bf659b7958da18b9088e4b655fffd161aae9e99776db76faef7d8d7ef3c28399038c4324bc502bf2f3ecdbf24d5ae3144bb317930add08d73592e9b
-EBUILD catalyst-9999.ebuild 1634 BLAKE2B babf92dc870354904596967b2b7172fb81f15c33556aa3c616e61845c318dd798d94a4cefb685daaa1acbd8c84676a992760be8ce783f1c833785b836eccc5ad SHA512 913a05a3544fe93f8127c6cced635fad43434fbb01d728b12152ebcc7924daea3b57124265a85f93bad8e43d6484ae4a77556041b2b9ca16a1e3ce7d2e86c1cf
+EBUILD catalyst-3.0.0.ebuild 1690 BLAKE2B fba4e43f89bac9c00ee781ff3448db711922deb4e2b84417c331cf8777fbf8c5e5706fa1273aa14ba84336626fb74097b7ddb9eb4eaa210d716fc7708e50f575 SHA512 f03b06da6acf658de5a7c6b5bc5aef1d3b175b225cdd056a303d02f7c996f06e805fdea03a0f20342636f322073ca6f3078a35194860e17b906d73cb5b05aa98
+EBUILD catalyst-9999.ebuild 1719 BLAKE2B 87891f3b0e74f61e8c9a7750f78bcc4b84e3dfbe83c1750caa5dedce695262133208a66cebce62f957e7ba31526b4b7ff4c305d95540417d6479902e65b5f8cd SHA512 2935800e7524a59decfcd1b940415bfe309f0e6754bdc17bdb66dfe361d9b9b7fa80df6a079648a9386057d5449437bb0079b9e89d9000033579b854f20df746
 MISC metadata.xml 417 BLAKE2B 161ad5d6df19baf10cd3110f677c85aa0d4c08051fc3be98c28d3f02312a50460a1e71619c314921e23fa680506ab88375ea033ea945db78a82a5fed35c953dc SHA512 ba623747ea22b2e886740d771dcd80ac54df9b29762d1d1f3eb46701e9463d245a2e310eb03695dc9342a57da486a9a8d56892da709727476a2d6afed5e63cb8
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
deleted file mode 100644
index c5105d8669b3..000000000000
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	EGIT_BRANCH="pending"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 multilib ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.5.2
-"
-RDEPEND="
-	=dev-python/pydecomp-9999
-	app-arch/lbzip2
-	app-crypt/shash
-	app-arch/tar[xattr]
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	ia64? ( sys-fs/dosfstools )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-
-python_prepare_all() {
-	python_export_best
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all(){
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0_rc1.ebuild b/dev-util/catalyst/catalyst-3.0.0.ebuild
index 920665f9a5ea..25437e6d4b09 100644
--- a/dev-util/catalyst/catalyst-3.0_rc1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,10 +13,10 @@ else
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
 		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
@@ -35,7 +35,8 @@ RDEPEND="
 	>=dev-python/pydecomp-0.1[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-crypt/shash
-	app-arch/tar[xattr]
+	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	x86-fbsd? ( app-arch/libarchive[xattr] )
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	ia64? ( sys-fs/dosfstools )
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index b257d2ff7661..514a27d90a60 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -13,10 +13,10 @@ else
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
 		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
@@ -35,7 +35,8 @@ RDEPEND="
 	=dev-python/pydecomp-9999[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-crypt/shash
-	app-arch/tar[xattr]
+	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	x86-fbsd? ( app-arch/libarchive[xattr] )
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	ia64? ( sys-fs/dosfstools )