* [gentoo-commits] proj/sci:fixing commit in: sci-chemistry/pymol-apbs-plugin/
@ 2013-06-16 15:53 Justin Lecher
2013-06-16 15:53 ` [gentoo-commits] proj/sci:master " Justin Lecher
0 siblings, 1 reply; 4+ messages in thread
From: Justin Lecher @ 2013-06-16 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 9757e5d545af0aa563e1538e1c1ab0f824439adc
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 15:02:36 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec@gentoo.org> pymol-apbs-plugin-9999.ebuild,
+ metadata.xml:
+ Bump to EAPI=5 and bump to python-r1.eclass
+
29 Jun 2010; Justin Lecher <jlec@gentoo.org>
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 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci-chemistry</herd>
-<maintainer>
- <email>sci@gentoo.org</email>
-</maintainer>
+ <herd>sci-chemistry</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ </maintainer>
</pkgmetadata>
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.2.2-r1"
+ >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
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol-apbs-plugin/
2013-06-16 15:53 [gentoo-commits] proj/sci:fixing commit in: sci-chemistry/pymol-apbs-plugin/ Justin Lecher
@ 2013-06-16 15:53 ` Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2013-06-16 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 9757e5d545af0aa563e1538e1c1ab0f824439adc
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 15:02:36 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec@gentoo.org> pymol-apbs-plugin-9999.ebuild,
+ metadata.xml:
+ Bump to EAPI=5 and bump to python-r1.eclass
+
29 Jun 2010; Justin Lecher <jlec@gentoo.org>
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 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci-chemistry</herd>
-<maintainer>
- <email>sci@gentoo.org</email>
-</maintainer>
+ <herd>sci-chemistry</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ </maintainer>
</pkgmetadata>
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.2.2-r1"
+ >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
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol-apbs-plugin/
@ 2013-06-16 15:53 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2013-06-16 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 9f4c5d8096bbc0693edc5f3b4e7b5028b2ce3a9f
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 15:03:09 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 15:03:09 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9f4c5d80
sci-chemistry/pymol-apbs-plugin: Drop KEYWORDS from live ebuild
Package-Manager: portage-2.2.0_alpha180
---
sci-chemistry/pymol-apbs-plugin/ChangeLog | 3 +++
sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/sci-chemistry/pymol-apbs-plugin/ChangeLog b/sci-chemistry/pymol-apbs-plugin/ChangeLog
index a0ef0cd..9bfa574 100644
--- a/sci-chemistry/pymol-apbs-plugin/ChangeLog
+++ b/sci-chemistry/pymol-apbs-plugin/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 16 Jun 2013; Justin Lecher <jlec@gentoo.org> pymol-apbs-plugin-9999.ebuild:
+ Drop KEYWORDS from live ebuild
+
16 Jun 2013; Justin Lecher <jlec@gentoo.org> pymol-apbs-plugin-9999.ebuild,
metadata.xml:
Bump to EAPI=5 and bump to python-r1.eclass
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 cac6713..70bbba7 100644
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild
+++ b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild
@@ -17,7 +17,7 @@ ESVN_REPO_URI="https://pymolapbsplugin.svn.sourceforge.net/svnroot/pymolapbsplug
SLOT="0"
LICENSE="pymol"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-chemistry/pymol-apbs-plugin/
@ 2015-11-12 16:23 Justin Lecher
0 siblings, 0 replies; 4+ messages in thread
From: Justin Lecher @ 2015-11-12 16:23 UTC (permalink / raw
To: gentoo-commits
commit: c09d28ab167676ab64ec686c7a92a6c59cd4b165
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 16:22:29 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 16:22:29 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c09d28ab
Obsolete
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-chemistry/pymol-apbs-plugin/ChangeLog | 27 --------------
sci-chemistry/pymol-apbs-plugin/metadata.xml | 8 -----
.../pymol-apbs-plugin-9999.ebuild | 41 ----------------------
3 files changed, 76 deletions(-)
diff --git a/sci-chemistry/pymol-apbs-plugin/ChangeLog b/sci-chemistry/pymol-apbs-plugin/ChangeLog
deleted file mode 100644
index 933c9bd..0000000
--- a/sci-chemistry/pymol-apbs-plugin/ChangeLog
+++ /dev/null
@@ -1,27 +0,0 @@
-# ChangeLog for sci-chemistry/pymol-apbs-plugin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
-
- 16 Jun 2013; Justin Lecher <jlec@gentoo.org> pymol-apbs-plugin-9999.ebuild:
- Drop KEYWORDS from live ebuild
-
- 16 Jun 2013; Justin Lecher <jlec@gentoo.org> pymol-apbs-plugin-9999.ebuild,
- metadata.xml:
- Bump to EAPI=5 and bump to python-r1.eclass
-
- 29 Jun 2010; Justin Lecher <jlec@gentoo.org>
- pymol-apbs-plugin-9999.ebuild:
- Python ABI fixes
-
- 29 Jan 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
- pymol-apbs-plugin-0_p11.ebuild, pymol-apbs-plugin-9999.ebuild:
- fixes for some file locations
-
-*pymol-apbs-plugin-9999 (28 Jan 2010)
-*pymol-apbs-plugin-0_p11 (28 Jan 2010)
-
- 28 Jan 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
- +pymol-apbs-plugin-0_p11.ebuild, +pymol-apbs-plugin-9999.ebuild,
- +metadata.xml:
- Initial addition by me
-
diff --git a/sci-chemistry/pymol-apbs-plugin/metadata.xml b/sci-chemistry/pymol-apbs-plugin/metadata.xml
deleted file mode 100644
index 3632cfa..0000000
--- a/sci-chemistry/pymol-apbs-plugin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>sci-chemistry</herd>
- <upstream>
- <remote-id type="sourceforge">pymolapbsplugin</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild b/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild
deleted file mode 100644
index 152fc72..0000000
--- a/sci-chemistry/pymol-apbs-plugin/pymol-apbs-plugin-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-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"
-LICENSE="pymol"
-KEYWORDS=""
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- sci-chemistry/apbs
- sci-chemistry/pdb2pqr
- >sci-chemistry/pymol-1.5"
-DEPEND="${RDEPEND}"
-
-src_install() {
- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-11-12 16:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-16 15:53 [gentoo-commits] proj/sci:fixing commit in: sci-chemistry/pymol-apbs-plugin/ Justin Lecher
2013-06-16 15:53 ` [gentoo-commits] proj/sci:master " Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2013-06-16 15:53 Justin Lecher
2015-11-12 16:23 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox