gentoo resync : 11.07.2019

4 files changed, 80 insertions, 5 deletions

diff --git a/sys-fs/pysize/Manifest b/sys-fs/pysize/Manifest
index 8cb134390d13..87e43dedf9d4 100644
--- a/sys-fs/pysize/Manifest
+++ b/sys-fs/pysize/Manifest
@@ -1,5 +1,6 @@
 AUX 0.2-setuptools-automagic.patch 265 BLAKE2B da39d6dc75ead004365561b443966a388b3596073d21ba05b8faad4b77c7dae8ce994e72ce878141c81dd7b3350a52d57550abe5b3a3bfea9bc669f0d5208bfc SHA512 8caa271dcfb016c81392e0f590e06f6057d297e9bb5196e9362372c725d218fbef911561e6528c624c2acf133b0ab8947e2b5ccc58704dc2ea5e0cbab0011dad
-AUX psyco-0.2-automagic.patch 587 BLAKE2B bb411ae9f7f1437cb59f5a4dd70bdce931ba95cbdef0d04d9e816506478351baf235579d569ec35b04317aca29cc9e2842e8512e761c5e5b5ed3d642c6bc43c5 SHA512 a0f254b2f7b659bd63fbee10fe0beba79871f7da15f63f951c9794147d700a0f9073ce3039713bb649074cb6380ea18b321c0140cf85f2c192bee59686a04fa2
+AUX psyco-0.2-automagic.patch 591 BLAKE2B 2e28396f8236fcf0a7d832155893785fa514846cc964b3ede2c6a59f96ba9b650f8a60e4e75b9a0fabfdb865f425af7b2e01cee2799f8a717a07294a00c207aa SHA512 04cdf174c9fdab2abca56fa84704d83fba976fa8cd6a2a40d704aa54dd46e733e7b2ac8e236da6b8e003b06fc8c55691fc0eff2c7666b3c2eb672d5607f86983
 DIST pysize-0.2.tar.bz2 498930 BLAKE2B ada679a30073f7ac27e632be80f44891d6b84137db4a0ae27d406aaf36a9c8c90f9f1700da1a69615cf4f92ac4ae27f8b70cea5bfe06a3f48de25a58f507d39f SHA512 621e6e8de75d3486c196cf59e29f1c01eca151139a1d8518ace334d92533dd2df19fce52a3362c3b8abbb1e3b244148609a081832ae53f91bccc65f5f7fa57a5
-EBUILD pysize-0.2-r1.ebuild 1579 BLAKE2B 9e3c4e14bc96a7f48c30d431dbd18e5e7bc6a4235560b329bda0fe4b2e1fb815a6e291b2a25b16d1d6447f0dbb81802093f5dcfa5a57faafa15d544b24b981c1 SHA512 0c0d6f3c86d75b1789072ef7817a6c280ac4baebeea10878e96f8e2eb284f83e6d27640e99ae0eb4226953d22a953635499f7cd5953b6eb51d0507dd8e5ed62a
+EBUILD pysize-0.2-r1.ebuild 1663 BLAKE2B b18ef0c79d6d852c5ae600d5ddd8486b539d0338e08fb8d4c6c87eef1220cc684ad09e916e889f2b0ce13c9e2ae6a8bd533318c7968f08f903b5a281dfadd940 SHA512 d7e63489fec1d0a4e3ef04afa632ece677f18db914d1a5fd144ddae46fe14442dff52819a61ad5fa05360ff6e7630724af5971f380172c80e07cd8713ad06987
+EBUILD pysize-0.2-r2.ebuild 1665 BLAKE2B ace1b8caf687480edbbe4925dbdf33cf9a1627da2c0797af0810344a00e59d0c77fcaa98a79b559041b23bcadc680eaf57392a63c9adf8b41fa622309245f4bd SHA512 0177389204f8ced3834fcfd765c74103ccc172bcfd36a9015e2cdb5a825c7fb45a445fb681fd516d33fea1d0e56227c43ca72d200e0a30c97b7f38b66fe440a3
 MISC metadata.xml 219 BLAKE2B 813585cd65d05a9ef9aaa9a9fca8cfa66b803be8df8b300a6adfe0263e593ab53afd106180cc44391c9c27129ea9fdacdd8b1c37841e6aa33d833278b8c7dd9f SHA512 e075cd1d2568691a299ae945f75e194b462a394f88f7b3e5a60c4529cee7ac7e7a275204602085f15d024c3496f21554a18a24002770e9c5ef0ce64a74597602
