[patch] branch from upstream

pymol-1.1-r1.ebuild.diff (text/plain), 1.59 KB, created by Justin Lecher (RETIRED) on 2008-07-15 11:55:13 UTC

--- /usr/portage/local/layman/science/sci-chemistry/pymol/pymol-1.1-r1.ebuild	2008-07-06 09:42:15.000000000 +0200
+++ /usr/portage/local/private-overlay-dev/ebuilds/sci-chemistry/pymol/pymol-1.1-r2.ebuild	2008-07-15 13:46:48.000000000 +0200
@@ -5,10 +5,9 @@
 NEED_PYTHON=2.4
 PYTHON_MODNAME="chempy pmg_tk pymol"
 
-inherit distutils eutils multilib subversion
+inherit distutils multilib subversion
 
-ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol"
-ESVN_UPDATE_CMD="svn -r 3395 update"
+ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/branches/b11/pymol"
 
 DESCRIPTION="A Python-extensible molecular graphics system."
 HOMEPAGE="http://pymol.sourceforge.net/"
@@ -30,21 +29,14 @@
 	)"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	if ! built_with_use dev-lang/python tk; then
-		eerror "Please reemerge dev-lang/python with 'tk' support or pymol will"
-		eerror "not work. In order to fix this, execute the following:"
-		eerror "echo \"dev-lang/python tk\" >> /etc/portage/package.use"
-		eerror "and reemerge dev-lang/python before emerging pymol."
-		die "requires dev-lang/python with use-flag 'tk'!!"
-	fi
+pkg_setup(){
+	python_tkinter_exists
+	python_version
 }
 
 src_unpack() {
 	subversion_src_unpack
 
-	python_version
-
 	epatch "${FILESDIR}"/${PF}-data-path.patch
 
 	# Turn off splash screen.  Please do make a project contribution
@@ -110,6 +102,7 @@
 pkg_postinst() {
 	distutils_pkg_postinst
 
+	# The apbs ebuild was just corrected and not bumped #213616
 	if use apbs; then
 		[[ -e /usr/share/apbs-0.5* ]] && \
 		ewarn "You need to reemerge sci-chemistry/apbs!"