gentoo resync : 28.04.2018

3 files changed, 15 insertions, 43 deletions

diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index 8b90e4911b66..3f79bdb50e3f 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -2,7 +2,6 @@ AUX pyxattr-0.6.0-xattr_header.patch 1780 BLAKE2B 43244b281bec7166d539155c66e604
 DIST pyxattr-0.5.5.tar.gz 26718 BLAKE2B b8d599ed0194fec4809ebdb8277fa4023e932ed49a8a6253a7c6a879250a73330334bd8a72b0c9d9bfd828cac1454659d23b55b5e608bfe0109392988709beb8 SHA512 77b732a7e524a7c31a0511df2c96c18b214f93c6ac47276ecdf12ed95133ee506fa882b2532a7159aa2f4e02a7128e33bb8883ea632a5394297d98fb28898327
 DIST pyxattr-0.6.0.tar.gz 31057 BLAKE2B cf6e99c499dbcc74305970413803e5cf59508e7ee1bf247afe42e576c2dfaf118a374ad6f8721b9d9c482f8be0c222d26b82997dc1ccc79248d5f52b2064ed8d SHA512 c56bf57729b5f8c8e3e19e29fd903b7365c6644abe3dcebf57ffc2f97a1e92d0e22cdc0a967c5abee3a74ba61a2a379e31a1734f45449095bdb7895b8357a9bb
 EBUILD pyxattr-0.5.5.ebuild 1438 BLAKE2B e2d3d5db037f6c151f0b04a7bba09f15b4cb7b65e7a2d95f79746c42b9b71fd1071b1ae580efddec000962aa037a5b29ac6b6b3f05e315d1aad9e932e964b13c SHA512 82a2ba279df41958c198df3bdccd3e11afc3b8f9e21dc47395bb248cc496c1e4ffc90f0c079bc1ecc4c15f09e5b1794b0c4f16351db7d4b5a54c641017dee184
-EBUILD pyxattr-0.6.0-r1.ebuild 1512 BLAKE2B c01331bd9dbe89e38373b1569384ad5f71553d8fdeede5a638d20790e50324f1ae192d165d209c158d8a29ba2adb168491258c247c2c25fe9887b3ebd9c1d320 SHA512 750a62c2cc77d4aa9e9f6734b40989d21973cba964a10bbaac9706db3dc8ca798cb9109b896a65fe9a6756969bdb4938926295818292ee14cc1dbe8fc1a92886
+EBUILD pyxattr-0.6.0-r1.ebuild 1982 BLAKE2B 1715fc8e2af7421c0449f90bfe34026af73d3a69b108550a9be4de5d4176efb4cbb402915cefe04aa6a424c15f5fa5d2860701003b1da8a54b2d97319895ff02 SHA512 4662c167e6e1f7a43960ba533a04e8a8c73c9a9dc2b629d45d5b092da98f7cc3917303a2a2ab7914ca4da90a65d89dbdfa4913639e54916d66b41aef5675319c
 EBUILD pyxattr-0.6.0.ebuild 1453 BLAKE2B a5eeb237b3d96522ae101d2616b04848ff215ab02f2598d9af348f6f10a47c3a8b6493173c9a2ba7474f74b7fdd255f840aafc7342c608f931e8c74152b0ef1e SHA512 f8a07d34395d66ac643a66360fc2bf28506b62f2be62ab4bdcb8514f81c3831987740a646a384c520e2468f75a06b46a279db7a64ce39eff9dceab4ebe27f369
-EBUILD pyxattr-9999.ebuild 891 BLAKE2B 4c4b52fd52aeac0b2f5c34a98b5d33c0ef6751854482fcd235bf4944bf180579237afa6b63011783ba57d9bff7e2cf809d7ebf0c75cb1c0e2e525e18c392a4f4 SHA512 1625689623d31128e9fc268a536bc09b9e5fcb16994f30e464a135368513042e34c6a0b73d5b46abbd6101b6ac1b26b705e96eeaeb388678503c532d3c76cc9d
 MISC metadata.xml 609 BLAKE2B 8f3429390129e4438c5bb4c8d82ae11e9824863d4b200a57d660d0ae93692711b96c6cbcfd9e7e8ad46848beba86dd2ee971acde59c08c9fc6f317283358157f SHA512 8a18175143b319bf6f623304ad8f534ad34eaf8b67c57ee1addb8886e34d79bd3a74723bce4f66fb5e9e3dad4768aaf253cec8fb8e97365f152d0b8f772d7df6
diff --git a/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild b/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
index f8e01c1715bf..426732b4ae68 100644
--- a/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.6.0-r1.ebuild
@@ -42,15 +42,25 @@ python_compile_all() {
 src_test() {
 	# Perform the tests in /var/tmp; that location is more likely
 	# to have xattr support than /tmp which is often tmpfs.
-	export TESTDIR=/var/tmp
+	local -x TEST_DIR="${TEST_DIR:-/var/tmp}"
+	# Ignore selinux attributes by default, bug #503946.
+	local -x TEST_IGNORE_XATTRS="${TEST_IGNORE_XATTRS:-security.selinux}"
 
-	einfo 'Please note that the tests fail if xattrs are not supported'
-	einfo 'by the filesystem used for /var/tmp.'
+	einfo "Please note that the tests fail if xattrs are not supported"
+	einfo "by the filesystem used for ${TEST_DIR}."
+	einfo
+	einfo "The location for tests can be overriden using TEST_DIR variable:"
+	einfo "  $ export TEST_DIR=/my/test/place"
+	einfo
+	einfo "Additionally, TEST_IGNORE_XATTRS can be set to control which"
+	einfo "external attributes are ignored by the tests."
+	einfo "See https://bugs.gentoo.org/503946 for details."
+	einfo
 	distutils-r1_src_test
 }
 
 python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
+	nosetests -v || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/pyxattr/pyxattr-9999.ebuild b/dev-python/pyxattr/pyxattr-9999.ebuild
deleted file mode 100644
index b6f6836aa8cc..000000000000
--- a/dev-python/pyxattr/pyxattr-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-inherit distutils-r1 eutils git-r3
-
-DESCRIPTION="Python interface to xattr"
-HOMEPAGE="https://pyxattr.k1024.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/iustin/${PN}.git"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-
-RDEPEND="sys-apps/attr"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-src_test() {
-	# Perform the tests in /var/tmp; that location is more likely
-	# to have xattr support than /tmp which is often tmpfs.
-	export TESTDIR=/var/tmp
-
-	einfo 'Please note that the tests fail if xattrs are not supported'
-	einfo 'by the filesystem used for /var/tmp.'
-	distutils-r1_src_test
-}
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}