diff options
| -rw-r--r-- | dev-lang/ocaml/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/ocaml/files/ocaml-rebuild.sh | 16 |
2 files changed, 8 insertions, 14 deletions
diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog index 6228ead3609b..6b6607022214 100644 --- a/dev-lang/ocaml/ChangeLog +++ b/dev-lang/ocaml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ocaml # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.156 2008/12/08 08:46:03 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.157 2008/12/11 08:24:39 aballier Exp $ + + 11 Dec 2008; Alexis Ballier <aballier@gentoo.org> files/ocaml-rebuild.sh: + Simplify ocaml-rebuild.sh: dont clean first and let portage handle the + deps, use --oneshot to not pollute world file, bug #250192 *ocaml-3.11.0 (08 Dec 2008) diff --git a/dev-lang/ocaml/files/ocaml-rebuild.sh b/dev-lang/ocaml/files/ocaml-rebuild.sh index d0fc233c046e..4871989f32c5 100644 --- a/dev-lang/ocaml/files/ocaml-rebuild.sh +++ b/dev-lang/ocaml/files/ocaml-rebuild.sh @@ -32,25 +32,15 @@ do category=`cat $dir/CATEGORY` slot=`cat $dir/SLOT` - toclean="=$category/$pkg $toclean" - tocleanstr="\"$category/$pkg\" $tocleanstr" - tobuild=">=$category/$pkg:$slot $tobuild" tobuildstr="\">=$category/$pkg:$slot\" $tobuildstr" done -echo Cleaning $tocleanstr echo Building $tobuildstr -if [ "$toclean" != "" ] +if [ $pretend -eq 1 ] then - if [ $pretend -eq 1 ] - then - $emerge --pretend $@ $tobuild - else - $emerge --unmerge $toclean - $emerge $@ $tobuild - fi + $emerge --pretend $@ $tobuild else - echo "Nothing to update" + $emerge --oneshot $@ $tobuild fi |