From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EBE351381F3 for ; Sun, 16 Jun 2013 15:53:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7074FE0955; Sun, 16 Jun 2013 15:53:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CC011E0955 for ; Sun, 16 Jun 2013 15:53:48 +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 BC9BF33E049 for ; Sun, 16 Jun 2013 15:53:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 739C4E5465 for ; Sun, 16 Jun 2013 15:53:45 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1371394956.9757e5d545af0aa563e1538e1c1ab0f824439adc.jlec@gentoo> Subject: [gentoo-commits] proj/sci:fixing commit in: sci-chemistry/pymol-apbs-plugin/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/pymol-apbs-plugin/ChangeLog sci-chemistry/pymol-apbs-plugin/metadata.xml sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild X-VCS-Directories: sci-chemistry/pymol-apbs-plugin/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 9757e5d545af0aa563e1538e1c1ab0f824439adc X-VCS-Branch: fixing Date: Sun, 16 Jun 2013 15:53:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c7c2936f-3750-4199-b3c3-a26c3ef60a8e X-Archives-Hash: 2f73685547b931b05adb707371d95caf commit: 9757e5d545af0aa563e1538e1c1ab0f824439adc Author: Justin Lecher gentoo org> AuthorDate: Sun Jun 16 15:02:36 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sun Jun 16 15:02:36 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9757e5d5 sci-chemistry/pymol-apbs-plugin: Bump to EAPI=5 and bump to python-r1.eclass Package-Manager: portage-2.2.0_alpha180 --- sci-chemistry/pymol-apbs-plugin/ChangeLog | 6 ++- sci-chemistry/pymol-apbs-plugin/metadata.xml | 8 ++-- .../pymol-apbs-plugin-9999.ebuild | 53 ++++++++-------------- 3 files changed, 28 insertions(+), 39 deletions(-) diff --git a/sci-chemistry/pymol-apbs-plugin/ChangeLog b/sci-chemistry/pymol-apbs-plugin/ChangeLog index deaec99..a0ef0cd 100644 --- a/sci-chemistry/pymol-apbs-plugin/ChangeLog +++ b/sci-chemistry/pymol-apbs-plugin/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sci-chemistry/pymol-apbs-plugin -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Jun 2013; Justin Lecher pymol-apbs-plugin-9999.ebuild, + metadata.xml: + Bump to EAPI=5 and bump to python-r1.eclass + 29 Jun 2010; Justin Lecher pymol-apbs-plugin-9999.ebuild: Python ABI fixes diff --git a/sci-chemistry/pymol-apbs-plugin/metadata.xml b/sci-chemistry/pymol-apbs-plugin/metadata.xml index 0fbe927..d410f15 100644 --- a/sci-chemistry/pymol-apbs-plugin/metadata.xml +++ b/sci-chemistry/pymol-apbs-plugin/metadata.xml @@ -1,8 +1,8 @@ -sci-chemistry - - sci@gentoo.org - + sci-chemistry + + sci@gentoo.org + diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild index 48a055c..cac6713 100644 --- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild +++ b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild @@ -1,56 +1,41 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="3" +EAPI=5 -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" +PYTHON_COMPAT=( python2_7 ) -inherit python subversion +inherit python-single-r1 subversion MY_PV="${PV##*_p}" DESCRIPTION="APBS plugin for pymol" HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/" +SRC_URI="" ESVN_REPO_URI="https://pymolapbsplugin.svn.sourceforge.net/svnroot/pymolapbsplugin/trunk/" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" LICENSE="pymol" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="" -RDEPEND=" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} sci-chemistry/apbs sci-chemistry/pdb2pqr - !sci-chemistry/pymol-1.5" DEPEND="${RDEPEND}" -RESTRICT_PYTHON_ABIS="3.*" - -src_unpack() { - subversion_src_unpack - python_copy_sources -} src_install() { - installation() { - sed \ - -e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \ - -e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \ - -e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \ - -e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \ - -i src/apbsplugin.py - - insinto $(python_get_sitedir)/pmg_tk/startup/ - newins src/apbsplugin.py apbs_tools.py || die - } - python_execute_function -s installation -} - -pkg_postinst() { - python_mod_optimize pmg_tk/startup/apbs_tools.py -} - -pkg_postrm() { - python_mod_cleanup pmg_tk/startup/apbs_tools.py + sed \ + -e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \ + -e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \ + -e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \ + -e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \ + -i src/apbsplugin.py > apbs_tools.py || die + python_moduleinto pmg_tk/startup/ + python_domodule apbs_tools.py + python_optimize } From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B72C81381F3 for ; Sun, 16 Jun 2013 15:54:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 366C6E0997; Sun, 16 Jun 2013 15:54:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 905E3E0997 for ; Sun, 16 Jun 2013 15:53:55 +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 C176933E503 for ; Sun, 16 Jun 2013 15:53:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 950A6E546E for ; Sun, 16 Jun 2013 15:53:47 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1371394956.9757e5d545af0aa563e1538e1c1ab0f824439adc.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol-apbs-plugin/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/pymol-apbs-plugin/ChangeLog sci-chemistry/pymol-apbs-plugin/metadata.xml sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild X-VCS-Directories: sci-chemistry/pymol-apbs-plugin/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 9757e5d545af0aa563e1538e1c1ab0f824439adc X-VCS-Branch: master Date: Sun, 16 Jun 2013 15:53:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2887fca6-f274-412a-9d45-ae0939df6e0b X-Archives-Hash: 7a009449cbe69d4c12ec6c592faf6be1 Message-ID: <20130616155347.Okl-aX61fForMDFXUL7-ZfRmfvbNSLEt2e7h4-UMAGg@z> commit: 9757e5d545af0aa563e1538e1c1ab0f824439adc Author: Justin Lecher gentoo org> AuthorDate: Sun Jun 16 15:02:36 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sun Jun 16 15:02:36 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9757e5d5 sci-chemistry/pymol-apbs-plugin: Bump to EAPI=5 and bump to python-r1.eclass Package-Manager: portage-2.2.0_alpha180 --- sci-chemistry/pymol-apbs-plugin/ChangeLog | 6 ++- sci-chemistry/pymol-apbs-plugin/metadata.xml | 8 ++-- .../pymol-apbs-plugin-9999.ebuild | 53 ++++++++-------------- 3 files changed, 28 insertions(+), 39 deletions(-) diff --git a/sci-chemistry/pymol-apbs-plugin/ChangeLog b/sci-chemistry/pymol-apbs-plugin/ChangeLog index deaec99..a0ef0cd 100644 --- a/sci-chemistry/pymol-apbs-plugin/ChangeLog +++ b/sci-chemistry/pymol-apbs-plugin/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sci-chemistry/pymol-apbs-plugin -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Jun 2013; Justin Lecher pymol-apbs-plugin-9999.ebuild, + metadata.xml: + Bump to EAPI=5 and bump to python-r1.eclass + 29 Jun 2010; Justin Lecher pymol-apbs-plugin-9999.ebuild: Python ABI fixes diff --git a/sci-chemistry/pymol-apbs-plugin/metadata.xml b/sci-chemistry/pymol-apbs-plugin/metadata.xml index 0fbe927..d410f15 100644 --- a/sci-chemistry/pymol-apbs-plugin/metadata.xml +++ b/sci-chemistry/pymol-apbs-plugin/metadata.xml @@ -1,8 +1,8 @@ -sci-chemistry - - sci@gentoo.org - + sci-chemistry + + sci@gentoo.org + diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild index 48a055c..cac6713 100644 --- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild +++ b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild @@ -1,56 +1,41 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="3" +EAPI=5 -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" +PYTHON_COMPAT=( python2_7 ) -inherit python subversion +inherit python-single-r1 subversion MY_PV="${PV##*_p}" DESCRIPTION="APBS plugin for pymol" HOMEPAGE="http://sourceforge.net/projects/pymolapbsplugin/" +SRC_URI="" ESVN_REPO_URI="https://pymolapbsplugin.svn.sourceforge.net/svnroot/pymolapbsplugin/trunk/" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" LICENSE="pymol" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="" -RDEPEND=" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} sci-chemistry/apbs sci-chemistry/pdb2pqr - !sci-chemistry/pymol-1.5" DEPEND="${RDEPEND}" -RESTRICT_PYTHON_ABIS="3.*" - -src_unpack() { - subversion_src_unpack - python_copy_sources -} src_install() { - installation() { - sed \ - -e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \ - -e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \ - -e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \ - -e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \ - -i src/apbsplugin.py - - insinto $(python_get_sitedir)/pmg_tk/startup/ - newins src/apbsplugin.py apbs_tools.py || die - } - python_execute_function -s installation -} - -pkg_postinst() { - python_mod_optimize pmg_tk/startup/apbs_tools.py -} - -pkg_postrm() { - python_mod_cleanup pmg_tk/startup/apbs_tools.py + sed \ + -e "s:^APBS_BINARY_LOCATION.*:APBS_BINARY_LOCATION = \"${EPREFIX}/usr/bin/apbs\":g" \ + -e "s:^APBS_PSIZE_LOCATION.*:APBS_PSIZE_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/src/\":g" \ + -e "s:^APBS_PDB2PQR_LOCATION.*:APBS_PDB2PQR_LOCATION = \"${EPREFIX}/$(python_get_sitedir)/pdb2pqr/\":g" \ + -e "s:^TEMPORARY_FILE_DIR.*:TEMPORARY_FILE_DIR = \"./\":g" \ + -i src/apbsplugin.py > apbs_tools.py || die + python_moduleinto pmg_tk/startup/ + python_domodule apbs_tools.py + python_optimize }