[gentoo-commits] repo/gentoo:master commit in: sys-fs/pysize/files/, sys-fs/pysize/

[gentoo-commits] repo/gentoo:master commit in: sys-fs/pysize/files/, sys-fs/pysize/

[Justin Lecher]

commit:     7b6255ed70d718ed032f9806fb206700477de39b
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  7 08:06:51 2019 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jul  8 19:34:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6255ed

sys-fs/pysize: Restrict test and EAPI=7

Closes: https://bugs.gentoo.org/643440
Closes: https://bugs.gentoo.org/650112
Package-Manager: Portage-2.3.68, Repoman-2.3.12
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sys-fs/pysize/files/psyco-0.2-automagic.patch                |  4 ++--
 sys-fs/pysize/pysize-0.2-r1.ebuild                           |  8 +++++++-
 sys-fs/pysize/{pysize-0.2-r1.ebuild => pysize-0.2-r2.ebuild} | 12 +++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/sys-fs/pysize/files/psyco-0.2-automagic.patch b/sys-fs/pysize/files/psyco-0.2-automagic.patch
index 696f81fa4fe..72129804b88 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 00d9596d3c9..867db7463b7 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= )"
@@ -48,6 +50,10 @@ python_prepare_all() {
 		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

diff --git a/sys-fs/pysize/pysize-0.2-r1.ebuild b/sys-fs/pysize/pysize-0.2-r2.ebuild
similarity index 89%
copy from sys-fs/pysize/pysize-0.2-r1.ebuild
copy to sys-fs/pysize/pysize-0.2-r2.ebuild
index 00d9596d3c9..df91d9b7fc8 100644
--- a/sys-fs/pysize/pysize-0.2-r1.ebuild
+++ b/sys-fs/pysize/pysize-0.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 pypy )
 
@@ -13,11 +13,13 @@ SRC_URI="http://guichaz.free.fr/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+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= )"
@@ -48,6 +50,10 @@ python_prepare_all() {
 		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