Remove old version with built_with_use. Fixes bug #285463.

(Portage version: 2.2_rc40/cvs/Linux i686)

2 files changed, 6 insertions, 119 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index f7363f1afe32..df77c456c349 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.45 2009/09/09 21:51:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.46 2009/10/03 11:28:03 betelgeuse Exp $
+
+  03 Oct 2009; Petteri Räty <betelgeuse@gentoo.org> -pymol-1.1-r2.ebuild:
+  Remove old version with built_with_use. Fixes bug #285463.
 
   09 Sep 2009; Markus Meier <maekke@gentoo.org> pymol-1.2.1.ebuild:
   amd64/x86 stable, bug #283639
@@ -250,12 +253,12 @@
   new version, (#13531)
   removed -funroll-loops from CFLAGS
 
-*pymol-0.82 (17 July 2002)
+*pymol-0.82 (17 Jul 2002)
 
   19 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> pymol-0.82.ebuild :
   Updated to mirror://sourceforge in SRC_URI.
 
-  17 July 2002; George Shapovalov <george@gentoo.org> pymol-0.82.ebuild, files/digest-pymol-0.82, ChangeLog :
+  17 Jul 2002; George Shapovalov <george@gentoo.org> pymol-0.82.ebuild, files/digest-pymol-0.82, ChangeLog :
 
   Inital release,
   molecular visualization package
diff --git a/sci-chemistry/pymol/pymol-1.1-r2.ebuild b/sci-chemistry/pymol/pymol-1.1-r2.ebuild
deleted file mode 100644
index 25afa64e87ae..000000000000
--- a/sci-chemistry/pymol/pymol-1.1-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.1-r2.ebuild,v 1.3 2009/05/06 21:06:39 maekke Exp $
-
-NEED_PYTHON=2.4
-PYTHON_MODNAME="chempy pmg_tk pymol"
-
-inherit distutils eutils multilib subversion
-
-ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/branches/b11/pymol"
-# ESVN_UPDATE_CMD="svn -r 3395 update"
-
-DESCRIPTION="A Python-extensible molecular graphics system."
-HOMEPAGE="http://pymol.sourceforge.net/"
-
-LICENSE="PSF-2.2"
-IUSE="apbs shaders"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/pmw
-	dev-lang/tk
-	media-libs/libpng
-	sys-libs/zlib
-	virtual/glut
-	apbs? ( dev-libs/maloc
-		sci-chemistry/apbs
-		sci-chemistry/pdb2pqr
-	)"
-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
-}
-
-src_unpack() {
-	subversion_src_unpack
-
-	python_version
-
-	epatch "${FILESDIR}"/${PV}/${PF}-data-path.patch
-
-	# Turn off splash screen.  Please do make a project contribution
-	# if you are able though.
-	[[ -z "$WANT_SPLASH" ]] && epatch "${FILESDIR}"/${PV}/nosplash-gentoo.patch
-
-	# Respect CFLAGS
-	sed -i \
-		-e "s:\(ext_comp_args=\).*:\1[]:g" \
-		"${S}"/setup.py
-
-	if use shaders; then
-		epatch "${FILESDIR}"/${PV}/${PF}-shaders.patch
-	fi
-
-	if use apbs; then
-		epatch "${FILESDIR}"/${PV}/apbs-070604.patch.bz2
-		sed "s:LIBANDPYTHON:$(get_libdir)/python${PYVER}:g" \
-			-i modules/pmg_tk/startup/apbs_tools.py || die
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	cd "${S}"
-
-	#The following three lines probably do not do their jobs and should be
-	#changed
-	PYTHONPATH="${D}/usr/$(get_libdir)/python${PYVER}/site-packages" ${python} setup2.py
-
-	# These environment variables should not go in the wrapper script, or else
-	# it will be impossible to use the PyMOL libraries from Python.
-	cat >> "${T}"/20pymol <<- EOF
-	PYMOL_PATH=/usr/$(get_libdir)/python${PYVER}/site-packages/pymol
-	PYMOL_DATA="/usr/share/pymol/data"
-	PYMOL_SCRIPTS="/usr/share/pymol/scripts"
-	EOF
-
-	doenvd "${T}"/20pymol || die "Failed to install env.d file."
-
-	# Make our own wrapper
-	cat >> "${T}"/pymol <<- EOF
-	#!/bin/sh
-	${python} -O \${PYMOL_PATH}/__init__.py \$*
-	EOF
-
-	if ! use apbs; then
-		rm "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pmg_tk/startup/apbs_tools.py
-	fi
-
-	exeinto /usr/bin
-	doexe "${T}"/pymol || die "Failed to install wrapper."
-	dodoc DEVELOPERS || die "Failed to install docs."
-
-	mv examples "${D}"/usr/share/doc/${PF}/ || die "Failed moving docs."
-
-	dodir /usr/share/pymol
-	mv test "${D}"/usr/share/pymol/ || die "Failed moving test files."
-	mv data "${D}"/usr/share/pymol/ || die "Failed moving data files."
-	mv scripts "${D}"/usr/share/pymol/ || die "Failed moving scripts."
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	if use apbs; then
-		[[ -e /usr/share/apbs-0.5* ]] && \
-		ewarn "You need to reemerge sci-chemistry/apbs!"
-	fi
-}