From 7d8c59e3ec47533eaf8a80d4930e80b81862c16f Mon Sep 17 00:00:00 2001 From: Mark Wright Date: Fri, 1 May 2015 14:14:44 +0000 Subject: Thanks to Ian Delaney for reviewing: the norm is to revbump with the change of eclass, decided in the early stages of the making of the new eclasses; for consistency (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 618E971F) --- sci-mathematics/p9m4/ChangeLog | 10 ++- sci-mathematics/p9m4/p9m4-05-r1.ebuild | 109 +++++++++++++++++++++++++++++++++ sci-mathematics/p9m4/p9m4-05.ebuild | 109 --------------------------------- 3 files changed, 118 insertions(+), 110 deletions(-) create mode 100644 sci-mathematics/p9m4/p9m4-05-r1.ebuild delete mode 100644 sci-mathematics/p9m4/p9m4-05.ebuild diff --git a/sci-mathematics/p9m4/ChangeLog b/sci-mathematics/p9m4/ChangeLog index 9b929ad5ff22..77008cc53b98 100644 --- a/sci-mathematics/p9m4/ChangeLog +++ b/sci-mathematics/p9m4/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-mathematics/p9m4 # 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 $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/ChangeLog,v 1.8 2015/05/01 14:14:44 gienah Exp $ + +*p9m4-05-r1 (01 May 2015) + + 01 May 2015; Mark Wright +p9m4-05-r1.ebuild, + -p9m4-05.ebuild: + Thanks to Ian Delaney for reviewing: the norm is to revbump with the change of + eclass, decided in the early stages of the making of the new eclasses; for + consistency 01 May 2015; Mark Wright p9m4-05.ebuild: EAPI=5. Use python 2.7. Thanks to Ian Delaney for helping to upgrade to diff --git a/sci-mathematics/p9m4/p9m4-05-r1.ebuild b/sci-mathematics/p9m4/p9m4-05-r1.ebuild new file mode 100644 index 000000000000..da512193b7e7 --- /dev/null +++ b/sci-mathematics/p9m4/p9m4-05-r1.ebuild @@ -0,0 +1,109 @@ +# 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-r1.ebuild,v 1.1 2015/05/01 14:14:44 gienah Exp $ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 + +MY_PN="p9m4-v" +MY_P="${MY_PN}${PV}" + +DESCRIPTION="This is a Graphical User Interface for Prover9 and Mace4" +HOMEPAGE="http://www.cs.unm.edu/~mccune/mace4/" +SRC_URI="http://www.cs.unm.edu/~mccune/prover9/gui/${MY_P}.tar.gz + http://dev.gentoo.org/~gienah/2big4tree/sci-mathematics/p9m4/p9m4-v05-64bit.patch.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +RDEPEND="dev-python/wxpython:* + sci-mathematics/prover9" +DEPEND="${RDEPEND} + dev-python/setuptools" + +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" ) + +S="${WORKDIR}/${MY_P}/" + +python_check_deps() { + has_version "dev-python/foo[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-single-r1_pkg_setup +} + +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" + distutils-r1_python_prepare_all + mkdir p9m4 || die "Could not create directory p9m4" + mv Mac-setup.py \ + Win32-setup.py \ + control.py \ + files.py \ + my_setup.py \ + options.py \ + partition_input.py \ + platforms.py \ + utilities.py \ + wx_utilities.py \ + p9m4 \ + || die "Could not move package p9m4 python files to p9m4 directory" + touch p9m4/__init__.py \ + || die "Could not create empty p9m4/__init__.py file" +} + +python_install_all() { + dosym /usr/bin/prover9-mace4.py /usr/bin/prover9-mace4 + insinto /usr/share + dodir /usr/share/${PN}/Images + insinto /usr/share/${PN}/Images + cd "${S}/Images" \ + || die "Could not cd to Images" + doins *.gif *.ico + if use examples; then + dodir /usr/share/${PN}/Samples + insinto /usr/share/${PN}/Samples + cd "${S}/Samples" \ + || die "Could not cd to Samples" + doins *.in + + dodir /usr/share/${PN}/Samples/Equality/Mace4 + insinto /usr/share/${PN}/Samples/Equality/Mace4 + cd "${S}/Samples/Equality/Mace4" \ + || die "Could not cd to Samples/Equality/Mace4" + doins *.in + + dodir /usr/share/${PN}/Samples/Equality/Prover9 + insinto /usr/share/${PN}/Samples/Equality/Prover9 + cd "${S}/Samples/Equality/Prover9" \ + || die "Could not cd to Samples/Equality/Prover9" + doins *.in + + dodir /usr/share/${PN}/Samples/Non-Equality/Mace4 + insinto /usr/share/${PN}/Samples/Non-Equality/Mace4 + cd "${S}/Samples/Non-Equality/Mace4" \ + || die "Could cd to Samples/Non-Equality/Mace4" + doins *.in + + dodir /usr/share/${PN}/Samples/Non-Equality/Prover9 + insinto /usr/share/${PN}/Samples/Non-Equality/Prover9 + cd "${S}/Samples/Non-Equality/Prover9" \ + || die "Could not cd to Samples/Non-Equality/Prover9" + doins *.in + fi +} diff --git a/sci-mathematics/p9m4/p9m4-05.ebuild b/sci-mathematics/p9m4/p9m4-05.ebuild deleted file mode 100644 index 2cc8d05e6d72..000000000000 --- a/sci-mathematics/p9m4/p9m4-05.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# 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.4 2015/05/01 12:06:35 gienah Exp $ - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 - -MY_PN="p9m4-v" -MY_P="${MY_PN}${PV}" - -DESCRIPTION="This is a Graphical User Interface for Prover9 and Mace4" -HOMEPAGE="http://www.cs.unm.edu/~mccune/mace4/" -SRC_URI="http://www.cs.unm.edu/~mccune/prover9/gui/${MY_P}.tar.gz - http://dev.gentoo.org/~gienah/2big4tree/sci-mathematics/p9m4/p9m4-v05-64bit.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -RDEPEND="dev-python/wxpython:* - sci-mathematics/prover9" -DEPEND="${RDEPEND} - dev-python/setuptools" - -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" ) - -S="${WORKDIR}/${MY_P}/" - -python_check_deps() { - has_version "dev-python/foo[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -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" - distutils-r1_python_prepare_all - mkdir p9m4 || die "Could not create directory p9m4" - mv Mac-setup.py \ - Win32-setup.py \ - control.py \ - files.py \ - my_setup.py \ - options.py \ - partition_input.py \ - platforms.py \ - utilities.py \ - wx_utilities.py \ - p9m4 \ - || die "Could not move package p9m4 python files to p9m4 directory" - touch p9m4/__init__.py \ - || die "Could not create empty p9m4/__init__.py file" -} - -python_install_all() { - dosym /usr/bin/prover9-mace4.py /usr/bin/prover9-mace4 - insinto /usr/share - dodir /usr/share/${PN}/Images - insinto /usr/share/${PN}/Images - cd "${S}/Images" \ - || die "Could not cd to Images" - doins *.gif *.ico - if use examples; then - dodir /usr/share/${PN}/Samples - insinto /usr/share/${PN}/Samples - cd "${S}/Samples" \ - || die "Could not cd to Samples" - doins *.in - - dodir /usr/share/${PN}/Samples/Equality/Mace4 - insinto /usr/share/${PN}/Samples/Equality/Mace4 - cd "${S}/Samples/Equality/Mace4" \ - || die "Could not cd to Samples/Equality/Mace4" - doins *.in - - dodir /usr/share/${PN}/Samples/Equality/Prover9 - insinto /usr/share/${PN}/Samples/Equality/Prover9 - cd "${S}/Samples/Equality/Prover9" \ - || die "Could not cd to Samples/Equality/Prover9" - doins *.in - - dodir /usr/share/${PN}/Samples/Non-Equality/Mace4 - insinto /usr/share/${PN}/Samples/Non-Equality/Mace4 - cd "${S}/Samples/Non-Equality/Mace4" \ - || die "Could cd to Samples/Non-Equality/Mace4" - doins *.in - - dodir /usr/share/${PN}/Samples/Non-Equality/Prover9 - insinto /usr/share/${PN}/Samples/Non-Equality/Prover9 - cd "${S}/Samples/Non-Equality/Prover9" \ - || die "Could not cd to Samples/Non-Equality/Prover9" - doins *.in - fi -} -- cgit v1.2.3-65-gdbad