diff options
| author |   Marijn Schouten <hkbst@gentoo.org> | 2012-10-22 12:14:09 +0000 |
|---|---|---|
| committer | Marijn Schouten <hkbst@gentoo.org> | 2012-10-22 12:14:09 +0000 |
| commit | 439fcaa4187d1461c0a47a23fec76cb1ec6a2b3a (patch) | |
| tree | 0d105a16b36975f79203106c7edf3a3ece25fa01 /dev-lang/smlnj | |
| parent | Version bump. (diff) | |
| download | gentoo-2-439fcaa4187d1461c0a47a23fec76cb1ec6a2b3a.tar.gz gentoo-2-439fcaa4187d1461c0a47a23fec76cb1ec6a2b3a.tar.bz2 gentoo-2-439fcaa4187d1461c0a47a23fec76cb1ec6a2b3a.zip | |
revert fix for bug 248162, because of bug 438934
(Portage version: 2.1.11.30/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-lang/smlnj')
| -rw-r--r-- | dev-lang/smlnj/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/smlnj/smlnj-110.75.ebuild | 26 |
2 files changed, 17 insertions, 14 deletions
diff --git a/dev-lang/smlnj/ChangeLog b/dev-lang/smlnj/ChangeLog index 676ec8c2b787..b871388ba5b6 100644 --- a/dev-lang/smlnj/ChangeLog +++ b/dev-lang/smlnj/ChangeLog @@ -1,6 +1,9 @@ # 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.26 2012/10/19 11:04:26 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.27 2012/10/22 12:14:09 hkbst Exp $ + + 22 Oct 2012; Marijn Schouten <hkBst@gentoo.org> smlnj-110.75.ebuild: + revert fix for bug 248162, because of bug 438934 19 Oct 2012; Marijn Schouten <hkBst@gentoo.org> smlnj-110.75.ebuild: fix bug 243886, thanks to Michael Weber (xmw@gentoo.org) for providing a diff --git a/dev-lang/smlnj/smlnj-110.75.ebuild b/dev-lang/smlnj/smlnj-110.75.ebuild index afbfa8153d0d..1a61ddb2f799 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.3 2012/10/19 11:04:26 hkbst Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.75.ebuild,v 1.4 2012/10/22 12:14:09 hkbst Exp $ EAPI="4" @@ -70,7 +70,7 @@ src_unpack() { echo SRCARCHIVEURL=\"file:/${S}\" > "${S}"/config/srcarchiveurl } -DIR=/usr/libexec +DIR=/usr src_prepare() { # respect CC et al. (bug 243886) @@ -84,10 +84,10 @@ src_prepare() { -i base/runtime/objs/${file} done - # stash bin and lib somewhere (bug 248162) - sed -e "/@BINDIR@/s:\$BINDIR:${DIR}:" \ - -e "/@LIBDIR@/s:\$LIBDIR:${DIR}/lib:" \ - -i config/install.sh || die +# # stash bin and lib somewhere (bug 248162) +# sed -e "/@BINDIR@/s:\$BINDIR:${DIR}:" \ +# -e "/@LIBDIR@/s:\$LIBDIR:${DIR}/lib:" \ +# -i config/install.sh || die } src_compile() { @@ -98,16 +98,16 @@ src_install() { mkdir -p "${D}"/${DIR} || die mv bin lib "${D}"/${DIR} || die - for file in "${D}"/${DIR}/bin/*; do - dosym /${DIR}/bin/$(basename "${file}") /usr/bin/$(basename "${file}") || die - done +# 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 + for file in "${D}"/usr/bin/{*,.*}; do + [[ -f ${file} ]] && sed "2iSMLNJ_HOME=/usr" -i ${file} + # [[ -f ${file} ]] && sed "s:${WORKDIR}:/usr:" -i ${file} + done } |