From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RzUGS-0003dh-5F for garchives@archives.gentoo.org; Mon, 20 Feb 2012 14:30:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60264E0BFA; Mon, 20 Feb 2012 14:30:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1F043E0BF7 for ; Mon, 20 Feb 2012 14:30:35 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2658E1B4011 for ; Mon, 20 Feb 2012 14:30:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DBAEBE5405 for ; Mon, 20 Feb 2012 14:30:31 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1329657514.729c8534f774efc7b0124e16ab8766096093498c.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol/, sci-chemistry/pymol/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/pymol/ChangeLog sci-chemistry/pymol/files/pymol-9999-prefix.patch sci-chemistry/pymol/files/pymol-9999-web.patch sci-chemistry/pymol/pymol-9999.ebuild X-VCS-Directories: sci-chemistry/pymol/ sci-chemistry/pymol/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 729c8534f774efc7b0124e16ab8766096093498c X-VCS-Branch: master Date: Mon, 20 Feb 2012 14:30:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 06747c9f-e6b2-4f3b-9bc4-9896fbbf1631 X-Archives-Hash: e549e5d286435b749bb384af91c0be75 commit: 729c8534f774efc7b0124e16ab8766096093498c Author: Justin Lecher gentoo org> AuthorDate: Sun Feb 19 13:18:34 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sun Feb 19 13:18:34 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D729c8534 Fix for current HEAD, correct desktop entry generation (Portage version: 2.2.0_alpha87/git/Linux x86_64, unsigned Manifest commi= t) --- sci-chemistry/pymol/ChangeLog | 24 +++++++ sci-chemistry/pymol/files/pymol-9999-prefix.patch | 70 ++++++++++++---= ----- sci-chemistry/pymol/files/pymol-9999-web.patch | 19 +++--- sci-chemistry/pymol/pymol-9999.ebuild | 25 +++++-- 4 files changed, 92 insertions(+), 46 deletions(-) diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLo= g index 8b2e581..0f6860d 100644 --- a/sci-chemistry/pymol/ChangeLog +++ b/sci-chemistry/pymol/ChangeLog @@ -2,6 +2,30 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 19 Feb 2012; Justin Lecher pymol-9999.ebuild, + files/pymol-9999-prefix.patch, files/pymol-9999-web.patch: + Fix for current HEAD, correct desktop entry generation + + 19 Feb 2012; Justin Lecher pymol-9999.ebuild, + files/pymol-9999-prefix.patch, files/pymol-9999-web.patch: + Fix for current HEAD, correct desktop entry generation + + 19 Feb 2012; Justin Lecher pymol-9999.ebuild, + files/pymol-9999-prefix.patch, files/pymol-9999-web.patch: + Version Bump, correct desktop entry generation + + 19 Feb 2012; Justin Lecher pymol-9999.ebuild, + files/pymol-9999-prefix.patch, files/pymol-9999-web.patch: + Add icon to desktop file + + 19 Feb 2012; Justin Lecher pymol-9999.ebuild, + files/pymol-9999-prefix.patch, files/pymol-9999-web.patch: + Add desktop entry + + 19 Feb 2012; Justin Lecher files/pymol-9999-prefix.p= atch, + files/pymol-9999-web.patch: + Fix for latest head + 13 Feb 2012; Justin Lecher -files/1.3.0-vmd.patch, -files/pymol-0.99_rc10-data-path.patch, -files/pymol-1.2.2-shaders.pat= ch, pymol-9999.ebuild, +files/pymol-9999-flags.patch, -files/9999-vmd.patc= h, diff --git a/sci-chemistry/pymol/files/pymol-9999-prefix.patch b/sci-chem= istry/pymol/files/pymol-9999-prefix.patch index 830eb8f..9b0bad3 100644 --- a/sci-chemistry/pymol/files/pymol-9999-prefix.patch +++ b/sci-chemistry/pymol/files/pymol-9999-prefix.patch @@ -1,43 +1,57 @@ - setup.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index ce0d271..2b6fa35 100755 ---- a/setup.py -+++ b/setup.py -@@ -104,7 +104,7 @@ elif sys.platform=3D=3D'darwin': - inc_dirs=3D["ov/src", - "layer0","layer1","layer2", - "layer3","layer4","layer5",=20 -- "/usr/X11R6/include", -+ "@GENTOO_PORTAGE_EPREFIX@/usr/include", - EXT+"/include", - EXT+"/include/GL", - EXT+"/include/freetype2", -@@ -120,7 +120,7 @@ elif sys.platform=3D=3D'darwin': - ] +Index: setup.py +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- setup.py (revision 3983) ++++ setup.py (working copy) +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/env python + # + # This script only applies if you are performing a Python Distutils-bas= ed + # installation of PyMOL. +@@ -35,7 +35,7 @@ + "modules/cealign/src/tnt" ] + libs=3D["glut32","opengl32","glu32","png"] + pyogl_libs =3D ["glut32","opengl32","glu32"] +- lib_dirs=3D["/usr/lib/w32api"] ++ lib_dirs=3D["@GENTOO_PORTAGE_EPREFIX@/usr/lib/w32api"] + def_macros=3D[("_PYMOL_MODULE",None), + ("CYGWIN",None), + ("_PYMOL_LIBPNG",None)] +@@ -87,7 +87,7 @@ + "/sw/include/freetype2/freetype", + "/sw/include/freetype2", + "/sw/include", +- "/usr/X11/include", ++ "@GENTOO_PORTAGE_EPREFIX@/usr/X11/include", + "modules/cealign/src", + "modules/cealign/src/tnt", + #"contrib/uiuc/plugins/include/", +@@ -114,8 +114,8 @@ ext_comp_args=3D[] ext_link_args=3D[ -- "-L/usr/X11R6/lib64", "-lGL", "-lXxf86vm", -+ "-L@GENTOO_PORTAGE_EPREFIX@/usr/lib64", "-lGL", "-lXxf86vm"= , - "-L"+EXT+"/lib", "-lpng", "-lglut", "-lfreetype" - ] - #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D -@@ -159,7 +159,7 @@ else: # linux or other unix + "-L/sw/lib", "-lpng", +- "/usr/X11/lib/libGL.dylib", +- "/usr/X11/lib/libGLU.dylib", ++ "@GENTOO_PORTAGE_EPREFIX@/usr/X11/lib/libGL.dyli= b", ++ "@GENTOO_PORTAGE_EPREFIX@/usr/X11/lib/libGLU.dyl= ib", + "-lfreeglut", + "-lglew", + "-L/sw/lib/freetype219/lib", "-lfreetype" +@@ -221,7 +221,7 @@ "layer3", "layer4", "layer5", - "/usr/include/freetype2", + "@GENTOO_PORTAGE_EPREFIX@/usr/include/freetype2", # VMD plugin support - "contrib/uiuc/plugins/include", - "contrib/uiuc/plugins/molfile_plugin/src", -@@ -180,7 +180,7 @@ else: # linux or other unix + # "contrib/uiuc/plugins/include", + # "contrib/uiuc/plugins/molfile_plugin/src", +@@ -242,7 +242,7 @@ "GLU", "glut", "GLEW"] - lib_dirs =3D [ "/usr/X11R6/lib64", ] -+ lib_dirs =3D [ "@GENTOO_PORTAGE_EPREFIX@/usr/lib64", ] ++ lib_dirs =3D [ "@GENTOO_PORTAGE_EPREFIX@/usr/X11R6/lib64", ] def_macros =3D [ ("_PYMOL_MODULE",None), ("_PYMOL_INLINE",None), ("_PYMOL_FREETYPE",None), diff --git a/sci-chemistry/pymol/files/pymol-9999-web.patch b/sci-chemist= ry/pymol/files/pymol-9999-web.patch index fe61f02..4f48140 100644 --- a/sci-chemistry/pymol/files/pymol-9999-web.patch +++ b/sci-chemistry/pymol/files/pymol-9999-web.patch @@ -1,19 +1,16 @@ - setup.py | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index 18866a2..366d552 100755 ---- a/setup.py -+++ b/setup.py -@@ -229,10 +229,7 @@ distribution =3D setup ( # Distribution meta-data - 'pymol/opengl/gl', +Index: setup.py +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--- setup.py (revision 3983) ++++ setup.py (working copy) +@@ -292,10 +292,7 @@ 'pymol/opengl/glu', 'pymol/opengl/glut', -- 'pymol/wizard', + 'pymol/wizard', +- 'pymol2', - 'web', - 'web/examples', - 'web/javascript', ], -+ 'pymol/wizard', ], ++ 'pymol2', ], ext_modules =3D [ Extension("pymol._cmd", [ "modules/cealign/src/ccealignmodule.cpp", diff --git a/sci-chemistry/pymol/pymol-9999.ebuild b/sci-chemistry/pymol/= pymol-9999.ebuild index 908c7fc..1671842 100644 --- a/sci-chemistry/pymol/pymol-9999.ebuild +++ b/sci-chemistry/pymol/pymol-9999.ebuild @@ -10,11 +10,11 @@ RESTRICT_PYTHON_ABIS=3D"2.4 2.5 2.6 3.*" PYTHON_USE_WITH=3D"tk" PYTHON_MODNAME=3D"${PN} chempy pmg_tk pmg_wx" =20 -inherit distutils eutils prefix subversion versionator +inherit distutils eutils fdo-mime prefix subversion versionator =20 DESCRIPTION=3D"A Python-extensible molecular graphics system." HOMEPAGE=3D"http://pymol.sourceforge.net/" -SRC_URI=3D"" +SRC_URI=3D"http://dev.gentoo.org/~jlec/distfiles/${PN}.xpm.tar" ESVN_REPO_URI=3D"https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/p= ymol" =20 LICENSE=3D"PSF-2.2" @@ -40,6 +40,11 @@ DEPEND=3D" web? ( !dev-python/webpy )" RDEPEND=3D"${DEPEND}" =20 +src_unpack() { + unpack ${A} + subversion_src_unpack +} + src_prepare() { epatch \ "${FILESDIR}"/${P}-setup.py.patch \ @@ -51,10 +56,6 @@ src_prepare() { epatch "${FILESDIR}"/${P}-prefix.patch && \ eprefixify setup.py =20 - # Turn off splash screen. Please do make a project contribution - # if you are able though. #299020 - epatch "${FILESDIR}"/${P}-nosplash.patch - use vmd && epatch "${FILESDIR}"/${P}-vmd.patch =20 if use numpy; then @@ -91,7 +92,7 @@ src_install() { =20 cat >> "${T}"/pymol <<- EOF #!/bin/sh - $(PYTHON -f) -O \${PYMOL_PATH}/__init__.py \$* + $(PYTHON -f) -O \${PYMOL_PATH}/__init__.py -q \$* EOF =20 dobin "${T}"/pymol @@ -103,6 +104,9 @@ src_install() { doins -r examples =20 dodoc DEVELOPERS README + + doicon "${WORKDIR}"/${PN}.xpm + make_desktop_entry pymol PyMol ${PN} "Graphics;Science;Chemistry" } =20 pkg_postinst() { @@ -110,4 +114,11 @@ pkg_postinst() { elog "please use pymol config settings" elog "\t set use_shaders, 1" distutils_pkg_postinst + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update }