diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-11-29 22:06:04 +0100 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-11-29 22:06:04 +0100 |
| commit | a4c888ca903f3275d561a27de0856e79b481eeb7 (patch) | |
| tree | 850f8ec1f95b72017bc667f8797b6b44e1bbf17c | |
| parent | Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci (diff) | |
| parent | Drop stupid static-libs idea again (diff) | |
| download | sci-a4c888ca903f3275d561a27de0856e79b481eeb7.tar.gz sci-a4c888ca903f3275d561a27de0856e79b481eeb7.tar.bz2 sci-a4c888ca903f3275d561a27de0856e79b481eeb7.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci
* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci:
Drop stupid static-libs idea again Signed-off-by: Justin Lecher <jlec@gentoo.org>
Last remaning underscored removed Signed-off-by: Justin Lecher <jlec@gentoo.org>
sci-chemistry/vmd: Drop dep on old tk
| -rw-r--r-- | eclass/intel-sdp.eclass | 7 | ||||
| -rw-r--r-- | sci-chemistry/vmd/ChangeLog | 3 | ||||
| -rw-r--r-- | sci-chemistry/vmd/vmd-1.9.1-r1.ebuild | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass index 1b6051454..3602b6d55 100644 --- a/eclass/intel-sdp.eclass +++ b/eclass/intel-sdp.eclass @@ -97,7 +97,7 @@ LICENSE="Intel-SDP" # Future work, #394411 #SLOT="${_INTEL_PV1}.${_INTEL_PV2}" SLOT="0" -IUSE="examples multilib static-libs" +IUSE="examples multilib" KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" RESTRICT="mirror" @@ -260,7 +260,7 @@ intel-sdp_pkg_pretend() { : ${CHECKREQS_DISK_BUILD:=256M} check-reqs_pkg_pretend - _dirs=( + dirs=( "${INTEL_SDP_EDIR}/licenses" "${INTEL_SDP_EDIR}/Licenses" "${EPREFIX}/opt/intel/licenses" @@ -380,9 +380,6 @@ intel-sdp_src_install() { find "${INTEL_SDP_DIR}"/man -delete || die fi - use static-libs || \ - find opt -type f -name "*.a" -delete || die - ebegin "Tagging ${PN}" find opt -name \*sh -type f -exec sed -i \ -e "s:<.*DIR>:${INTEL_SDP_EDIR}:g" \ diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog index 8707dea9d..32fdd601f 100644 --- a/sci-chemistry/vmd/ChangeLog +++ b/sci-chemistry/vmd/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.50 2012/11/14 15:18:58 jlec Exp $ + 29 Nov 2012; Justin Lecher <jlec@gentoo.org> vmd-1.9.1-r1.ebuild: + Drop dep on old tk + 26 Nov 2012; Justin Lecher <jlec@gentoo.org> vmd-1.9.1-r1.ebuild: Using new cuda.eclass diff --git a/sci-chemistry/vmd/vmd-1.9.1-r1.ebuild b/sci-chemistry/vmd/vmd-1.9.1-r1.ebuild index a116445a2..b361abd2a 100644 --- a/sci-chemistry/vmd/vmd-1.9.1-r1.ebuild +++ b/sci-chemistry/vmd/vmd-1.9.1-r1.ebuild @@ -24,10 +24,7 @@ RESTRICT="fetch" # currently, tk-8.5* with USE=truetype breaks some # tk apps such as Sequence Viewer or Timeline. CDEPEND=" - || ( - >=dev-lang/tk-8.5[-truetype] - =dev-lang/tk-8.4* - ) + >=dev-lang/tk-8.5[-truetype] dev-lang/perl dev-python/numpy sci-libs/netcdf |