diff options
| author |   Justin Lecher (jlec) <jlec@j-schmitz.net> | 2010-02-01 22:52:55 +0100 |
|---|---|---|
| committer | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2010-02-01 22:53:03 +0100 |
| commit | 97c64a4c6060b0e228c74d9358f66be78cfef0a8 (patch) | |
| tree | c3322948feff9c8a902e1d63936c6151d235a91f /sci-chemistry | |
| parent | InCvs (diff) | |
| download | sci-97c64a4c6060b0e228c74d9358f66be78cfef0a8.tar.gz sci-97c64a4c6060b0e228c74d9358f66be78cfef0a8.tar.bz2 sci-97c64a4c6060b0e228c74d9358f66be78cfef0a8.zip | |
apbs plugin support now depends on sci-chemistry/pymol-apbs-plugin
(Portage version: 2.2_rc62/git/Linux x86_64)
(Signed Manifest commit)
Diffstat (limited to 'sci-chemistry')
| -rw-r--r-- | sci-chemistry/pymol/Manifest | 9 | ||||
| -rw-r--r-- | sci-chemistry/pymol/pymol-9999.ebuild | 24 |
2 files changed, 8 insertions, 25 deletions
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest index 192296107..a47fbe400 100644 --- a/sci-chemistry/pymol/Manifest +++ b/sci-chemistry/pymol/Manifest @@ -13,15 +13,14 @@ AUX pymol-1.2.2-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2 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 EBUILD pymol-0.99_rc10.ebuild 2128 RMD160 5f3df016d404f36bb7bb198e25b760448d1c7b86 SHA1 b0bfd0ba6b79b1163f3cab71c35f63f70c031076 SHA256 f05e0b871df5b0443c09eed26779218a64cd68db509bddf988d7224f5f7665c1 -EBUILD pymol-9999.ebuild 2769 RMD160 e756557378080255e66f154fe804db98621ec157 SHA1 0a2ff6e14466130fd4a5aa3e9eb774f1d7b9e1c8 SHA256 ddd4837bedcb733c1018ea03a72bd95fa7791991ba8f7ed2a031de6cbd62142d +EBUILD pymol-9999.ebuild 2308 RMD160 887bd018d1f0b58d6b8846ff2578966240e55b02 SHA1 f4b6075b0a33676c7dcf34a190f3bc7261ed689f SHA256 49763fda202b3669163d1518c2e1cdb17afe6581f36d26f3ab3a354dbd157559 MISC ChangeLog 6894 RMD160 fd17e3ae058e8eeea635043c96f22b189bd40d8e SHA1 fcaee9e0bb3a140c96062a97f675e82d14a03e34 SHA256 09a1d908a5bd994c1a714994f6a11863c63d3562b90ecddeab8a0bba68649e38 MISC metadata.xml 412 RMD160 9c33c90cdb3bc60af7dbee004b7f1cffd1b43aa6 SHA1 efd4a32d739fe54f0f464edc0843c81e9fb23437 SHA256 ee0056aa8c9e40b6da007fa8c895e15c17cb25004212b91d48dad03f6123483c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAks/gmkACgkQgAnW8HDreRYbDwCggy2aBpLpiDId4OTrgymtPM5o -G+EAn02QhNYIv8kcjBvUmXnjrT0kMUWX -=MV2d +iEYEARECAAYFAktnTTcACgkQgAnW8HDreRaI+gCeM1A9sYBUzaT6ILG8U3BG7pQN +H2QAn2S8QZP2r8qP3vae2AaP0OH3ZMp0 +=+B3K -----END PGP SIGNATURE----- diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/pymol-9999.ebuild index cd1f868e1..8be752a30 100644 --- a/sci-chemistry/pymol/pymol-9999.ebuild +++ b/sci-chemistry/pymol/pymol-9999.ebuild @@ -4,7 +4,6 @@ EAPI="2" -PYTHON_WITH_USE="tk" PYTHON_MODNAME="chempy pmg_tk pymol" APBS_PATCH="090618" @@ -14,14 +13,14 @@ ESVN_REPO_URI="https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol" 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="" LICENSE="PSF-2.2" IUSE="apbs numpy shaders vmd" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND=" +RDEPEND="dev-lang/python[tk] dev-python/numpy dev-python/pmw media-libs/freetype:2 @@ -30,6 +29,7 @@ RDEPEND=" sys-libs/zlib virtual/glut apbs? ( + sci-chemistry/pymol-apbs-plugin dev-libs/maloc sci-chemistry/apbs sci-chemistry/pdb2pqr @@ -40,11 +40,6 @@ pkg_setup(){ python_version } -src_unpack() { - use apbs && unpack ${A} - subversion_src_unpack -} - src_prepare() { epatch "${FILESDIR}"/${P}-data-path.patch || die @@ -62,12 +57,6 @@ src_prepare() { -e '/PYMOL_OPENGL_SHADERS/s:^#::g' \ -i setup.py - if use apbs; then - cp -f "${WORKDIR}"/apbs_tools.py.${APBS_PATCH} modules/pmg_tk/startup/apbs_tools.py || die - sed "s:LIBANDPYTHON:$(python_get_libdir):g" \ - -i modules/pmg_tk/startup/apbs_tools.py || die - fi - use vmd && \ sed \ -e 's:\] + 0 \* \[:] + 1 * [:g' \ @@ -96,9 +85,6 @@ src_install() { PYMOL_SCRIPTS="/usr/share/pymol/scripts" EOF - use apbs && \ - echo "APBS_PSIZE=$(python_get_sitedir)/pdb2pqr/src/psize.py" >> "${T}"/20pymol - doenvd "${T}"/20pymol || die "Failed to install env.d file." cat >> "${T}"/pymol <<- EOF @@ -116,7 +102,5 @@ src_install() { dodoc DEVELOPERS README || die "Failed to install docs." - if ! use apbs; then - rm "${D}"$(python_get_sitedir)/pmg_tk/startup/apbs_tools.py - fi + rm "${D}"$(python_get_sitedir)/pmg_tk/startup/apbs_tools.py } |