pymol bump to 1.2.2

9 files changed, 70 insertions, 41 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 737f24cda..87d4d79af 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -2,6 +2,24 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Oct 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +files/1.2.2/nosplash-gentoo.patch, -pymol-1.2.0.ebuild,
+  -files/pymol-1.2.0-data-path.patch, -files/pymol-1.2.0-shaders.patch,
+  -files/pymol-1.2.1-data-path.patch, -files/pymol-1.2.1-shaders.patch,
+  +pymol-1.2.2.ebuild, +files/1.2.2/pymol-1.2.2-data-path.patch,
+  +files/pymol-1.2.2-data-path.patch,
+  +files/1.2.2/pymol-1.2.2-shaders.patch, +files/pymol-1.2.2-shaders.patch:
+  clean up old stuff
+
+*pymol-1.2.2 (02 Oct 2009)
+
+  02 Oct 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +files/1.2.2/nosplash-gentoo.patch, +pymol-1.2.2.ebuild,
+  +files/1.2.2/pymol-1.2.2-data-path.patch,
+  +files/pymol-1.2.2-data-path.patch,
+  +files/1.2.2/pymol-1.2.2-shaders.patch, +files/pymol-1.2.2-shaders.patch:
+  version bump
+
 *pymol-1.2.1-r1 (24 Aug 2009)
 
   24 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 8c1c79f68..3d8ea58d7 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,17 +1,19 @@
 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
 AUX 1.2.1/pymol-1.2.1-shaders.patch 442 RMD160 db5ee361cd1e253b9aa012098d08eb7873d95da3 SHA1 881d25514bc744d6f12b5f30bfa1709ed45dba05 SHA256 48042a9baf28c35a55204f646f14eddcf5093e17f518d7de2ffc50cbb7914dda
+AUX 1.2.2/nosplash-gentoo.patch 485 RMD160 3b3d85ffe14a253e54c4ff89b210cf35effe7aee SHA1 627affce7ee9763e308cf6dee70b831e09bd829d SHA256 acf8ef1d53719c1b4158b0f49250e8ed7c3aa4c870ef7ce4bdbc8ec97f591e27
+AUX 1.2.2/pymol-1.2.2-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2a312 SHA1 89464b3780fc48bd239c0e0662dbd1d61665984f SHA256 c89862e631b7bb0e05426ad0550be51501380d4522820a7600708d5290e5dfa8
+AUX 1.2.2/pymol-1.2.2-shaders.patch 442 RMD160 db5ee361cd1e253b9aa012098d08eb7873d95da3 SHA1 881d25514bc744d6f12b5f30bfa1709ed45dba05 SHA256 48042a9baf28c35a55204f646f14eddcf5093e17f518d7de2ffc50cbb7914dda
 AUX nosplash-gentoo.patch 485 RMD160 3b3d85ffe14a253e54c4ff89b210cf35effe7aee SHA1 627affce7ee9763e308cf6dee70b831e09bd829d SHA256 acf8ef1d53719c1b4158b0f49250e8ed7c3aa4c870ef7ce4bdbc8ec97f591e27
-AUX pymol-1.2.0-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2a312 SHA1 89464b3780fc48bd239c0e0662dbd1d61665984f SHA256 c89862e631b7bb0e05426ad0550be51501380d4522820a7600708d5290e5dfa8
-AUX pymol-1.2.0-shaders.patch 524 RMD160 07d83746617fba941bba8ad95d889e22e5310c9a SHA1 2cbbd82a91029d7c540535c83b0f2663e58a891e SHA256 96b1e2b30c7d6699d87a9efb5cab242db66683f71bfd58bbc69f87ce4df397e0
-AUX pymol-1.2.1-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2a312 SHA1 89464b3780fc48bd239c0e0662dbd1d61665984f SHA256 c89862e631b7bb0e05426ad0550be51501380d4522820a7600708d5290e5dfa8
-AUX pymol-1.2.1-shaders.patch 442 RMD160 db5ee361cd1e253b9aa012098d08eb7873d95da3 SHA1 881d25514bc744d6f12b5f30bfa1709ed45dba05 SHA256 48042a9baf28c35a55204f646f14eddcf5093e17f518d7de2ffc50cbb7914dda
+AUX pymol-1.2.2-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2a312 SHA1 89464b3780fc48bd239c0e0662dbd1d61665984f SHA256 c89862e631b7bb0e05426ad0550be51501380d4522820a7600708d5290e5dfa8
+AUX pymol-1.2.2-shaders.patch 442 RMD160 db5ee361cd1e253b9aa012098d08eb7873d95da3 SHA1 881d25514bc744d6f12b5f30bfa1709ed45dba05 SHA256 48042a9baf28c35a55204f646f14eddcf5093e17f518d7de2ffc50cbb7914dda
 AUX pymol-9999-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2a312 SHA1 89464b3780fc48bd239c0e0662dbd1d61665984f SHA256 c89862e631b7bb0e05426ad0550be51501380d4522820a7600708d5290e5dfa8
 AUX pymol-9999-shaders.patch 524 RMD160 07d83746617fba941bba8ad95d889e22e5310c9a SHA1 2cbbd82a91029d7c540535c83b0f2663e58a891e SHA256 96b1e2b30c7d6699d87a9efb5cab242db66683f71bfd58bbc69f87ce4df397e0
 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
