[gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/

["Hans de Graaff" <graaff@gentoo.org>]

commit:     8ca54a7b76bf35207a9e2d3ffa71131b208a5abd
Author:     Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Tue Sep 27 18:32:57 2011 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 18:32:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=8ca54a7b

Drop old pkg_postinst instrcutions for upgrading from pre 1.4 jruby versions.

(Portage version: 2.1.10.11/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x8883FA56A308A8D7!)

---
 dev-java/jruby/ChangeLog          |    3 +++
 dev-java/jruby/jruby-1.6.4.ebuild |   12 ------------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 2b59e1f..303533e 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -3,5 +3,8 @@
 # $Header: $
 
   27 Sep 2011; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild:
+  Drop old pkg_postinst instrcutions for upgrading from pre 1.4 jruby versions.
+
+  27 Sep 2011; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild:
   yecht will stay bundled for now.
 

diff --git a/dev-java/jruby/jruby-1.6.4.ebuild b/dev-java/jruby/jruby-1.6.4.ebuild
index 6aec39e..996891f 100644
--- a/dev-java/jruby/jruby-1.6.4.ebuild
+++ b/dev-java/jruby/jruby-1.6.4.ebuild
@@ -191,15 +191,3 @@ src_install() {
 		'(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \
 		-delete || die
 }
-
-pkg_postinst() {
-	ewarn "If you're updating from <=jruby-1.4.0, you're going to get errors related"
-	ewarn "to gentoo.rb load failure."
-	ewarn "This is due to a stray definition of JRUBY_OPTS variable from the previous ebuilds."
-	ewarn "To solve the problem, either login in a new shell, use 'env -i ${SHELL} --login'"
-	ewarn "or explicitly unset the variable before running jruby."
-	ewarn ""
-	ewarn "Currently this package introduces issues/bugs that are not present within upstream"
-	ewarn "releases.  Therefore if you are wanting a stable build of jruby please do not"
-	ewarn "use this package."
-}