From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6724A138330 for ; Tue, 6 Sep 2016 19:18:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5B06E0B0B; Tue, 6 Sep 2016 19:18:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4BA73E0B0B for ; Tue, 6 Sep 2016 19:18:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5992C3408A6 for ; Tue, 6 Sep 2016 19:18:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B20D245A for ; Tue, 6 Sep 2016 19:17:56 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1473189468.531458626fbced1d1402790d7623df10c4de29a4.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/pysolfc/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-board/pysolfc/pysolfc-2.0-r5.ebuild X-VCS-Directories: games-board/pysolfc/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 531458626fbced1d1402790d7623df10c4de29a4 X-VCS-Branch: master Date: Tue, 6 Sep 2016 19:17:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 697229de-183d-4370-b897-d5d86072d47f X-Archives-Hash: f208da78011f1a110f487bb22e68b88c commit: 531458626fbced1d1402790d7623df10c4de29a4 Author: David Seifert gentoo org> AuthorDate: Tue Sep 6 19:16:52 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Sep 6 19:17:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53145862 games-board/pysolfc: Simplify, remove python-single-r1 inherit Package-Manager: portage-2.3.0 games-board/pysolfc/pysolfc-2.0-r5.ebuild | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/games-board/pysolfc/pysolfc-2.0-r5.ebuild b/games-board/pysolfc/pysolfc-2.0-r5.ebuild index 6b7b752..9dc1ce7 100644 --- a/games-board/pysolfc/pysolfc-2.0-r5.ebuild +++ b/games-board/pysolfc/pysolfc-2.0-r5.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="tk" DISTUTILS_SINGLE_IMPL="1" -inherit eutils python-single-r1 distutils-r1 +inherit eutils distutils-r1 MY_PN=PySolFC SOL_URI="mirror://sourceforge/${PN}" @@ -31,23 +31,12 @@ RDEPEND="${RDEPEND} dev-tcltk/tktable ) sound? ( dev-python/pygame[${PYTHON_USEDEP}] )" -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${PN}-PIL-imports.patch" #471514 - "${FILESDIR}/${PN}-gentoo.patch" #591904 - ) - - distutils-r1_python_prepare_all -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - default - distutils-r1_src_prepare +PATCHES=( + "${FILESDIR}/${PN}-PIL-imports.patch" #471514 + "${FILESDIR}/${PN}-gentoo.patch" #591904 +) +python_prepare_all() { sed -i \ -e "/pysol.desktop/d" \ -e "s:share/icons:share/pixmaps:" \ @@ -55,10 +44,8 @@ src_prepare() { setup.py || die mv docs/README{,.txt} || die -} -src_compile() { - distutils-r1_src_compile + distutils-r1_python_prepare_all } python_install_all() { @@ -76,7 +63,3 @@ python_install_all() { distutils-r1_python_install_all } - -src_install() { - distutils-r1_src_install -}