From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-412260-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Rf6jl-0001Al-6E
for garchives@archives.gentoo.org; Mon, 26 Dec 2011 09:20:53 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0B17A21C15C;
Mon, 26 Dec 2011 09:20:35 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id CE19721C15C
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Dec 2011 09:20:35 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 564E31B4008
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Dec 2011 09:20:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id C046080043
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Dec 2011 09:20:34 +0000 (UTC)
From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" <graaff@gentoo.org>
Message-ID: <8ca54a7b76bf35207a9e2d3ffa71131b208a5abd.graaff@gentoo>
Subject: [gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/
X-VCS-Repository: proj/ruby-overlay
X-VCS-Files: dev-java/jruby/ChangeLog dev-java/jruby/jruby-1.6.4.ebuild
X-VCS-Directories: dev-java/jruby/
X-VCS-Committer: graaff
X-VCS-Committer-Name: Hans de Graaff
X-VCS-Revision: 8ca54a7b76bf35207a9e2d3ffa71131b208a5abd
Date: Mon, 26 Dec 2011 09:20:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 8a641841-8143-4834-9ccc-8c1d9e98a526
X-Archives-Hash: c775af91a80cffef5ab1c1511248bde2
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=3Dproj/ruby-overlay.=
git;a=3Dcommit;h=3D8ca54a7b
Drop old pkg_postinst instrcutions for upgrading from pre 1.4 jruby versi=
ons.
(Portage version: 2.1.10.11/git/Linux x86_64, RepoMan options: --force, s=
igned 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: $
=20
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 ve=
rsions.
+
+ 27 Sep 2011; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild:
yecht will stay bundled for now.
=20
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 'ubygem=
s.rb' -or -name 'datadir.rb' ')' \
-delete || die
}
-
-pkg_postinst() {
- ewarn "If you're updating from <=3Djruby-1.4.0, you're going to get err=
ors related"
- ewarn "to gentoo.rb load failure."
- ewarn "This is due to a stray definition of JRUBY_OPTS variable from th=
e 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 prese=
nt within upstream"
- ewarn "releases. Therefore if you are wanting a stable build of jruby =
please do not"
- ewarn "use this package."
-}