EAPI=3, keywording for {amd64,x86}-linux and make it work

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 83 insertions, 10 deletions

diff --git a/sci-chemistry/caver/ChangeLog b/sci-chemistry/caver/ChangeLog
index b717b8732f09..d44c3a63f481 100644
--- a/sci-chemistry/caver/ChangeLog
+++ b/sci-chemistry/caver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/caver
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/caver/ChangeLog,v 1.13 2010/02/12 17:29:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/caver/ChangeLog,v 1.14 2010/02/21 09:56:35 jlec Exp $
+
+*caver-2.0.003-r1 (21 Feb 2010)
+
+  21 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +caver-2.0.003-r1.ebuild:
+  EAPI=3, keywording for {amd64,x86}-linux
 
 *caver-2.0.003 (12 Feb 2010)
 
diff --git a/sci-chemistry/caver/Manifest b/sci-chemistry/caver/Manifest
index 74922015f3c2..9e66cf937942 100644
--- a/sci-chemistry/caver/Manifest
+++ b/sci-chemistry/caver/Manifest
@@ -9,13 +9,14 @@ DIST caver_unix_v0.99.2.tar.gz 1152263 RMD160 01b877bef15d0f0e1ccce8a3dbcda83826
 DIST caver_unix_v0.99.4.tar.gz 1084660 RMD160 c57c5b0c6259bb86fc844820d169a60d3895b2bd SHA1 b4a6a26651a20a1664ddfb96f36e89906dcc0bff SHA256 7aa8da882b8c7525164c4643e8feea2bb644bb5790400a21dcf8c70c40f0ea09
 EBUILD caver-0.99.2.ebuild 1415 RMD160 e4b5b64c828c1099c90b515c83c9d4c0c3a2c866 SHA1 0bc493d7d49cf2449193fce20b8a17f6751f9062 SHA256 5439487f574f1d55d9156cd422e0f75a279861218cee9371ef86126894611f73
 EBUILD caver-0.99.4.ebuild 1779 RMD160 e18932af22a2d5926ab94b5fb819623f4dc0bdd2 SHA1 864b2d832d506f5955583519110b1347f4e8e28c SHA256 655eeb60534c3334ae40d895b5b66fdd384f095128390916b0eda8bf2dd8933f
-EBUILD caver-2.0.003.ebuild 1600 RMD160 a880ab247d5e1d212d5d81714443c345078c3dca SHA1 2cf794cb12ca234156928be9c186ab78b61034d7 SHA256 6fcc8fbcc57434900791971112ee218553dff1bd8d7b728de2eb055f1167dbf9
-MISC ChangeLog 2344 RMD160 c8c77df4c910d67cbf02bc11548eb105a6fee60b SHA1 74dc71ced4690fac8fb56dacfb4b4ef7c7bd1c7e SHA256 3c1b0891c290f189a9595e0818cd956c4a70622b226e54fd0c87c1b58422ca4a
+EBUILD caver-2.0.003-r1.ebuild 1790 RMD160 a9033038250df1ae8d5c7f579333dc1ddf85122e SHA1 0ec7aaaeb28e04d4236146428666283b1c50a92f SHA256 6f4caa12e584e1f4f06327f4341560243f6f05c56764161756d403c6d4b31946
+EBUILD caver-2.0.003.ebuild 1753 RMD160 c26bfa87aabd6020b575f83f76e8c392894b332e SHA1 4c6e03485f35ceb90035567dae20fe511f6c186e SHA256 eff52d81161668a63fda13dabd3ad6ea7cf27a212e3ea8a026e6dcc6fa2bf8ea
+MISC ChangeLog 2503 RMD160 5a3aed91d5fd191d690dee52cc2a45d8236d98a7 SHA1 51e31302d42f895d9eafc661b34fc0fd6030c9fd SHA256 fd356ddcb0ae1caf86ab3bddbab0c2d0718a70651df0057c647c36dcf7531835
 MISC metadata.xml 270 RMD160 c173cba4fc9dd66e9c5f136819009c4571c36bb9 SHA1 8782ebcb086ea7e5f67c4895a46043f5478d66ba SHA256 907c1720b550d9f8332374f7ec880f422307a2495b180ee64218373d3551381a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt1kAYACgkQgAnW8HDreRY8tgCcDtr5GVf049TWpgn4o9qVgVYD
