From 0dfeb14b2ec037e2ff0b13546b75af3fc0c6387d Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Wed, 24 Feb 2010 08:23:04 +0000 Subject: [PATCH] fix for 306061, thanks ABCD for helping me Package-Manager: portage-2.2_rc63/cvs/Linux i686 --- sci-chemistry/oasis/ChangeLog | 6 +++++- sci-chemistry/oasis/Manifest | 10 +++++----- sci-chemistry/oasis/oasis-4.0.ebuild | 16 +++++++++------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/sci-chemistry/oasis/ChangeLog b/sci-chemistry/oasis/ChangeLog index 8843b4c37fb1..e0ba9d0dc57e 100644 --- a/sci-chemistry/oasis/ChangeLog +++ b/sci-chemistry/oasis/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/oasis # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/ChangeLog,v 1.1 2010/02/06 11:39:53 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/ChangeLog,v 1.2 2010/02/24 08:23:04 jlec Exp $ + + 24 Feb 2010; Justin Lecher (jlec) oasis-4.0.ebuild: + fperms -> chmod to use bash globs, fixes 306061 + removed circular dependencies *oasis-4.0 (06 Feb 2010) diff --git a/sci-chemistry/oasis/Manifest b/sci-chemistry/oasis/Manifest index 998e005ce6c4..a228093dd134 100644 --- a/sci-chemistry/oasis/Manifest +++ b/sci-chemistry/oasis/Manifest @@ -3,13 +3,13 @@ Hash: SHA1 AUX 4.0-makefile.patch 1277 RMD160 8c5a9c6feec0bbb1e80f4a1a48fd016ffc3ad77f SHA1 6d0a3503f650cafe67d5d5b1a7c0561de20c90b5 SHA256 4bafff2ae7e58a908d7203e56643122f56c0cc0ebca8a103f2ca73fefa5986ce DIST oasis4.0_Linux.zip 6714528 RMD160 9d5b46e06ab6b2e7e301622978056bf7b4208a79 SHA1 fab2e4556ad04556f918bae153e13a843415f0c9 SHA256 56da70ce0c2750aaddf64ad2cd7852fc341d2022209484beb356b4e73dec61ba -EBUILD oasis-4.0.ebuild 1462 RMD160 8b0f5a6644445c83411ac7341e8fbc80144372e3 SHA1 d8524cf21f2d0773c0abdf076feda23c83377579 SHA256 db4223966a171cccb06e1ae88f11f70770389b57a17650a7ca941f5859dd37b1 -MISC ChangeLog 391 RMD160 959e04c4704fa01eccd4b06197184b4f818f3942 SHA1 4fdbfa43c5289c5924b11b0c76d05567da67d061 SHA256 10954f2988ca0f347bf6f243a0112e590152df5c192c03ff9011dd084510fdf7 +EBUILD oasis-4.0.ebuild 1472 RMD160 84367f1230e42b6b60c40d86e4657b456effbc19 SHA1 a9739f044ebca06004c108f6865a3d371e592e9a SHA256 51c9a629428cdcd4b243dc24c74fe534b8acbf4253b9e5eaf173d931467831fa +MISC ChangeLog 549 RMD160 e02e0393ee24cad80e34a12b091e058f54f798e9 SHA1 8d516a90fc9f96192e084c735e351132de1d6e71 SHA256 f0e862cf5268e09f7961ff859a419da563c4fdadf19aa265467fb8b0b3e4506e MISC metadata.xml 298 RMD160 a811ceba16c1dfc0bf5cd95aac1fbeda93a01140 SHA1 5da5e120e5cb3ade8f5b3f4d6c2521dbe49dc2ee SHA256 47989b12cffa652d3b2fca1b8a9ad02f4e258df562fabc458dc9782f3789a8d0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkttVQ8ACgkQgAnW8HDreRaIwACdER+HdsewZP/sv2tNumn80Mt9 -5t4An00xJ4X9N7XHfQyXyDynW89LFBSu -=QYvR +iEYEARECAAYFAkuE4e8ACgkQgAnW8HDreRYQJQCfeMwyKcN8duddKjbRXQAZj8FC +d4IAn2CKzm3cAwsMrJSnlxkVwLoeco/J +=/LC5 -----END PGP SIGNATURE----- diff --git a/sci-chemistry/oasis/oasis-4.0.ebuild b/sci-chemistry/oasis/oasis-4.0.ebuild index 12e33174f330..970a2c7de578 100644 --- a/sci-chemistry/oasis/oasis-4.0.ebuild +++ b/sci-chemistry/oasis/oasis-4.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0.ebuild,v 1.1 2010/02/06 11:39:53 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0.ebuild,v 1.2 2010/02/24 08:23:04 jlec Exp $ -EAPI="2" +EAPI="3" inherit eutils multilib toolchain-funcs @@ -18,15 +18,17 @@ LICENSE="ccp4 oasis" IUSE="examples +minimal" RDEPEND=" + ${RDEPEND} sci-chemistry/ccp4-apps sci-chemistry/pymol - sci-libs/ccp4-libs sci-libs/mmdb sci-visualization/gnuplot !minimal? ( - sci-chemistry/solve-resolve-bin - sci-chemistry/arp-warp-bin )" -DEPEND="${RDEPEND}" + sci-chemistry/solve-resolve-bin + sci-chemistry/arp-warp-bin + )" +DEPEND="sci-libs/ccp4-libs" + S="${WORKDIR}"/${MY_P} @@ -51,7 +53,7 @@ src_install() { insinto /usr/$(get_libdir)/${PN}/html doins bin/html/* || die - fperms 755 /usr/$(get_libdir)/${PN}/html/*.{csh,awk} || die + chmod 755 "${ED}"/usr/$(get_libdir)/${PN}/html/*.{csh,awk} || die if use examples; then insinto /usr/share/${PN} -- 2.26.2