-EBUILD pymol-1.2.0.ebuild 2726 RMD160 e4fbf3696379427d95b88e1631748c0a7ef2deff SHA1 d79acbbc0a5a8602330c3735cdc7311ff3a94f77 SHA256 4a97a8c7da7056d19a9a1ab8ec58b5311b6868d5267c793fc9e6b782d6f9f5e0
+DIST pymol-1.2.2.tar.gz 8280622 RMD160 e1246c98843fe004e50b5158c0be204a321fc983 SHA1 0d7e564b92564fb3f3db93b8700195f360226ea7 SHA256 15cd754317fff2fc975de1d8bf521f86227eba6674120ef336b819be80b0d7d9
 EBUILD pymol-1.2.1-r1.ebuild 2853 RMD160 52f6cfd723b6c641d56b91415e3d9c864fe30914 SHA1 454d659a2efdb76132541d9483238618180fe00a SHA256 6130c4ec3082a6235d4d54aa4bf104b95d7129a4e06f6b76577671ae29f6495e
+EBUILD pymol-1.2.2.ebuild 2853 RMD160 a1ed58df5d32ffc0cae65b5daedd8290d4bce112 SHA1 c86b9d79c2ca6fcc0ed84b204f749cabeba44e1a SHA256 9e40a955023862bb493dceb2ef05cc14b75ad9e10f39bcaa0da01062c996bb44
 EBUILD pymol-9999.ebuild 2981 RMD160 1d609dd649eadf68293340adb19c3b05b206e5f5 SHA1 b161cc3344f98660cb18e7a97621cf311c297d5f SHA256 3b315033850b04249d94a211b0c5105fcd76f1b938688a44f2e9a274d808f3f9
-MISC ChangeLog 5600 RMD160 756ad80c0250aa0dec71de25039c8820ce12263f SHA1 a936993504eeea76fc37eb4e4e93af34a050781c SHA256 ec76908ab6bde7d495c1619bf097f076a89c3457d6487493840c04335fefa00d
+MISC ChangeLog 6379 RMD160 274e2b66def036321a832f929fabb8c0fb1c8f95 SHA1 5d09b241daad1799bf489287d86a7fc4f0fa6259 SHA256 0f4837871662865fd547668436b97ead361ad3848b7328b118563bcb9e1de4f7
 MISC metadata.xml 412 RMD160 9c33c90cdb3bc60af7dbee004b7f1cffd1b43aa6 SHA1 efd4a32d739fe54f0f464edc0843c81e9fb23437 SHA256 ee0056aa8c9e40b6da007fa8c895e15c17cb25004212b91d48dad03f6123483c
