[gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/

["Justin Lecher" <jlec@gentoo.org>]

commit:     2099a249aacb0660adfd2b7beec86425305b4ddf
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 16:42:06 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 16:42:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2099a249

sci-chemistry/phenix-bin: Version BUmp

Package-Manager: portage-2.2.0_alpha166

---
 sci-chemistry/phenix-bin/ChangeLog                 |    6 ++++
 ....1.1168.ebuild => phenix-bin-1.8.2.1309.ebuild} |   28 +++++---------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index 5aa78cd..1d99115 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*phenix-bin-1.8.2.1309 (11 Mar 2013)
+
+  11 Mar 2013; Justin Lecher <jlec@gentoo.org> -phenix-bin-1.8.1.1168.ebuild,
+  +phenix-bin-1.8.2.1309.ebuild:
+  Version BUmp
+
   17 Jan 2013; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1.1168.ebuild,
   metadata.xml:
   Add new dep on libtinfo.so

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
similarity index 82%
rename from sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
rename to sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
index 8646157..628ed97 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit python versionator
+inherit python-single-r1 versionator
 
 MY_PV="$(replace_version_separator 3 -)"
 MY_P="phenix-installer-${MY_PV}"
@@ -14,7 +14,7 @@ MY_P="phenix-installer-${MY_PV}"
 DESCRIPTION="Python-based Hierarchical ENvironment for Integrated Xtallography"
 HOMEPAGE="http://phenix-online.org/"
 SRC_URI="
-	amd64? ( phenix-installer-${MY_PV}-intel-linux-2.6-x86_64-fc15.tar )
+	amd64? ( phenix-installer-${MY_PV}-intel-linux-2.6-x86_64-fc12.tar )
 	x86? ( phenix-installer-${MY_PV}-intel-linux-2.6-fc3.tar )
 "
 
@@ -72,23 +72,15 @@ pkg_nofetch() {
 	elog "http://www.phenix-online.org/phenix_request/index.cgi"
 	elog "and request a download password. With that done,"
 	elog "visit http://www.phenix-online.org/download/phenix/release"
-	elog "and download version \"Kernel 2.6 (64-bit; Fedora 15)\" (${A})"
+	elog "and download version \"Kernel 2.6 (64-bit; Fedora 12)\" (${A})"
 	elog "into ${DISTDIR}"
 }
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
 	./install --prefix="${S}/foo"
-
 }
 
 src_install() {
-#	find -name "*.py[co]" -delete
-#	find -name SConstruct -delete
 	sed \
 		-e "s:${S}/foo:${EPREFIX}/opt:g" \
 		-i \
@@ -100,7 +92,6 @@ src_install() {
 			foo/phenix-${MY_PV}/build/intel-linux-2.6-*/base/etc/{gtk*,pango}/* \
 			foo/phenix-${MY_PV}/phenix_env* \
 			|| die
-#	grep ${S} * -R
 	dodir /opt
 	mv "${S}/foo/phenix-${MY_PV}" "${ED}/opt/"
 
@@ -111,12 +102,7 @@ src_install() {
 	exec phenix
 	EOF
 	dobin phenix
-}
-
-pkg_postinst() {
-	python_mod_optimize "/opt/phenix-${MY_PV}"
-}
 
-pkg_postrm() {
-	python_mod_cleanup "/opt/phenix-${MY_PV}"
+	python_fix_shebang "${ED}"/opt
+	python_optimize "${ED}"/opt
 }