diff options
| author |   Marijn Schouten <hkbst@gentoo.org> | 2012-10-19 10:36:04 +0000 |
|---|---|---|
| committer | Marijn Schouten <hkbst@gentoo.org> | 2012-10-19 10:36:04 +0000 |
| commit | 743a517dd61c6d51869ef5ebeee06945d2186065 (patch) | |
| tree | b6366182d4e2e7e0867bf9d58c7dc8442277d518 /dev-lang | |
| parent | sci-libs/lapack-reference: Remove virtual/fortran and always call fortran-2_p... (diff) | |
| download | gentoo-2-743a517dd61c6d51869ef5ebeee06945d2186065.tar.gz gentoo-2-743a517dd61c6d51869ef5ebeee06945d2186065.tar.bz2 gentoo-2-743a517dd61c6d51869ef5ebeee06945d2186065.zip | |
fix bug 248162, thanks to Michael Weber (xmw@gentoo.org) for providing a patch
(Portage version: 2.1.11.30/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/smlnj/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/smlnj/smlnj-110.75.ebuild | 28 |
2 files changed, 27 insertions, 7 deletions
diff --git a/dev-lang/smlnj/ChangeLog b/dev-lang/smlnj/ChangeLog index 281c155ae7b7..a26b5e5aa6bc 100644 --- a/dev-lang/smlnj/ChangeLog +++ b/dev-lang/smlnj/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/smlnj # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.24 2012/10/19 09:31:58 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.25 2012/10/19 10:36:04 hkbst Exp $ + + 19 Oct 2012; Marijn Schouten <hkBst@gentoo.org> smlnj-110.75.ebuild: + fix bug 248162, thanks to Michael Weber (xmw@gentoo.org) for providing a + patch *smlnj-110.75 (19 Oct 2012) diff --git a/dev-lang/smlnj/smlnj-110.75.ebuild b/dev-lang/smlnj/smlnj-110.75.ebuild index 5b27a2344ecd..1bdc79cb2e7b 100644 --- a/dev-lang/smlnj/smlnj-110.75.ebuild +++ b/dev-lang/smlnj/smlnj-110.75.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.75.ebuild,v 1.1 2012/10/19 09:31:58 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.75.ebuild,v 1.2 2012/10/19 10:36:04 hkbst Exp $ EAPI="4" @@ -70,16 +70,32 @@ src_unpack() { echo SRCARCHIVEURL=\"file:/${S}\" > "${S}"/config/srcarchiveurl } +DIR=/usr/libexec + +src_prepare() { + sed -e "/@BINDIR@/s:\$BINDIR:${DIR}/bin:" \ + -e "/@LIBDIR@/s:\$LIBDIR:${DIR}/lib:" \ + -i config/install.sh || die +} + src_compile() { SMLNJ_HOME="${S}" ./config/install.sh || die "compilation failed" } src_install() { - mkdir -p "${D}"/usr - mv bin lib "${D}"/usr + mkdir -p "${D}"/${DIR} || die + mv bin lib "${D}"/${DIR} || die - for file in "${D}"/usr/bin/{*,.*}; do - [[ -f ${file} ]] && sed "2iSMLNJ_HOME=/usr" -i ${file} - # [[ -f ${file} ]] && sed "s:${WORKDIR}:/usr:" -i ${file} + for file in "${D}"/${DIR}/bin/*; do + dosym /${DIR}/bin/$(basename "${file}") /usr/bin/$(basename "${file}") || die done + +# for file in $(find "${D}"/usr/lib/${PN}/bin/ -maxdepth 1 -type f ! -name ".*"); do +# dosym /${DIR}/bin/$(basename "${file}") /usr/bin/$(basename "${file}") || die +# done + +# for file in "${D}"/usr/bin/{*,.*}; do +# [[ -f ${file} ]] && sed "2iSMLNJ_HOME=/usr" -i ${file} +# # [[ -f ${file} ]] && sed "s:${WORKDIR}:/usr:" -i ${file} +# done } |