From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0739A138989 for ; Fri, 1 May 2015 12:06:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 978A6E0849; Fri, 1 May 2015 12:06:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 251DEE0849 for ; Fri, 1 May 2015 12:06:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02E00340C9F for ; Fri, 1 May 2015 12:06:39 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 2311) id 96B3998E; Fri, 1 May 2015 12:06:35 +0000 (UTC) From: "Mark Wright (gienah)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, gienah@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sci-mathematics/p9m4: p9m4-05.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: p9m4-05.ebuild ChangeLog X-VCS-Directories: sci-mathematics/p9m4 X-VCS-Committer: gienah X-VCS-Committer-Name: Mark Wright Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20150501120635.96B3998E@oystercatcher.gentoo.org> Date: Fri, 1 May 2015 12:06:35 +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: 494a43c6-6319-42ad-9320-4e792940181a X-Archives-Hash: 54314c4f82b51a4e75d1d8178ef3adbd gienah 15/05/01 12:06:35 Modified: p9m4-05.ebuild ChangeLog Log: EAPI=5. Use python 2.7. Thanks to Ian Delaney for helping to upgrade to distutils-r1, fixes bug 544896 =/sci-mathematics/p9m4-05 request for conversion to new EAPI & eclass. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 618E971F) Revision Changes Path 1.4 sci-mathematics/p9m4/p9m4-05.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild?r1=1.3&r2=1.4 Index: p9m4-05.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- p9m4-05.ebuild 10 Aug 2014 20:24:01 -0000 1.3 +++ p9m4-05.ebuild 1 May 2015 12:06:35 -0000 1.4 @@ -1,11 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild,v 1.3 2014/08/10 20:24:01 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild,v 1.4 2015/05/01 12:06:35 gienah Exp $ -EAPI="4" -PYTHON_DEPEND="2:2.5" +EAPI="5" -inherit base distutils +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 MY_PN="p9m4-v" MY_P="${MY_PN}${PV}" @@ -20,31 +22,34 @@ KEYWORDS="~amd64 ~x86" IUSE="examples" -RDEPEND="dev-python/wxpython +RDEPEND="dev-python/wxpython:* sci-mathematics/prover9" DEPEND="${RDEPEND} dev-python/setuptools" -PATCHES=("${DISTDIR}/${MY_PN}05-64bit.patch.bz2" +PATCHES=( "${DISTDIR}/${MY_PN}05-64bit.patch.bz2" "${FILESDIR}/${MY_PN}05-use-inst-paths.patch" "${FILESDIR}/${MY_PN}05-package.patch" - "${FILESDIR}/${MY_PN}05-python2.6.patch") + "${FILESDIR}/${MY_PN}05-python2.6.patch" ) S="${WORKDIR}/${MY_P}/" +python_check_deps() { + has_version "dev-python/foo[${PYTHON_USEDEP}]" +} + pkg_setup() { - python_set_active_version 2 - python_pkg_setup + python-single-r1_pkg_setup } -src_prepare() { +python_prepare_all() { rm -f p9m4-v05/bin/prover9 \ p9m4-v05/bin/mace4 \ p9m4-v05/bin/interpformat \ p9m4-v05/bin/prooftrans \ p9m4-v05/bin/isofilter \ p9m4-v05/bin/isofilter2 || die "Could not rm old executables" - base_src_prepare + distutils-r1_python_prepare_all mkdir p9m4 || die "Could not create directory p9m4" mv Mac-setup.py \ Win32-setup.py \ @@ -60,11 +65,9 @@ || die "Could not move package p9m4 python files to p9m4 directory" touch p9m4/__init__.py \ || die "Could not create empty p9m4/__init__.py file" - distutils_src_prepare } -src_install() { - distutils_src_install +python_install_all() { dosym /usr/bin/prover9-mace4.py /usr/bin/prover9-mace4 insinto /usr/share dodir /usr/share/${PN}/Images @@ -104,7 +107,3 @@ doins *.in fi } - -pkg_postinst() { - distutils_pkg_postinst -} 1.7 sci-mathematics/p9m4/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/p9m4/ChangeLog?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/p9m4/ChangeLog?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/p9m4/ChangeLog?r1=1.6&r2=1.7 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ChangeLog 10 Aug 2014 20:24:01 -0000 1.6 +++ ChangeLog 1 May 2015 12:06:35 -0000 1.7 @@ -1,6 +1,11 @@ # ChangeLog for sci-mathematics/p9m4 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/ChangeLog,v 1.6 2014/08/10 20:24:01 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/ChangeLog,v 1.7 2015/05/01 12:06:35 gienah Exp $ + + 01 May 2015; Mark Wright p9m4-05.ebuild: + EAPI=5. Use python 2.7. Thanks to Ian Delaney for helping to upgrade to + distutils-r1, fixes bug 544896 =/sci-mathematics/p9m4-05 request for + conversion to new EAPI & eclass. 10 Aug 2014; Sergei Trofimovich p9m4-05.ebuild: QA: drop trailing '.' from DESCRIPTION