summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-12-30 19:36:35 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-12-30 19:36:35 +0000
commite51d7fc6ebce6dcef6b82c540ffef004ec1d33c7 (patch)
treecb3b32d0d25b6c75390d4c3e73c1ac3dc14b9ae3
parentVersion bump. Remove old. (diff)
downloadhistorical-e51d7fc6ebce6dcef6b82c540ffef004ec1d33c7.tar.gz
historical-e51d7fc6ebce6dcef6b82c540ffef004ec1d33c7.tar.bz2
historical-e51d7fc6ebce6dcef6b82c540ffef004ec1d33c7.zip
Make 1.2.1 not use live subversion, bump to version 1.2.2. Thanks to Justin Lecher who provided the updated ebuilds. Closes bug #282503.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
-rw-r--r--sci-chemistry/pymol/ChangeLog9
-rw-r--r--sci-chemistry/pymol/Manifest16
-rw-r--r--sci-chemistry/pymol/files/pymol-1.2.2-shaders.patch11
-rw-r--r--sci-chemistry/pymol/pymol-1.2.1.ebuild15
-rw-r--r--sci-chemistry/pymol/pymol-1.2.2.ebuild116
5 files changed, 151 insertions, 16 deletions
diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index df77c456c349..62329c6ed102 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,13 @@
# 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.46 2009/10/03 11:28:03 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.47 2009/12/30 19:36:34 flameeyes Exp $
+
+*pymol-1.2.2 (30 Dec 2009)
+
+ 30 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> pymol-1.2.1.ebuild,
+ +pymol-1.2.2.ebuild, +files/pymol-1.2.2-shaders.patch:
+ Make 1.2.1 not use live subversion, bump to version 1.2.2. Thanks to
+ Justin Lecher who provided the updated ebuilds. Closes bug #282503.
03 Oct 2009; Petteri Räty <betelgeuse@gentoo.org> -pymol-1.1-r2.ebuild:
Remove old version with built_with_use. Fixes bug #285463.
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 505daafdd7ed..6314eaf9e01c 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -11,16 +11,20 @@ AUX 1.2.1/pymol-1.2.1-shaders.patch 442 RMD160 db5ee361cd1e253b9aa012098d08eb787
AUX nosplash-gentoo.patch 332 RMD160 2280fbe9daba8a0d3ca81a3aacfcc55bd06fc7d3 SHA1 275a325f7a9bb076bea72897fd6dd5ed1b014390 SHA256 5e0761591eeea90bcaa06a72c210a80ba46f2542ff985f8dd893af112254a890
AUX pymol-0.99_rc10-data-path.patch 2969 RMD160 608e0e936fccf0860f6b5269e6739c839fcd32ea SHA1 7a3585d14431b7840eff8f6ee0a5d8324049ff77 SHA256 10c97c3d4d2f620a2884a812a6997f2cf8472f2e0c589c2630a4d0bcf67656de
AUX pymol-1.0-r1-data-path.patch 3521 RMD160 bbd8722a1f52944f122caa64642db5dc2609a208 SHA1 735871b06d8f874334ef51fe9054ae92a7fbe523 SHA256 ba0c036b1f01338b42f9e31a0252be59292726289e330f4c33cf52ee48ea9172
+AUX pymol-1.2.2-shaders.patch 441 RMD160 c0d9e177f701a015aec192b2bdf6b1df31e8de16 SHA1 5651438459920b74040330ec0b7d9ea14e63818c SHA256 c15e5c5d2a6b53b96c6a7fe0b717ac0f7d85c90aca3e5b02c8d8c34b9038cb68
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.2.tar.gz 8280622 RMD160 e1246c98843fe004e50b5158c0be204a321fc983 SHA1 0d7e564b92564fb3f3db93b8700195f360226ea7 SHA256 15cd754317fff2fc975de1d8bf521f86227eba6674120ef336b819be80b0d7d9
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.2.1.ebuild 2972 RMD160 a61a11401e174f5d5df35bbcfcc9a4d2c6861b26 SHA1 83fd221576834251430b8bb93e8a39adfd2e3268 SHA256 b7d7f5b72d0b01d07c5ff600b28fc50e9d91ed32f2192bd08d5546f16c1a6259
-MISC ChangeLog 9945 RMD160 82169206a412b5102e9c2db85d39440a85ec97d6 SHA1 1038e93640894954ee5d85ec33ab4946ea21a226 SHA256 8f62e689f3b95a7ea9e2088f693cfdec1cee117cf35257eb2d1b2641fec7e935
+EBUILD pymol-1.2.1.ebuild 2942 RMD160 5e39f0a6f57000457cf27aab171cebdfc56fd531 SHA1 725456584cc8953372620314a7eca1ae5e0f08ee SHA256 66f4ea548dd0fe9a0902297b035317aad135470feec823cfbfc9148d540b1a4c
+EBUILD pymol-1.2.2.ebuild 2951 RMD160 4e4628c0ddd8fcac6d627bb37c7013aae7fba432 SHA1 1b508fc8605b8178f2787af2b8af73f10252a788 SHA256 05df397f4c3f4de41386613a5d9b2fb465730f24473dce0b5476fb9c7ffb1274
+MISC ChangeLog 10247 RMD160 9914efb5aacf46de2aa78370d1df8e3b4b67027f SHA1 382fed70f78a95ad56bd50205a2b403fb7c4ed67 SHA256 33ed1c37e425da27c317a0ef5910e27e59bd562074a8c598712b3a65d47b9774
MISC metadata.xml 327 RMD160 d44a69d538eb2125e431b5690abeb3a2fddc425d SHA1 d65dff362b78fc32fa382ff4644e98149da0be5a SHA256 0ec76fa228418dc19e62626f28c73ce3341bce42208ea98704226f5f12cccc0c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAkrHNUkACgkQcxLzpIGCsLTh7QCdFWrAMYk6GftddghRsMp2/3O9
-j6gAn1nrmqE1V5AKZ3mkG5w5TdcN8o1F
-=afjt
+iEYEARECAAYFAks7q8cACgkQAiZjviIA2XjRugCfUJ91EVMsYlIKLSEmzvOVJE0w
+rt4AnRQO7+s2mjwKV76zWGAl0g8xWcG2
+=tz8G
-----END PGP SIGNATURE-----
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 000000000000..7d0c35d83893
--- /dev/null
+++ b/sci-chemistry/pymol/files/pymol-1.2.2-shaders.patch
@@ -0,0 +1,11 @@
+--- setup.py.old 2009-10-03 01:01:22.444881137 -0500
++++ setup.py 2009-10-03 01:01:41.580752440 -0500
+@@ -139,7 +139,7 @@
+ ("_PYMOL_FREETYPE",None),
+ ("_PYMOL_LIBPNG",None),
+ # OpenGL shaders
+-# ("_PYMOL_OPENGL_SHADERS",None),
++ ("_PYMOL_OPENGL_SHADERS",None),
+ # Numeric Python support
+ # ("_PYMOL_NUMPY",None),
+ # VMD plugin support
diff --git a/sci-chemistry/pymol/pymol-1.2.1.ebuild b/sci-chemistry/pymol/pymol-1.2.1.ebuild
index 7a0963101245..7a15340a1fcd 100644
--- a/sci-chemistry/pymol/pymol-1.2.1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.2.1.ebuild
@@ -1,10 +1,10 @@
# 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.2.1.ebuild,v 1.4 2009/09/09 21:51:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.2.1.ebuild,v 1.5 2009/12/30 19:36:34 flameeyes Exp $
EAPI="2"
-inherit distutils subversion
+inherit distutils
PYTHON_MODNAME="chempy pmg_tk pymol"
APBS_PATCH="090618"
@@ -12,8 +12,8 @@ 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 )"
-ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol@${REV}"
+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"
@@ -33,15 +33,12 @@ DEPEND="dev-python/pmw
)"
RDEPEND="${DEPEND}"
+S="${WORKDIR}"/${PN}
+
pkg_setup(){
python_version
}
-src_unpack() {
- use apbs && unpack ${A}
- subversion_src_unpack
-}
-
src_prepare() {
epatch "${FILESDIR}"/${PV}/${P}-data-path.patch \
|| die "Failed to apply data-path.patch"
diff --git a/sci-chemistry/pymol/pymol-1.2.2.ebuild b/sci-chemistry/pymol/pymol-1.2.2.ebuild
new file mode 100644
index 000000000000..671c88c9e4f9
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.2.2.ebuild
@@ -0,0 +1,116 @@
+# 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.2.2.ebuild,v 1.1 2009/12/30 19:36:34 flameeyes Exp $
+
+EAPI="2"
+
+inherit distutils
+
+PYTHON_MODNAME="chempy pmg_tk pymol"
+APBS_PATCH="090618"
+REV="3859"
+
+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
+ 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}
+
+pkg_setup(){
+ python_version
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/1.2.1/${PN}-1.2.1-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}"/1.2.1/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
+}