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

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

commit:     b80d9ec04bf5d1fbddafa1c5b5d824f373d4d967
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 14 08:15:04 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 08:21:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b80d9ec0

sci-chemistry/pymol: Fix for latest HEAD; fix SLOT operators

Package-Manager: portage-2.2.18

 sci-chemistry/pymol/ChangeLog         |  6 ++++--
 sci-chemistry/pymol/pymol-9999.ebuild | 10 ++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 2f4a843..3a25bf8 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-chemistry/pymol
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Mar 2015; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild:
+  sci-chemistry/pymol: Fix for latest HEAD; fix SLOT operators
+
   05 Nov 2014; Justin Lecher <jlec@gentoo.org> pymol-9999.ebuild,
   -files/pymol-9999-listing.patch, -files/pymol-9999-options.patch,
   -files/pymol-9999-tk8.6.patch:
@@ -371,4 +374,3 @@
   +sci-chemistry/pymol/files/nosplash-gentoo.patch,
   +sci-chemistry/pymol/metadata.xml:
   Initial checkin of pymol to sci-overlay
-

diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild
index 56c62a8..8d8cf8e 100644
--- a/sci-chemistry/pymol/pymol-9999.ebuild
+++ b/sci-chemistry/pymol/pymol-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk"
 
-inherit distutils-r1 fdo-mime subversion versionator
+inherit distutils-r1 fdo-mime flag-o-matic subversion versionator
 
 DESCRIPTION="A Python-extensible molecular graphics system"
 HOMEPAGE="http://www.pymol.org/"
@@ -21,11 +21,11 @@ IUSE="apbs web"
 
 DEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pmw[${PYTHON_USEDEP}]
+	dev-python/pmw:0[${PYTHON_USEDEP}]
 	dev-python/pyopengl[${PYTHON_USEDEP}]
 	media-libs/freetype:2
 	media-libs/glew
-	media-libs/libpng
+	media-libs/libpng:0=
 	media-video/mpeg-tools
 	sys-libs/zlib
 	media-libs/freeglut
@@ -54,6 +54,8 @@ python_prepare_all() {
 		-e '/ext_comp_args/s:\[.*\]:[]:g' \
 		-i setup.py || die
 
+	append-cxxflags -std=c++0x
+
 	distutils-r1_python_prepare_all
 }