| 1 |
gienah 15/05/01 12:06:35 |
| 2 |
|
| 3 |
Modified: p9m4-05.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
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. |
| 6 |
|
| 7 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 618E971F) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 sci-mathematics/p9m4/p9m4-05.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: p9m4-05.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- p9m4-05.ebuild 10 Aug 2014 20:24:01 -0000 1.3 |
| 23 |
+++ p9m4-05.ebuild 1 May 2015 12:06:35 -0000 1.4 |
| 24 |
@@ -1,11 +1,13 @@ |
| 25 |
-# Copyright 1999-2014 Gentoo Foundation |
| 26 |
+# Copyright 1999-2015 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild,v 1.3 2014/08/10 20:24:01 slyfox Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild,v 1.4 2015/05/01 12:06:35 gienah Exp $ |
| 30 |
|
| 31 |
-EAPI="4" |
| 32 |
-PYTHON_DEPEND="2:2.5" |
| 33 |
+EAPI="5" |
| 34 |
|
| 35 |
-inherit base distutils |
| 36 |
+PYTHON_COMPAT=( python2_7 ) |
| 37 |
+DISTUTILS_SINGLE_IMPL=1 |
| 38 |
+ |
| 39 |
+inherit distutils-r1 |
| 40 |
|
| 41 |
MY_PN="p9m4-v" |
| 42 |
MY_P="${MY_PN}${PV}" |
| 43 |
@@ -20,31 +22,34 @@ |
| 44 |
KEYWORDS="~amd64 ~x86" |
| 45 |
IUSE="examples" |
| 46 |
|
| 47 |
-RDEPEND="dev-python/wxpython |
| 48 |
+RDEPEND="dev-python/wxpython:* |
| 49 |
sci-mathematics/prover9" |
| 50 |
DEPEND="${RDEPEND} |
| 51 |
dev-python/setuptools" |
| 52 |
|
| 53 |
-PATCHES=("${DISTDIR}/${MY_PN}05-64bit.patch.bz2" |
| 54 |
+PATCHES=( "${DISTDIR}/${MY_PN}05-64bit.patch.bz2" |
| 55 |
"${FILESDIR}/${MY_PN}05-use-inst-paths.patch" |
| 56 |
"${FILESDIR}/${MY_PN}05-package.patch" |
| 57 |
- "${FILESDIR}/${MY_PN}05-python2.6.patch") |
| 58 |
+ "${FILESDIR}/${MY_PN}05-python2.6.patch" ) |
| 59 |
|
| 60 |
S="${WORKDIR}/${MY_P}/" |
| 61 |
|
| 62 |
+python_check_deps() { |
| 63 |
+ has_version "dev-python/foo[${PYTHON_USEDEP}]" |
| 64 |
+} |
| 65 |
+ |
| 66 |
pkg_setup() { |
| 67 |
- python_set_active_version 2 |
| 68 |
- python_pkg_setup |
| 69 |
+ python-single-r1_pkg_setup |
| 70 |
} |
| 71 |
|
| 72 |
-src_prepare() { |
| 73 |
+python_prepare_all() { |
| 74 |
rm -f p9m4-v05/bin/prover9 \ |
| 75 |
p9m4-v05/bin/mace4 \ |
| 76 |
p9m4-v05/bin/interpformat \ |
| 77 |
p9m4-v05/bin/prooftrans \ |
| 78 |
p9m4-v05/bin/isofilter \ |
| 79 |
p9m4-v05/bin/isofilter2 || die "Could not rm old executables" |
| 80 |
- base_src_prepare |
| 81 |
+ distutils-r1_python_prepare_all |
| 82 |
mkdir p9m4 || die "Could not create directory p9m4" |
| 83 |
mv Mac-setup.py \ |
| 84 |
Win32-setup.py \ |
| 85 |
@@ -60,11 +65,9 @@ |
| 86 |
|| die "Could not move package p9m4 python files to p9m4 directory" |
| 87 |
touch p9m4/__init__.py \ |
| 88 |
|| die "Could not create empty p9m4/__init__.py file" |
| 89 |
- distutils_src_prepare |
| 90 |
} |
| 91 |
|
| 92 |
-src_install() { |
| 93 |
- distutils_src_install |
| 94 |
+python_install_all() { |
| 95 |
dosym /usr/bin/prover9-mace4.py /usr/bin/prover9-mace4 |
| 96 |
insinto /usr/share |
| 97 |
dodir /usr/share/${PN}/Images |
| 98 |
@@ -104,7 +107,3 @@ |
| 99 |
doins *.in |
| 100 |
fi |
| 101 |
} |
| 102 |
- |
| 103 |
-pkg_postinst() { |
| 104 |
- distutils_pkg_postinst |
| 105 |
-} |
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
1.7 sci-mathematics/p9m4/ChangeLog |
| 110 |
|
| 111 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/p9m4/ChangeLog?rev=1.7&view=markup |
| 112 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/p9m4/ChangeLog?rev=1.7&content-type=text/plain |
| 113 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/p9m4/ChangeLog?r1=1.6&r2=1.7 |
| 114 |
|
| 115 |
Index: ChangeLog |
| 116 |
=================================================================== |
| 117 |
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/ChangeLog,v |
| 118 |
retrieving revision 1.6 |
| 119 |
retrieving revision 1.7 |
| 120 |
diff -u -r1.6 -r1.7 |
| 121 |
--- ChangeLog 10 Aug 2014 20:24:01 -0000 1.6 |
| 122 |
+++ ChangeLog 1 May 2015 12:06:35 -0000 1.7 |
| 123 |
@@ -1,6 +1,11 @@ |
| 124 |
# ChangeLog for sci-mathematics/p9m4 |
| 125 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 126 |
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/ChangeLog,v 1.6 2014/08/10 20:24:01 slyfox Exp $ |
| 127 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 128 |
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/ChangeLog,v 1.7 2015/05/01 12:06:35 gienah Exp $ |
| 129 |
+ |
| 130 |
+ 01 May 2015; Mark Wright <gienah@g.o> p9m4-05.ebuild: |
| 131 |
+ EAPI=5. Use python 2.7. Thanks to Ian Delaney for helping to upgrade to |
| 132 |
+ distutils-r1, fixes bug 544896 =/sci-mathematics/p9m4-05 request for |
| 133 |
+ conversion to new EAPI & eclass. |
| 134 |
|
| 135 |
10 Aug 2014; Sergei Trofimovich <slyfox@g.o> p9m4-05.ebuild: |
| 136 |
QA: drop trailing '.' from DESCRIPTION |
Archives