summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2014-01-06 09:24:09 +0000
committerJustin Lecher <jlec@gentoo.org>2014-01-06 09:24:09 +0000
commit5542e54d97505085ff6a97d95b562a1b438008c4 (patch)
tree9a05005339216259abebc71c49c463239c089d89
parentStable for amd64, wrt bug #495130 (diff)
downloadgentoo-2-5542e54d97505085ff6a97d95b562a1b438008c4.tar.gz
gentoo-2-5542e54d97505085ff6a97d95b562a1b438008c4.tar.bz2
gentoo-2-5542e54d97505085ff6a97d95b562a1b438008c4.zip
sci-chemistry/phaser: Bump to EAPI=5; punt base.eclass; Bump to python-single-r1.eclass
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
-rw-r--r--sci-chemistry/phaser/ChangeLog8
-rw-r--r--sci-chemistry/phaser/metadata.xml10
-rw-r--r--sci-chemistry/phaser/phaser-2.1.4.ebuild23
3 files changed, 19 insertions, 22 deletions
diff --git a/sci-chemistry/phaser/ChangeLog b/sci-chemistry/phaser/ChangeLog
index 92c4cd890989..10b8eaa06e5d 100644
--- a/sci-chemistry/phaser/ChangeLog
+++ b/sci-chemistry/phaser/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-chemistry/phaser
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/phaser/ChangeLog,v 1.3 2012/02/05 01:54:57 floppym Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/phaser/ChangeLog,v 1.4 2014/01/06 09:24:09 jlec Exp $
+
+ 06 Jan 2014; Justin Lecher <jlec@gentoo.org> phaser-2.1.4.ebuild,
+ metadata.xml:
+ Bump to EAPI=5; punt base.eclass; Bump to python-single-r1.eclass
05 Feb 2012; Mike Gilbert <floppym@gentoo.org> phaser-2.1.4.ebuild:
Inherit toolchain-funcs.
diff --git a/sci-chemistry/phaser/metadata.xml b/sci-chemistry/phaser/metadata.xml
index a8b9bb335c1f..6b4826474daa 100644
--- a/sci-chemistry/phaser/metadata.xml
+++ b/sci-chemistry/phaser/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci-chemistry</herd>
-<maintainer>
- <email>jlec@gentoo.org</email>
- <description>ccp4 maintainer</description>
-</maintainer>
+ <herd>sci-chemistry</herd>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <description>ccp4 maintainer</description>
+ </maintainer>
</pkgmetadata>
diff --git a/sci-chemistry/phaser/phaser-2.1.4.ebuild b/sci-chemistry/phaser/phaser-2.1.4.ebuild
index af46085a9b40..5ed5ffeb5f20 100644
--- a/sci-chemistry/phaser/phaser-2.1.4.ebuild
+++ b/sci-chemistry/phaser/phaser-2.1.4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/phaser/phaser-2.1.4.ebuild,v 1.3 2012/02/05 01:54:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/phaser/phaser-2.1.4.ebuild,v 1.4 2014/01/06 09:24:09 jlec Exp $
-EAPI="3"
+EAPI=5
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} )
-inherit base flag-o-matic python toolchain-funcs
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
CCP4VER="6.1.13"
@@ -26,17 +26,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}"/ccp4-${CCP4VER}
-PATCHES=(
- "${FILESDIR}"/phaser-2.1.4-chmod.patch
- "${FILESDIR}"/phaser-2.1.4-ldflags.patch
- )
-
-pkg_setup() {
- python_set_active_version 2
-}
-
src_prepare() {
- base_src_prepare
+ epatch \
+ "${FILESDIR}"/phaser-2.1.4-chmod.patch \
+ "${FILESDIR}"/phaser-2.1.4-ldflags.patch
use openmp && append-flags -fopenmp