diff --git a/sys-fs/pysize/files/psyco-0.2-automagic.patch b/sys-fs/pysize/files/psyco-0.2-automagic.patch
index 696f81fa4feb..72129804b88c 100644
--- a/sys-fs/pysize/files/psyco-0.2-automagic.patch
+++ b/sys-fs/pysize/files/psyco-0.2-automagic.patch
@@ -1,5 +1,5 @@
---- pysize/main.py	2007-03-11 16:09:53.000000000 +0100
-+++ pysize/main.py.new	2009-01-02 00:08:43.384827054 +0100
+--- a/pysize/main.py	2007-03-11 16:09:53.000000000 +0100
++++ b/pysize/main.py.new	2009-01-02 00:08:43.384827054 +0100
 @@ -69,17 +69,8 @@
      stats.print_stats(40)
      os.remove(prof_file)
diff --git a/sys-fs/pysize/pysize-0.2-r1.ebuild b/sys-fs/pysize/pysize-0.2-r1.ebuild
index 00d9596d3c9c..867db7463b78 100644
--- a/sys-fs/pysize/pysize-0.2-r1.ebuild
+++ b/sys-fs/pysize/pysize-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,6 +18,8 @@ IUSE="gtk ncurses"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+RESTRICT="test"
+
 RDEPEND="
 	gtk? ( dev-python/pygtk:2 )
 	ncurses? ( sys-libs/ncurses:0= )"
@@ -49,6 +51,10 @@ python_prepare_all() {
 	fi
 
 	sed \
+		-e "s:/tmp:${T}:g" \
+		-i tests/tests/*.py tests/*py || die
+
+	sed \
 		-e '/for ui_run in/s:ui_ascii.run:ui_ascii.run, ui_ascii.run:g' \
 		-i pysize/main.py || die
 
diff --git a/sys-fs/pysize/pysize-0.2-r2.ebuild b/sys-fs/pysize/pysize-0.2-r2.ebuild
new file mode 100644
index 000000000000..df91d9b7fc8a
--- /dev/null
+++ b/sys-fs/pysize/pysize-0.2-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A graphical and console tool for exploring the size of directories"
+HOMEPAGE="http://guichaz.free.fr/pysize/"
+SRC_URI="http://guichaz.free.fr/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="gtk ncurses"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+RDEPEND="
+	gtk? ( dev-python/pygtk:2 )
+	ncurses? ( sys-libs/ncurses:0= )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/psyco-${PV}-automagic.patch
+	"${FILESDIR}"/${PV}-setuptools-automagic.patch
+	)
+
+python_prepare_all() {
+	if ! use gtk; then
+		sed \
+			-e '/^from pysize.ui.gtk/d' \
+		    -e "s~'gtk': ui_gtk.run,~~g" \
+		    -e 's:ui_gtk.run,::g' \
+		    -i pysize/main.py || die "Failed to remove gtk support"
+		rm -rf pysize/ui/gtk || die "Failed to remove gtk support"
+	fi
+
+	if ! use ncurses; then
+		sed \
+			-e '/^from pysize.ui.curses/d' \
+		    -e "s~'curses': ui_curses.run,~~g" \
+		    -e 's:ui_curses.run,::g' \
+		    -i pysize/main.py || die "Failed to remove ncurses support"
+		rm -rf pysize/ui/curses || die "Failed to remove ncurses support"
+	fi
+
+	sed \
+		-e "s:/tmp:${T}:g" \
+		-i tests/tests/*.py tests/*py || die
+
+	sed \
+		-e '/for ui_run in/s:ui_ascii.run:ui_ascii.run, ui_ascii.run:g' \
+		-i pysize/main.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd "${S}"/tests > /dev/null
+	PYTHONPATH=.:../ "${PYTHON}" pysize_tests.py || die "tests failed under ${EPYTHON}"
+	popd  > /dev/null
+}