diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-04-06 08:22:21 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-04-06 08:22:21 +0000 |
| commit | 155e1f0629667929c6aa4205e2fba8229b346cba (patch) | |
| tree | 3012b51c18be8a95a7bdba572a0b05008e1609f5 /dev-java | |
| parent | Removing vulnerable ebuilds for CVE-2010-1224 / AST-2010-003 (Remote host acc... (diff) | |
| download | gentoo-2-155e1f0629667929c6aa4205e2fba8229b346cba.tar.gz gentoo-2-155e1f0629667929c6aa4205e2fba8229b346cba.tar.bz2 gentoo-2-155e1f0629667929c6aa4205e2fba8229b346cba.zip | |
Fix symlink upgrade instructions. Thanks to Martin von Gagern <Martin.vGagern@gmx.net> in bug #302187.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/jruby/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/jruby/jruby-1.4.0-r6.ebuild | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index f5df768753e5..f0cb2cc657c9 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jruby # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.56 2010/04/05 23:03:49 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.57 2010/04/06 08:22:21 caster Exp $ + + 06 Apr 2010; Vlastimil Babka <caster@gentoo.org> jruby-1.4.0-r6.ebuild: + Fix symlink upgrade instructions. Thanks to Martin von Gagern + <Martin.vGagern@gmx.net> in bug #302187. *jruby-1.4.0-r6 (05 Apr 2010) diff --git a/dev-java/jruby/jruby-1.4.0-r6.ebuild b/dev-java/jruby/jruby-1.4.0-r6.ebuild index 953368d70489..f9ebba42fd50 100644 --- a/dev-java/jruby/jruby-1.4.0-r6.ebuild +++ b/dev-java/jruby/jruby-1.4.0-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0-r6.ebuild,v 1.1 2010/04/05 23:03:49 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0-r6.ebuild,v 1.2 2010/04/06 08:22:21 caster Exp $ EAPI="2" JAVA_PKG_IUSE="doc source test" @@ -71,7 +71,15 @@ pkg_setup() { for directory in "${GEMS}" "${SITE_RUBY}"; do if [[ -L ${directory} ]]; then - eerror "${directory} is a symlink. Please remove this symlink." + eerror "${directory} is a symlink. Please do the following to resolve the situation:" + echo 'emerge -an app-portage/gentoolkit' + echo 'equery -qC b '"${directory}"' | sort | uniq | sed s/^/=/ > ~/jruby.fix' + echo 'emerge -1C $(< ~/jruby.fix)' + echo "rm ${directory}" + echo 'emerge -1 $(< ~/jruby.fix)' + echo 'rm ~/jruby.fix' + + eerror "For more information, please see http://bugs.gentoo.org/show_bug.cgi?id=302187" fail="true" fi done |