Removed unneeded version

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 9 insertions, 122 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 63f82d9301f0..f7f923cddde7 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.66 2010/06/24 18:03:26 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.67 2010/06/29 15:45:12 jlec Exp $
+
+  29 Jun 2010; Justin Lecher <jlec@gentoo.org> -pymol-1.2.1.ebuild:
+  Removed unneeded version
 
   24 Jun 2010; Christoph Mende <angelos@gentoo.org> pymol-1.2.3-r1.ebuild:
   Stable on amd64 wrt bug #309007
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 9b3e045ce3cf..497cdf0ee1d6 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 1.2.1/nosplash-gentoo.patch 485 RMD160 3b3d85ffe14a253e54c4ff89b210cf35effe7aee SHA1 627affce7ee9763e308cf6dee70b831e09bd829d SHA256 acf8ef1d53719c1b4158b0f49250e8ed7c3aa4c870ef7ce4bdbc8ec97f591e27
 AUX 1.2.1/pymol-1.2.1-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2a312 SHA1 89464b3780fc48bd239c0e0662dbd1d61665984f SHA256 c89862e631b7bb0e05426ad0550be51501380d4522820a7600708d5290e5dfa8
@@ -10,20 +10,17 @@ AUX 1.3.0-vmd.patch 1286 RMD160 3587dbf9664747de1d10ad0039773ef9451f7488 SHA1 79
 AUX pymol-0.99_rc10-data-path.patch 2969 RMD160 608e0e936fccf0860f6b5269e6739c839fcd32ea SHA1 7a3585d14431b7840eff8f6ee0a5d8324049ff77 SHA256 10c97c3d4d2f620a2884a812a6997f2cf8472f2e0c589c2630a4d0bcf67656de
 AUX pymol-1.2.2-shaders.patch 441 RMD160 c0d9e177f701a015aec192b2bdf6b1df31e8de16 SHA1 5651438459920b74040330ec0b7d9ea14e63818c SHA256 c15e5c5d2a6b53b96c6a7fe0b717ac0f7d85c90aca3e5b02c8d8c34b9038cb68
 AUX pymol-1.2.2-vmd.patch 1250 RMD160 fa5064d842099cd43e951278220b80fba170c5ec SHA1 2381931650169a841cf41fd38a1b870c0a896745 SHA256 d3688f57f32912ace20a3344dc49530a48963454dcc5a9aafe45d4b6be269525
-DIST apbs_tools.py.090618.bz2 21329 RMD160 80baed718524dfbaff2f0a3b7263fc75c55bf1d9 SHA1 e2c69bb150679f137ba7ff2cfcd0fe2da000612b SHA256 604803ed58f1827b76cbf5f3b58c35859d31c68d51481da4b37e08a1c0656d6e
-DIST pymol-1.2.1.tar.gz 8276264 RMD160 0b888ef9dfc91057077248bd388327dd9d3ff15b SHA1 2fb71dd69fbfffd2a6b2804766e410c6167be066 SHA256 f8b38fce8b56015c9e40f8af20fe69ae14b758fa2d3578a62ac9d26e97426e78
 DIST pymol-1.2.3.tar.gz 8281001 RMD160 125b4827b1ee5708ed28ac5bd8988a75b707ce4f SHA1 435dccba925298fa4865980a7139edcb8748accc SHA256 7d85e3e818ba357fa6df0db2248ef5555f84394559790e88e7003d602a20ab9f
 DIST pymol-1.3.0.tar.gz 8468105 RMD160 0681e0a2a565d4abfbf16d0d28bb2232eb9057b4 SHA1 a4f8f380e4af1e38b72f8b6e67eb0a48a6ad7131 SHA256 6810e2bc28c6fb949a10b22e1ef29851a570828b93b504d2bc4ac3eaa404b006
 EBUILD pymol-0.99_rc10.ebuild 2085 RMD160 c47fd6362393165fc29c2e04e1c3154050d88a06 SHA1 7bdab939740b72037847ff1d21b31e4639514607 SHA256 4e3f3341f9a9213c589124b32ae643eed7ffd45f26053fb4c4c1d2b3b7e6e77b
-EBUILD pymol-1.2.1.ebuild 2921 RMD160 178234afc306ba8abbace7ac39f1b37daf84749f SHA1 20ac44ca697b96c09bae976533fdbfb54ef79929 SHA256 c977a8670364df99b8f5aa1861bca6ac5509a0b55faba9e4688edcb5c3f6322e
 EBUILD pymol-1.2.3-r1.ebuild 2636 RMD160 d9c2f84d12acb2dd52fd19a8bb81224c1b905ee1 SHA1 9e7d5b585db15a7ebfba4e7728c842ffd606ac9d SHA256 a0b39dadcfd49dd9df2350c8299f8a5bd20c1aa7f65200203c92d4972fd7042f
 EBUILD pymol-1.3.0.ebuild 2563 RMD160 34376677a524735b8a66e5708d101caec3b35a2b SHA1 4c997bd42c6ef68f912d0ffc8b021471b881aa1d SHA256 4e8134840493e05f89a53efc11a88a522e88f6e7871a55064598e40223bef098