diff --git a/sci-chemistry/pymol/files/1.2.2/nosplash-gentoo.patch b/sci-chemistry/pymol/files/1.2.2/nosplash-gentoo.patch
new file mode 100644
index 000000000..3125b2856
--- /dev/null
+++ b/sci-chemistry/pymol/files/1.2.2/nosplash-gentoo.patch
@@ -0,0 +1,9 @@
+--- modules/pymol/invocation.py	2009-06-25 17:26:27.000000000 +0200
++++ modules/pymol/invocation.py.new	2009-06-25 17:41:57.000000000 +0200
+@@ -395,6 +395,4 @@
+         if loaded_something and (options.after_load_script!=""):
+             options.deferred.append(options.after_load_script)
+         options.deferred.extend(final_actions)
+-        if options.show_splash and not options.no_gui and not restricted:
+-            options.deferred.insert(0,"_do__ cmd.splash(1)")
+         
diff --git a/sci-chemistry/pymol/files/pymol-1.2.0-data-path.patch b/sci-chemistry/pymol/files/1.2.2/pymol-1.2.2-data-path.patch
index 86c3fe1f1..86c3fe1f1 100644
--- a/sci-chemistry/pymol/files/pymol-1.2.0-data-path.patch
+++ b/sci-chemistry/pymol/files/1.2.2/pymol-1.2.2-data-path.patch
diff --git a/sci-chemistry/pymol/files/pymol-1.2.1-shaders.patch b/sci-chemistry/pymol/files/1.2.2/pymol-1.2.2-shaders.patch
index 06f756823..06f756823 100644
--- a/sci-chemistry/pymol/files/pymol-1.2.1-shaders.patch
+++ b/sci-chemistry/pymol/files/1.2.2/pymol-1.2.2-shaders.patch
diff --git a/sci-chemistry/pymol/files/pymol-1.2.0-shaders.patch b/sci-chemistry/pymol/files/pymol-1.2.0-shaders.patch
deleted file mode 100644
index 7f4a24f48..000000000
--- a/sci-chemistry/pymol/files/pymol-1.2.0-shaders.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uarN pymol-9999.orig/setup.py pymol-9999/setup.py
---- pymol-9999.orig/setup.py	2008-06-18 11:47:58.000000000 +0200
-+++ pymol-9999/setup.py	2008-06-18 11:48:52.000000000 +0200
-@@ -143,6 +143,7 @@
-     def_macros=[("_PYMOL_MODULE",None),
-                     ("_PYMOL_INLINE",None),
-                     ("_PYMOL_FREETYPE",None),
-+                    ("_PYMOL_OPENGL_SHADERS",None),
- # Numeric Python support                    
- #                        ("_PYMOL_NUMPY",None),
- # VMD plugin support                    
diff --git a/sci-chemistry/pymol/files/pymol-1.2.1-data-path.patch b/sci-chemistry/pymol/files/pymol-1.2.2-data-path.patch
index 86c3fe1f1..86c3fe1f1 100644
--- a/sci-chemistry/pymol/files/pymol-1.2.1-data-path.patch
+++ b/sci-chemistry/pymol/files/pymol-1.2.2-data-path.patch
diff --git a/sci-chemistry/pymol/files/pymol-1.2.2-shaders.patch b/sci-chemistry/pymol/files/pymol-1.2.2-shaders.patch
new file mode 100644
index 000000000..06f756823
--- /dev/null
+++ b/sci-chemistry/pymol/files/pymol-1.2.2-shaders.patch
@@ -0,0 +1,10 @@
+--- pymol-1.2_rc1/setup.py.old  2009-07-17 00:05:10.339203020 -0500
++++ pymol-1.2_rc1/setup.py      2009-07-17 00:09:03.375274561 -0500
+@@ -138,6 +138,7 @@
+                 ("_PYMOL_INLINE",None),
+                 ("_PYMOL_FREETYPE",None),
+                 ("_PYMOL_LIBPNG",None),
++                ("_PYMOL_OPENGL_SHADERS",None),
+ # Numeric Python support                    
+ #                ("_PYMOL_NUMPY",None),
+ # VMD plugin support   
diff --git a/sci-chemistry/pymol/pymol-1.2.0.ebuild b/sci-chemistry/pymol/pymol-1.2.2.ebuild
index 5b872e771..1e9b05ec1 100644
--- a/sci-chemistry/pymol/pymol-1.2.0.ebuild
+++ b/sci-chemistry/pymol/pymol-1.2.2.ebuild
@@ -4,24 +4,23 @@
 
 EAPI="2"
 
+inherit distutils #subversion
+
 PYTHON_MODNAME="chempy pmg_tk pymol"
 APBS_PATCH="090618"
-REV="3790"
-
-inherit distutils subversion
-
-ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol@${REV}"
+REV="3859"
 
 DESCRIPTION="A Python-extensible molecular graphics system."
 HOMEPAGE="http://pymol.sourceforge.net/"
-SRC_URI="apbs? ( http://dev.gentooexperimental.org/~jlec/distfiles/apbs_tools.py.${APBS_PATCH}.bz2 )"
+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"
-IUSE="apbs shaders"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="apbs shaders"
 
-RDEPEND="dev-python/pmw
+DEPEND="dev-python/pmw
 		dev-python/numpy
 		>=dev-lang/python-2.4[tk]
 		media-libs/libpng
@@ -29,38 +28,39 @@ RDEPEND="dev-python/pmw
 		virtual/glut
 		media-video/mpeg-tools
 		apbs? ( dev-libs/maloc
-				sci-chemistry/apbs
-				sci-chemistry/pdb2pqr
+			sci-chemistry/apbs
+			sci-chemistry/pdb2pqr
 		)"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}
 
 pkg_setup(){
 	python_version
 }
 
-src_unpack() {
-	use apbs && unpack ${A}
-	subversion_src_unpack
-}
-
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-data-path.patch || die
+	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.
-	[[ -n ${WANT_SPLASH} ]] || epatch "${FILESDIR}"/nosplash-gentoo.patch
+	[[ -n ${WANT_SPLASH} ]] || epatch "${FILESDIR}"/${PV}/nosplash-gentoo.patch
 
 	# Respect CFLAGS
 	sed -i \
 		-e "s:\(ext_comp_args=\).*:\1[]:g" \
-		"${S}"/setup.py
+		"${S}"/setup.py || die "Failed running sed on setup.py"
 
-	use shaders && epatch "${FILESDIR}"/${P}-shaders.patch
+	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
+		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
+			-i modules/pmg_tk/startup/apbs_tools.py \
+				|| die "Failed running sed on apbs_tools.py"
 	fi
 }
 
@@ -79,8 +79,9 @@ src_install() {
 		PYMOL_SCRIPTS="/usr/share/pymol/scripts"
 	EOF
 
-	use apbs && \
-	echo "APBS_PSIZE=$(python_get_sitedir)/pdb2pqr/src/psize.py" >> "${T}"/20pymol
+	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."