-vsQAoKvggBSgCJ3HoUTvZPHanhnBix60
-=WN3d
+iEYEARECAAYFAkuBA1kACgkQgAnW8HDreRZiDQCfbmyYAJqF3teQWE0n+rHJjgwN
+YOwAn0bYQmNvvdKyYIs+d5E689xh+oVh
+=yw4n
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/caver/caver-2.0.003-r1.ebuild b/sci-chemistry/caver/caver-2.0.003-r1.ebuild
new file mode 100644
index 000000000000..3a91b8a21abb
--- /dev/null
+++ b/sci-chemistry/caver/caver-2.0.003-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/caver/caver-2.0.003-r1.ebuild,v 1.1 2010/02/21 09:56:35 jlec Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit multilib python eutils versionator java-utils-2
+
+MY_PV="$(replace_version_separator 2 -v $(replace_version_separator 1 _ ${PV}))"
+MY_P="${PN}${MY_PV}_pymol_plugin"
+
+DESCRIPTION="Calculation of pathways from buried cavities to outside solvent in protein structures"
+HOMEPAGE="http://loschmidt.chemi.muni.cz/caver/"
+SRC_URI="${MY_P}.zip"
+
+LICENSE="CAVER"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=virtual/jre-1.6
+	sci-chemistry/pymol"
+DEPEND="app-arch/unzip"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+RESTRICT="fetch"
+
+S="${WORKDIR}/Caver${MY_PV}"/linux_mac
+
+pkg_nofetch() {
+	elog "Download ${MY_P}.tar.gz"
+	elog "from ${HOMEPAGE}. This requires registration."
+	elog "Place tarballs in ${DISTDIR}."
+}
+
+src_prepare() {
+	python_copy_sources --no-link
+}
+
+src_install() {
+	java-pkg_dojar Caver$(replace_all_version_separators _ ${PV})/*.jar
+
+	java-pkg_jarinto /usr/share/${PN}/lib/lib/
+	java-pkg_dojar Caver$(replace_all_version_separators _ ${PV})/lib/*.jar
+
+	installation() {
+	sed \
+		-e "s:directory/where/jar/with/plugin/is/located:${EPREFIX}/usr/share/${PN}/lib/:g" \
+		-i Caver$(replace_all_version_separators _ ${PV}).py || die
+
+		insinto $(python_get_sitedir)/pmg_tk/startup/
+		doins Caver$(replace_all_version_separators _ ${PV}).py || die
+	}
+	python_execute_function -s installation
+}
+
+pkg_postinst() {
+	python_mod_optimize pmg_tk/startup/Caver$(replace_all_version_separators _ ${PV}).py
+}
+
+pkg_postrm() {
+	python_mod_cleanup pmg_tk/startup/Caver$(replace_all_version_separators _ ${PV}).py
+}
diff --git a/sci-chemistry/caver/caver-2.0.003.ebuild b/sci-chemistry/caver/caver-2.0.003.ebuild
index daceb7b5e283..e84e6d984cf6 100644
--- a/sci-chemistry/caver/caver-2.0.003.ebuild
+++ b/sci-chemistry/caver/caver-2.0.003.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/caver/caver-2.0.003.ebuild,v 1.1 2010/02/12 17:29:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/caver/caver-2.0.003.ebuild,v 1.2 2010/02/21 09:56:35 jlec Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -23,6 +23,7 @@ RDEPEND="
 	>=virtual/jre-1.6
 	sci-chemistry/pymol"
 DEPEND="app-arch/unzip"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
 
 RESTRICT="fetch"
 
@@ -41,7 +42,7 @@ src_prepare() {
 src_install() {
 	java-pkg_dojar Caver$(replace_all_version_separators _ ${PV})/*.jar
 
-	java-pkg_jarinto /usr/share/${PN}/lib/
+	java-pkg_jarinto /usr/share/${PN}/lib/lib/
 	java-pkg_dojar Caver$(replace_all_version_separators _ ${PV})/lib/*.jar
 
 	installation() {
@@ -56,9 +57,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize ${PN}
+	python_mod_optimize pmg_tk/startup/Caver$(replace_all_version_separators _ ${PV}).py
 }
 
 pkg_postrm() {
-	python_mod_cleanup ${PN}
+	python_mod_cleanup pmg_tk/startup/Caver$(replace_all_version_separators _ ${PV}).py
 }