sci-chemistry/modeller: Version BUmp; BUmp to EAPI5 and distutils-r1.eclass

Package-Manager: portage-2.2.0_alpha180

4 files changed, 51 insertions, 55 deletions

diff --git a/sci-chemistry/modeller/ChangeLog b/sci-chemistry/modeller/ChangeLog
index 17fea516e..198256b1f 100644
--- a/sci-chemistry/modeller/ChangeLog
+++ b/sci-chemistry/modeller/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-chemistry/modeller
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Jun 2013; Justin Lecher <jlec@gentoo.org> -modeller-9.8.ebuild,
+  +modeller-9.12.ebuild, metadata.xml:
+  Version BUmp; BUmp to EAPI5 and distutils-r1.eclass
+
 *modeller-9.8 (16 Jun 2010)
 
   16 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/9v5-setup.patch,
diff --git a/sci-chemistry/modeller/Manifest b/sci-chemistry/modeller/Manifest
index f3078a1c8..a5b04d5c2 100644
--- a/sci-chemistry/modeller/Manifest
+++ b/sci-chemistry/modeller/Manifest
@@ -1 +1 @@
-DIST modeller-9v8.tar.gz 51539572 SHA256 3d5c629f97a2b89722fe5b7414ad97b0361799714db0323536df45f55b2777c7
+DIST modeller-9.12.tar.gz 29273842 SHA256 65051f7f1682cf7dcf77f0bc4d68f1ee5b64789f750e9aa6900e1cc92dc4e1f9 SHA512 5c0acaf453771347a9de3a0c7240f7ce376244803748edb28923dbaefda779041211ef4b26af5a2774bdf6bc63d7c7d7e62e1354e1550a6742c9575076864352 WHIRLPOOL a363efdd2bba8db8268774745f32b1e8e6a9d88e6a6154ce00c7be65861fc834ef1a804fa9f0575d2af2ff1211728aacf8408d28319df68b14f3a3598d55c307
diff --git a/sci-chemistry/modeller/metadata.xml b/sci-chemistry/modeller/metadata.xml
index 9ac9ffdb3..51fdedab1 100644
--- a/sci-chemistry/modeller/metadata.xml
+++ b/sci-chemistry/modeller/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+  <herd>sci-chemistry</herd>
 </pkgmetadata>
diff --git a/sci-chemistry/modeller/modeller-9.8.ebuild b/sci-chemistry/modeller/modeller-9.12.ebuild
index b0c24c18c..0cabf476a 100644
--- a/sci-chemistry/modeller/modeller-9.8.ebuild
+++ b/sci-chemistry/modeller/modeller-9.12.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI=5
 
-PYTHON_DEPEND="2:2.6"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit distutils eutils versionator
-
-MY_PV="$(replace_all_version_separators v)"
-MY_P="${PN}-${MY_PV}"
+inherit distutils-r1 eutils versionator
 
 DESCRIPTION="Homology or comparative modeling of protein three-dimensional structures"
-SRC_URI="http://salilab.org/${PN}/${MY_PV}/${PN}-${MY_PV}.tar.gz"
 HOMEPAGE="http://salilab.org/modeller/"
+SRC_URI="http://salilab.org/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="modeller"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
@@ -25,82 +23,77 @@ RESTRICT="mirror"
 DEPEND=">=dev-lang/swig-1.3"
 RDEPEND=""
 
-S="${WORKDIR}/${MY_P}"
-
 INPATH="${EPREFIX}"/opt/modeller${ver}
 
-QA_TEXTRELS="${INPATH#/}/*"
-QA_EXECSTACK="${INPATH#/}/*"
-QA_PRESTRIPPED="${INPATH#/}/bin/.* ${INPATH#/}/lib/*/.*"
-QA_DT_HASH="
-	${INPATH#/}/bin/.*
-	${INPATH#/}/lib/*/.*"
+QA_PREBUILT="/opt/*"
 
-pkg_setup() {
-	python_set_active_version 2
+DISTUTILS_NO_PARALLEL_BUILD=true
 
+pkg_setup() {
 	case ${ARCH} in
-		x86)	EXECTYPE="i386-intel8";;
-		amd64)	EXECTYPE="x86_64-intel8";;
-		*)		ewarn "Your arch "${ARCH}" does not appear supported at this time."||\
-				die "Unsupported Arch";;
+		x86)
+			EXECTYPE="i386-intel8";;
+		amd64)
+			EXECTYPE="x86_64-intel8";;
+		*)
+			die "Your arch "${ARCH}" does not appear supported at this time.";;
 	esac
 }
 