-MISC ChangeLog 13510 RMD160 f7f979dcdbb9cf80c04abf37b5c1c2633425f515 SHA1 5cebac5936ae2664f30068b121eddf009e80dad4 SHA256 28f493ed4253c8d1de804554ca22479df45d3e18700575dc64fcc499ceae8d5a
+MISC ChangeLog 13603 RMD160 c686febdae88455c8aed897636d12f02f91cda10 SHA1 b74e8e1936045ee95a6c022e9b89f8530fbb1856 SHA256 bdf9a58be633635ea7d67eed890f6c90a2e40f378998ae58ac8c8720b3931b1a
 MISC metadata.xml 494 RMD160 0aec5d84b0aaa7666af93962827613e9b4c7487b SHA1 84282f439939e0fbb2f7ec55c128a92442aa016e SHA256 22ac79b0f91926fe2e275ad46ec31994a0523fd196b3d82e8279d0f3d4250300
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF0EAREIAAYFAkwjngwACgkQmWq1bYTyC0Nb+QD8Cj3qwEgUjVUDvC+KOsZG8CLo
-zuB61hvA/v9qg2LyJcIA+KIEJXd6aqXIgc/gEJJWaRy/vwOfmK1gqhthtJh6bGc=
-=V4XE
+iEYEARECAAYFAkwqFQ0ACgkQgAnW8HDreRZ7KgCfaChoTd1D28PoPpbZh4m4ETFq
+QfMAnAkeC72MxhgZIECP55mEliuunw3E
+=1X8G
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/pymol-1.2.1.ebuild b/sci-chemistry/pymol/pymol-1.2.1.ebuild
deleted file mode 100644
index 0c97ee31cfbf..000000000000
--- a/sci-chemistry/pymol/pymol-1.2.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.2.1.ebuild,v 1.9 2010/06/15 12:54:07 arfrever Exp $
-
-EAPI="2"
-
-inherit eutils distutils
-
-PYTHON_MODNAME="chempy pmg_tk pymol"
-APBS_PATCH="090618"
-REV="3825"
-
-DESCRIPTION="A Python-extensible molecular graphics system."
-HOMEPAGE="http://pymol.sourceforge.net/"
-SRC_URI="apbs? ( mirror://gentoo/apbs_tools.py.${APBS_PATCH}.bz2 )
-	http://pymol.svn.sourceforge.net/viewvc/pymol/trunk/pymol.tar.gz?view=tar&pathrev=${REV} -> ${P}.tar.gz"
-
-LICENSE="PSF-2.2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="apbs shaders"
-
-DEPEND="dev-python/pmw
-		media-libs/freetype:2
-		dev-python/numpy
-		>=dev-lang/python-2.4[tk]
-		media-libs/libpng
-		sys-libs/zlib
-		virtual/glut
-		media-video/mpeg-tools
-		apbs? ( dev-libs/maloc
-			sci-chemistry/apbs
-			sci-chemistry/pdb2pqr
-		)"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}/${P}-data-path.patch \
-		|| die "Failed to apply data-path.patch"
-
-	# Turn off splash screen.  Please do make a project contribution
-	# if you are able though. #299020
-	epatch "${FILESDIR}"/${PV}/nosplash-gentoo.patch
-
-	# Respect CFLAGS
-	sed -i \
-		-e "s:\(ext_comp_args=\).*:\1[]:g" \
-		"${S}"/setup.py || die "Failed running sed on setup.py"
-
-	use shaders && epatch "${FILESDIR}"/${PV}/${P}-shaders.patch
-
-	if use apbs; then
-		cp -f "${WORKDIR}"/apbs_tools.py.${APBS_PATCH} modules/pmg_tk/startup/apbs_tools.py \
-			|| die "Failed to copy apbs_tools.py"
-
-		sed "s:LIBANDPYTHON:$(python_get_libdir):g" \
-			-i modules/pmg_tk/startup/apbs_tools.py \
-				|| die "Failed running sed on apbs_tools.py"
-	fi
-}
-
-src_configure() {
-	:
-}
-
-src_install() {
-	distutils_src_install
-
-	# 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=$(python_get_sitedir)/${PN}
-		PYMOL_DATA="/usr/share/pymol/data"
-		PYMOL_SCRIPTS="/usr/share/pymol/scripts"
-	EOF
-
-	if use apbs; then
-		echo "APBS_PSIZE=$(python_get_sitedir)/pdb2pqr/src/psize.py" >> "${T}"/20pymol
-	fi
-
-	doenvd "${T}"/20pymol || die "Failed to install env.d file."
-
-	cat >> "${T}"/pymol <<- EOF
-	#!/bin/sh
-	$(PYTHON) -O \${PYMOL_PATH}/__init__.py \$*
-	EOF
-
-	dobin "${T}"/pymol || die "Failed to install wrapper."
-
-	insinto /usr/share/pymol
-	doins -r test data scripts || die "no shared data"
-
-	insinto /usr/share/pymol/examples
-	doins -r examples || die "Failed to install docs."
-
-	dodoc DEVELOPERS README || die "Failed to install docs."
-
-	if ! use apbs; then
-		rm "${D}"$(python_get_sitedir)/pmg_tk/startup/apbs_tools.py
-	fi
-}
-
-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!"
-	fi
-}