6 files changed, 85 insertions, 49 deletions
diff --git a/sci-libs/pymmlib/ChangeLog b/sci-libs/pymmlib/ChangeLog
index 3888e15..9146535 100644
--- a/sci-libs/pymmlib/ChangeLog
+++ b/sci-libs/pymmlib/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for sci-libs/pymmlib
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pymmlib/ChangeLog,v 1.13 2007/07/22 07:01:45 dberkholz Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pymmlib/ChangeLog,v 1.22 2011/06/26 10:22:51 jlec Exp $
+
+  26 Jun 2011; Justin Lecher <jlec@gentoo.org> pymmlib-1.0.0-r1.ebuild,
+  metadata.xml:
+  Straight out QA issues
+
+  11 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> pymmlib-1.0.0-r1.ebuild:
+  ppc stable wrt #321873, drop old.
+
+  16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> pymmlib-0.9.8.ebuild,
+  pymmlib-1.0.0.ebuild, pymmlib-1.0.0-r1.ebuild:
+  virtual/glut -> media-libs/glut
+
+  28 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  pymmlib-1.0.0-r1.ebuild:
+  x86 stable wrt bug #321873
+
+  26 Jun 2010; Christoph Mende <angelos@gentoo.org> pymmlib-1.0.0-r1.ebuild:
+  Stable on amd64 wrt bug #321873
+
+  15 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pymmlib-0.9.8.ebuild:
+  Delete call to deprecated python_version().
+
+*pymmlib-1.0.0-r1 (25 Apr 2010)
+
+  25 Apr 2010; Justin Lecher <jlec@gentoo.org> +pymmlib-1.0.0-r1.ebuild:
+  Python ABI fixes, #316227
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org> pymmlib-0.9.7.ebuild,
+  pymmlib-0.9.8.ebuild, pymmlib-1.0.0.ebuild:
+  python_mod_optimize is ROOT aware. Multilib love. Quoting.
+
+*pymmlib-1.0.0 (13 Mar 2008)
+
+  13 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +pymmlib-1.0.0.ebuild:
+  (#186123) Bump, and keyword ~amd64.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; pymmlib-0.9.7.ebuild,
   pymmlib-0.9.8.ebuild:
diff --git a/sci-libs/pymmlib/Manifest b/sci-libs/pymmlib/Manifest
index f6f304d..1a04bd9 100644
--- a/sci-libs/pymmlib/Manifest
+++ b/sci-libs/pymmlib/Manifest
@@ -1,4 +1,4 @@
-DIST pymmlib-1.0.0.tar.gz 10827016 RMD160 a3e55ed3ea38d832dd54565790563238eca919c3 SHA1 7d17c591b31b508aa3ae7c1964c1248fdaf5a44c SHA256 0520a96ae8de3db998eead409cd6d5d68d8a50006dbf65c1acb9205651218747
-EBUILD pymmlib-1.0.0.ebuild 1284 RMD160 7a16f57fb572a10f469e16643637db7141e372ad SHA1 3f54b81384aae7baa224023141ca3ec8bd6e81c9 SHA256 385b75c37fa07cdabeea112dad7659814a7a3808c46b4325c9d52e9c28f78045
-MISC ChangeLog 2326 RMD160 e840a7edd50741b69b3bcc1e552ec4150216b4ac SHA1 350353b6ea1419f36b915f342e92fc5962f46b70 SHA256 8acaa8761e4a0646c1a6ec9de5ddfbffe7f40b2f643d626807c0ff60b0aae1f6
-MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+DIST pymmlib-1.2.0.tar.gz 11744675 RMD160 f91c23c95df5cc6e430f6533ab9b69ecbcf85a88 SHA1 8d1e8380f707eb0d4acde0cd53cdcd72bdc503f1 SHA256 6396ae26ef4d6e877fac614d9b5b2fb02e3f2e14728321f1d56ffed4563dcd3e
+EBUILD pymmlib-1.2.0.ebuild 1019 RMD160 012ae113b6f08821c8d023e0a6a065d208b45645 SHA1 860f8724936a3addddf15213d016fec1207edf0e SHA256 513b10a7701fec9b7f2994213205ea9a4805998a2e957d68e0db9314155be712
+MISC ChangeLog 3542 RMD160 9df33ec19513fe8c7be5665ed2795eed40e9992c SHA1 0ebff50147dbc3536ec54bb248ccc0cafa3b3ed4 SHA256 349df0e28c6e17fd8cd01323ba3f9f45a9364bef4740383cdf3ea08f7ac0145c
+MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
diff --git a/sci-libs/pymmlib/files/digest-pymmlib-1.0.0 b/sci-libs/pymmlib/files/digest-pymmlib-1.0.0
deleted file mode 100644
index 1d5a54f..0000000
--- a/sci-libs/pymmlib/files/digest-pymmlib-1.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d887ed345669fb0b9f92e080f7f548bb pymmlib-1.0.0.tar.gz 10827016
-RMD160 a3e55ed3ea38d832dd54565790563238eca919c3 pymmlib-1.0.0.tar.gz 10827016
-SHA256 0520a96ae8de3db998eead409cd6d5d68d8a50006dbf65c1acb9205651218747 pymmlib-1.0.0.tar.gz 10827016
diff --git a/sci-libs/pymmlib/metadata.xml b/sci-libs/pymmlib/metadata.xml
index 9ac9ffd..e42d0af 100644
--- a/sci-libs/pymmlib/metadata.xml
+++ b/sci-libs/pymmlib/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/pymmlib/pymmlib-1.0.0.ebuild b/sci-libs/pymmlib/pymmlib-1.0.0.ebuild
deleted file mode 100644
index d598a56..0000000
--- a/sci-libs/pymmlib/pymmlib-1.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pymmlib/pymmlib-0.9.8.ebuild,v 1.6 2007/07/22 07:01:45 dberkholz Exp $
-
-inherit multilib distutils
-
-DESCRIPTION="Software toolkit and library of routines for the analysis and manipulation of macromolecular structural models"
-HOMEPAGE="http://pymmlib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pymmlib/${P}.tar.gz"
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-RDEPEND="virtual/glut
-	dev-python/pygtkglext
-	>=dev-python/numpy-0.9.8
-	virtual/opengl
-	virtual/glu
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	python setup.py install --prefix="${D}/usr" || die "install failed"
-	dobin ${S}/applications/* ${S}/examples/*
-	dodoc ${S}/README.txt
-	dohtml -r ${S}/doc
-
-	# numpy >= 0.9.8 moved lost of numpy.linalg methods to numpy.linalg.old
-#	local b="numpy.linalg"
-#	ebegin "Updating for numpy >= 0.9.8"
-#	find ${D} -name '*.py' \
-#	| xargs sed -i \
-#		-e "s:\(${b}.\)\(determinant\):\1old.\2:g" \
-#		-e "s:\(${b}.\)\(eigenvalues\):\1old.\2:g" \
-#		-e "s:\(${b}.\)\(eigenvectors\):\1old.\2:g" \
-#		-e "s:\(${b}.\)\(inverse\):\1old.\2:g" \
-#		-e "s:\(import numpy\):\1\nimport numpy.linalg.old:g"
-#	eend $?
-}
diff --git a/sci-libs/pymmlib/pymmlib-1.2.0.ebuild b/sci-libs/pymmlib/pymmlib-1.2.0.ebuild
new file mode 100644
index 0000000..1b48550
--- /dev/null
+++ b/sci-libs/pymmlib/pymmlib-1.2.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pymmlib/pymmlib-1.0.0-r1.ebuild,v 1.8 2011/06/26 10:22:51 jlec Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils multilib
+
+DESCRIPTION="Toolkit and library for the analysis and manipulation of macromolecular structural models"
+HOMEPAGE="http://pymmlib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy
+	dev-python/pygtkglext
+	media-libs/freeglut
+	virtual/glu
+	virtual/opengl
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	python_convert_shebangs -r $(python_get_version -f) "${S}"/applications/ "${S}"/examples/
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+	dobin "${S}"/applications/*py "${S}"/examples/*py || die
+	dodoc "${S}"/README.txt || die
+	dohtml -r "${S}"/doc || die
+}