-src_prepare(){
+python_prepare_all(){
 	sed "s:i386-intel8:${EXECTYPE}:g" -i src/swig/setup.py || die
 }
 
-src_compile(){
+python_compile(){
+	cd src/swig
+	swig -python -keyword -nodefaultctor -nodefaultdtor -noproxy modeller.i || die
+	distutils-r1_python_compile
+}
+
+python_install() {
 	cd src/swig
-	swig -python -keyword -nodefaultctor -nodefaultdtor -noproxy modeller.i
-	distutils_src_compile
+	distutils-r1_python_install
 }
 
-src_install(){
+python_install_all(){
+	cd "${S}"
 	sed \
-		-e "s:EXECUTABLE_TYPE${MY_PV}=xxx:EXECUTABLE_TYPE${MY_PV}=${EXECTYPE}:g" \
-		-e "s:MODINSTALL${MY_PV}=xxx:MODINSTALL${MY_PV}=\"${INPATH}\":g" \
-		bin/modscript > "${T}/mod${MY_PV}"
+		-e "/^EXECUTABLE_TYPE/s:xxx:${EXECTYPE}:g" \
+		-e "/MODINSTALL/s:xxx:\"${INPATH}\":g" \
+		-i bin/modscript || die
 
 	sed -e "s;@TOPDIR\@;\"${INPATH}\";" \
 		-e "s;@EXETYPE\@;${EXECTYPE};" \
 		bin/modpy.sh.in > "${T}/modpy.sh"
 
 	insinto ${INPATH}
-	doins -r modlib || die
+	doins -r modlib
+	python_foreach_impl python_domodule modlib/modeller
 
 	insinto ${INPATH}/bin
-	doins -r bin/{lib,*top} || die
+	doins -r bin/{lib,*top}
+
 	exeinto ${INPATH}/bin
-	doexe bin/{modslave.py,mod${MY_PV}_${EXECTYPE}} || die
-	doexe "${T}/mod${MY_PV}" || die
-	doexe "${T}/modpy.sh" || die
-	dosym ${INPATH}/bin/mod${MY_PV} /opt/bin/mod${MY_PV} || die
-	dosym ${INPATH}/bin/modpy.sh /opt/bin/modpy.sh || die
+	doexe bin/{modscript,mod${PV}_${EXECTYPE}} "${T}"/modpy.sh
+
+	python_foreach_impl python_doscript bin/modslave.py
+	dosym ${INPATH}/bin/modscript /opt/bin/mod${PV}
+	dosym ${INPATH}/bin/modpy.sh /opt/bin/modpy.sh
 
 	exeinto ${INPATH}/lib/${EXECTYPE}/
-	doexe lib/${EXECTYPE}/lib* || die
-	dosym libmodeller.so.5 ${INPATH}/lib/${EXECTYPE}/libmodeller.so || die
-	doexe src/swig/build/lib.linux-$(uname -m)-$(python_get_version)/_modeller.so || die
+	doexe lib/${EXECTYPE}/lib*
+	dosym libmodeller.so.5 ${INPATH}/lib/${EXECTYPE}/libmodeller.so
+
+	use doc && HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
 
-	dodoc README INSTALLATION || die
-	if use doc; then
-		dohtml doc/* || die
-	fi
 	if use examples; then
 		insinto /usr/share/${PN}/
-		doins -r examples || die
+		doins -r examples
 	fi
-
-	dosym ${INPATH}/lib/${EXECTYPE}/_modeller.so \
-		  $(python_get_sitedir)/_modeller.so || die
-	dosym _modeller.so $(python_get_sitedir)/modeller.so || die
 }
 
 pkg_postinst() {
-	python_mod_optimize "${INPATH}/"
-
 	if [[ ! -e "${INPATH}/modlib/modeller/config.py" ]]; then
 		echo install_dir = \"${INPATH}/\"> ${INPATH}/modlib/modeller/config.py
 	fi
@@ -117,7 +110,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup "${INPATH}/"
 	ewarn "This package leaves a license Key file in ${INPATH}/modlib/modeller/config.py"
 	ewarn "that you need to remove to completely get rid of modeller."
 }