sci-chemistry/phaser: Bump to EAPI=5; punt base.eclass; Bump to python-single-r1.eclass

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 39 insertions, 32 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/Manifest b/sci-chemistry/phaser/Manifest
index 9509ee3669a4..40d8341509a9 100644
--- a/sci-chemistry/phaser/Manifest
+++ b/sci-chemistry/phaser/Manifest
@@ -1,15 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX phaser-2.1.4-chmod.patch 555 RMD160 97aac303973819050a02e7513f7d5b05edf0b4ce SHA1 6e3514e29e68f3e82797655edaeeb08e5d103dae SHA256 7dbdf50a096448283400e5026b5e3366420e7d124f8a4f85396604bb43d7a3be
-DIST ccp4-6.1.13-phaser-cctbx-src.tar.gz 22021353 RMD160 7523142c284815d407da9ae99b8ca122f8bcb25c SHA1 4f56b3fd9b44eb4a88af9f00527a2739cb3c62a0 SHA256 e6c4365cb34da5ce2dd5f1e74b8927258064016194446163418c8a3139a4b804
-EBUILD phaser-2.1.4.ebuild 2874 RMD160 ddb587691f6124723a16c8fac9b608ccbb73f54b SHA1 d425587471ed363958e1934b8e503124bfa07b7c SHA256 d7729ea8f86dfcefb385c328f627184c3eb84124b8691c877b293cc5741703f2
-MISC ChangeLog 609 RMD160 c86daab0a0d3613fed741a1fedd5b4a02a1f6ce7 SHA1 fd2ca74af273291f930cb43046e4b4c722b037d1 SHA256 03a806c3f4fc05fb674cfafc87c3f0116e6e069fa4d78f3b2612cfd4547a2f96
-MISC metadata.xml 271 RMD160 01bd4ef03b089d27912fb9792acabe9956e1ac3c SHA1 fb5066a043cf309639867de4c0d7b46431ad001f SHA256 65b510392c8aed9615cf63cb1058bdc36c66ef5334f15dffb94ca0f9fe475078
+AUX phaser-2.1.4-chmod.patch 555 SHA256 7dbdf50a096448283400e5026b5e3366420e7d124f8a4f85396604bb43d7a3be SHA512 edf2783df5f059cefe541e280bb9c76070860113c2af4307f9e9aa5a7e8022af1433087075150d89f04f253e1cece4f14d996ab7c0f7850121d441307d7e5a59 WHIRLPOOL 556f9dd00f3d65c6619c595afae99b150c2858d09ac2cdd361bfafa09f9b0ffb2540ac1edfb6bbbced98df153c1218ada813b330eefd10b64a9dd4f30a7ef843
+DIST ccp4-6.1.13-phaser-cctbx-src.tar.gz 22021353 SHA256 e6c4365cb34da5ce2dd5f1e74b8927258064016194446163418c8a3139a4b804
+EBUILD phaser-2.1.4.ebuild 2833 SHA256 da7ba7269073a20ba380a580e68c29fb831c4bc4b6474e65362ec414fe23017b SHA512 4c037c17711778de62a72e0c340317e55ef474abe9c6ad45b0cb355d24b24df5752d5bc5418245d2c03d65a6a342efd209f1effe6121f97df2e693a18a9ddd63 WHIRLPOOL 9ff14c618e7d615de4c95f33fafd970cb654a6a910736453229372c0e89f8d9867aec0b1340b959e112049f65e665a1d72cf7cfc3172b138879a7fe58a370c65
+MISC ChangeLog 759 SHA256 093ba46c45351e31dd7c32f84e1977eb0e9708f447ccc4c0fa9b0583c25219d6 SHA512 63dd240e5c6b7a200b9e754b0d5df3745b56b18073949a7bed4f3c4d3ed2004f060aac1e09aa901615b2c35df38757b4647db01f6c1da817ec9e2b0c3b762b85 WHIRLPOOL d85b5076b3f2ac169be1be8361df2d4f69bbd53ceaccaf0fc380232fab7f38f31b01da5332988df4d45aa256e079fedef846fba32d98fdc197efc598f2700612
+MISC metadata.xml 281 SHA256 b5d58acfcc9f50683cec12f8f33f99fb4d9ef8c97ba0b9eed87cb4732c990b9f SHA512 3a4fbe0a32175f77aab9429712c26ddae44453143d5eba0cfbe52f6f06b2ef2f6a9af8d9a530807498ac8dd62cb6e87226f8b47b2a94e95c63d4df067f51f678 WHIRLPOOL 3ec0b5c8672b45b08a686451ef0501bed5cb40dc335573188bc35c849ebe388c97640d9b6692d297c71a7fba8e4d7ce5b2863a94c933fb42cb1e36ab71aadc23
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAk8t4XcACgkQC77qH+pIQ6S+xQD9FjGTlLYr3XNqbHZZ8kVk1APY
-4KkVF7kpMCIjB6BQOm4BAKwp1k7gZBYNxSVSh5oSLk/HSaS87dKH8tW2TIf8iGKx
-=zsvv
+iQIcBAEBCgAGBQJSynY6AAoJELnU8jG9FVirh0MP/inkkAsg9CxrpTBUwg6s+Y4W
+ThYdBSsaWAnMbWLBFrmAZ/bbAY/iL3X1k9xyE0xMI5zQNCb/pJ7WdK2GhIkMWZQJ
+eO70hr5Y/1nnJ0EEb12Mko0kMR4kkk7xLSdcYYGyVX77SZHWKsm5YyJw/5v3lSFv
+vgvpHYBD590jaH72CxuQAxYZXCZq7LxlFkThgcNsmfmpdKV33LaWlZEq86asR7Dz
+8+XFoPBg/oVfkqla1/osSHoMB1AH+Z2Fyytcc97nkiFICSzAR33F62e0yFV3bL4f
+O/lcIBoymIrEZWlS93po0hTO6nzfTfj6kr4GbRe28Ey7EiJG2qjVdNmamU/yhIk5
+3XeF7jt94eYSsDKbL3GEL7Lc4MZFi6TyN3/YMhKKgzkyaokED85bJP6K9PdDpw+B
+3cb2MekQ8txPd+/Qrj0330Dw1PrmMSqGLqj7PodnsSPpShWbn+t+yPfOG2j1vbkT
+OMtjdNv/ii4seG5+r421DS4t/7/XSnaFeE4vjbhYoKG92ioLMw4YAOGkxz6ydvXk
+k4bjm9l/VG7YzImYC7caoeKHmBetrsrzzKj83kzCypft6rmRB8BkjRCH4d0KVLq6
+eGYHv9muX08SsremNaKbJyK7gBcYimdws0PfEUtMwumAuFMOUSsx+CPrABUI1F2m
+bOBaOGZipzzfnq8tCoUn
+=+c9Q
 -----END PGP SIGNATURE-----
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