Remove old version with built_with_use. Fixes bug #285463.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 10 insertions, 124 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/Manifest b/sci-chemistry/pymol/Manifest
index fcdd1dca6ca5..505daafdd7ed 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -14,14 +14,13 @@ AUX pymol-1.0-r1-data-path.patch 3521 RMD160 bbd8722a1f52944f122caa64642db5dc260
 DIST apbs_tools.py.090618.bz2 21329 RMD160 80baed718524dfbaff2f0a3b7263fc75c55bf1d9 SHA1 e2c69bb150679f137ba7ff2cfcd0fe2da000612b SHA256 604803ed58f1827b76cbf5f3b58c35859d31c68d51481da4b37e08a1c0656d6e
 EBUILD pymol-0.99_rc10.ebuild 2125 RMD160 92cb22b6566abc10a6d5f02d6b45be0316f2126d SHA1 4dfd6793fd7b1ee3bd90b12e0ed9c1ded007cb03 SHA256 3a9eb60ad0fff94a55d8614f5ade15225298a05d31efb4de0e1f0aa092d94b24
 EBUILD pymol-1.0-r1.ebuild 2114 RMD160 26354ebc9e4bf91327f0631cf415eb08989bdd89 SHA1 1bb01c6daf8a44a11670dc0c12f63bdb08c136c3 SHA256 30356fe8bc8fc8183c2b04ea7179682476c8bda5673b29f04d2107a41fc37d1d
-EBUILD pymol-1.1-r2.ebuild 3228 RMD160 043fca3d53bad75d9342f2a2fe621cc8b2717a5e SHA1 d4f55783362a9b02e35e1ce5bfe8aeb7f017086f SHA256 af621fe505490733ddbdf5bfd4c97fb69ef6c95bdefd7daa0c779d6421460449
 EBUILD pymol-1.2.1.ebuild 2972 RMD160 a61a11401e174f5d5df35bbcfcc9a4d2c6861b26 SHA1 83fd221576834251430b8bb93e8a39adfd2e3268 SHA256 b7d7f5b72d0b01d07c5ff600b28fc50e9d91ed32f2192bd08d5546f16c1a6259
-MISC ChangeLog 9806 RMD160 8a2ec00cdc198382edbaac70be9d8ef4e9ec2400 SHA1 e6da70672a25b91edf04238efa44a4ce4c92cea7 SHA256 4aa2239a773afd36b56a093f0f3338fb02fda9a8c74327cd087717a563d4dcac
+MISC ChangeLog 9945 RMD160 82169206a412b5102e9c2db85d39440a85ec97d6 SHA1 1038e93640894954ee5d85ec33ab4946ea21a226 SHA256 8f62e689f3b95a7ea9e2088f693cfdec1cee117cf35257eb2d1b2641fec7e935
 MISC metadata.xml 327 RMD160 d44a69d538eb2125e431b5690abeb3a2fddc425d SHA1 d65dff362b78fc32fa382ff4644e98149da0be5a SHA256 0ec76fa228418dc19e62626f28c73ce3341bce42208ea98704226f5f12cccc0c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqoI6wACgkQkKaRLQcq0GJunQCgq+hNMZu1j0IF+rNX7vngyA/H
-EPsAoJmKK0Y6QaauSoyPDlMwcl/EfW38
-=Cmia
+iEYEARECAAYFAkrHNUkACgkQcxLzpIGCsLTh7QCdFWrAMYk6GftddghRsMp2/3O9
+j6gAn1nrmqE1V5AKZ3mkG5w5TdcN8o1F
+=afjt
 -----END PGP SIGNATURE-----
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
-}