[gentoo-commits] proj/sci:master commit in: sci-libs/msms/

[Justin Lecher]

commit:     8a16404bfab9ae8b69510c81bb52ec4f334e7415
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 10:58:22 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 10:58:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8a16404b

sci-libs/msms: Version BUmp; Bump to new distutil-r1.eclass

Package-Manager: portage-2.2.0_alpha186

---
 sci-libs/msms/ChangeLog                            | 10 +++-
 sci-libs/msms/metadata.xml                         |  2 +-
 sci-libs/msms/msms-1.5.4-r1.ebuild                 | 54 ----------------------
 .../{msms-1.5.6_rc2.ebuild => msms-1.5.6.ebuild}   | 19 ++++----
 4 files changed, 19 insertions(+), 66 deletions(-)

diff --git a/sci-libs/msms/ChangeLog b/sci-libs/msms/ChangeLog
index 1622441..1246097 100644
--- a/sci-libs/msms/ChangeLog
+++ b/sci-libs/msms/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for sci-libs/msms
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Jun 2013; Justin Lecher <jlec@g.o> -msms-1.5.4-r1.ebuild,
+  -msms-1.5.6_rc2.ebuild, +msms-1.5.6.ebuild, metadata.xml:
+  Version BUmp; Bump to new distutil-r1.eclass
+
+  30 Jun 2013; Justin Lecher <jlec@g.o> -msms-1.5.4-r1.ebuild,
+  -msms-1.5.6_rc2.ebuild, +msms-1.5.6.ebuild, metadata.xml:
+  Version BUmp; Bump to new distutil-r1.eclass
+
   27 Apr 2012; Justin Lecher <jlec@g.o> msms-1.5.4-r1.ebuild,
   msms-1.5.6_rc2.ebuild:
   RESTRICT pypy

diff --git a/sci-libs/msms/metadata.xml b/sci-libs/msms/metadata.xml
index 9ac9ffd..51fdeda 100644
--- a/sci-libs/msms/metadata.xml
+++ b/sci-libs/msms/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-libs/msms/msms-1.5.4-r1.ebuild b/sci-libs/msms/msms-1.5.4-r1.ebuild
deleted file mode 100644
index ccbf5d9..0000000
--- a/sci-libs/msms/msms-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
-
-inherit distutils eutils
-
-MY_PN="mslib"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MSMS library python extension module"
-HOMEPAGE="http://mgltools.scripps.edu/downloads#msms"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
-
-LICENSE="MGLTOOLS"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-lang/swig"
-
-RESTRICT_PYTHON_ABIS="3.*"
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	tar xzpf "${DISTDIR}"/${A} mgltools_source_${PV}/MGLPACKS/${MY_P}.tar.gz
-	tar xzpf mgltools_source_${PV}/MGLPACKS/${MY_P}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/build-with-linux-3.0.patch
-	pushd "${S}"/lib >/dev/null
-	# Set up symlinks for 3.x kernels
-	for x in *inux2; do
-		ln -s ${x} ${x%2}3
-	done
-	popd >/dev/null
-}
-
-pkg_postinst() {
-	python_mod_optimize ${MY_PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MY_PN}
-}

diff --git a/sci-libs/msms/msms-1.5.6_rc2.ebuild b/sci-libs/msms/msms-1.5.6.ebuild
similarity index 61%
rename from sci-libs/msms/msms-1.5.6_rc2.ebuild
rename to sci-libs/msms/msms-1.5.6.ebuild
index a6e6a6d..4ccd4a4 100644
--- a/sci-libs/msms/msms-1.5.6_rc2.ebuild
+++ b/sci-libs/msms/msms-1.5.6.ebuild
@@ -1,22 +1,19 @@
-# Copyright 1999-2012 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"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit distutils eutils
+inherit distutils-r1
 
 MY_PN="mslib"
 MY_P="${MY_PN}-${PV/_rc2/}"
 
 DESCRIPTION="MSMS library python extension module"
 HOMEPAGE="http://mgltools.scripps.edu/downloads#msms"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
 LICENSE="MGLTOOLS"
 SLOT="0"
@@ -29,13 +26,15 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
+PATCHES=( "${FILESDIR}"/build-with-linux-3.0.patch )
+
 src_unpack() {
 	tar xzpf "${DISTDIR}"/${A} mgltools_source_${PV/_/}/MGLPACKS/${MY_P}.tar.gz
 	tar xzpf mgltools_source_${PV/_/}/MGLPACKS/${MY_P}.tar.gz
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/build-with-linux-3.0.patch
+python_prepare_all() {
+	distutils-r1_python_prepare_all
 	pushd "${S}"/lib >/dev/null
 	# Set up symlinks for 3.x kernels
 	for x in *inux2; do