diff options
Diffstat (limited to 'dev-ruby')
| -rw-r--r-- | dev-ruby/rubygems/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-ruby/rubygems/Manifest | 13 | ||||
| -rw-r--r-- | dev-ruby/rubygems/files/rubygems-1.3.7-rubyee.patch | 25 | ||||
| -rw-r--r-- | dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild | 10 | ||||
| -rw-r--r-- | dev-ruby/rubygems/rubygems-1.3.7.ebuild | 116 |
5 files changed, 164 insertions, 8 deletions
diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog index 8698784e63c5..d031036797c9 100644 --- a/dev-ruby/rubygems/ChangeLog +++ b/dev-ruby/rubygems/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/rubygems # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.140 2010/05/13 10:45:59 a3li Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.141 2010/05/14 19:04:17 a3li Exp $ + +*rubygems-1.3.7 (14 May 2010) + + 14 May 2010; Alex Legler <a3li@gentoo.org> rubygems-1.3.6-r2.ebuild, + +rubygems-1.3.7.ebuild, +files/rubygems-1.3.7-rubyee.patch: + Version bump. Closes bug 319531 by Dennis Schridde. 13 May 2010; Alex Legler <a3li@gentoo.org> rubygems-1.3.6-r2.ebuild: More dying diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest index bd2aa94a0515..919126b8e41d 100644 --- a/dev-ruby/rubygems/Manifest +++ b/dev-ruby/rubygems/Manifest @@ -12,20 +12,23 @@ AUX init.d-gem_server 502 RMD160 9fe089f462edff052e6b7fa6ea3803e0178f41ef SHA1 e AUX init.d-gem_server2 502 RMD160 baf764bc5ad41adce73576b2376093744ddd3917 SHA1 ad332343eab53b4be8d796999063ec2018245a4b SHA256 b7f7d215bb3dba02150dbdc431a84308010515ad4c5d9776d0dd5b99bf9a2cee AUX rubygems-1.3.3-gentoo.patch 1422 RMD160 e39a2042170399d0e98c772b0572026d6057353d SHA1 11cb4656b77185c78df809d3180061e5fe41139b SHA256 95e6c7ea38177b0798562be5abaf040e72db4a27f851502d91c4453890e630b0 AUX rubygems-1.3.5-setup.patch 942 RMD160 69e8714f72482387019bad7b9254110c6bb8b957 SHA1 ba58de08e29731de4ce820f7d8e4c60de2fcee6e SHA256 d3e7c43ff20a649d1c731e27b0791f110b920201a28607091da0166495709b97 +AUX rubygems-1.3.7-rubyee.patch 825 RMD160 d406da8f27ab69de6cea2aec04b954581e271456 SHA1 23a244497f2e495047c65ea9ad030a81c186e3d4 SHA256 4f272cdfe2383546edcefa11a816b4b4c8ab9bd78e5f23f4f737b6fce2f705c0 AUX rubygems-rubyee.patch 949 RMD160 7a819de691d457fdef426176534be97444b9a983 SHA1 deffcf777502399058b091b0f05feed8cdbc79ca SHA256 50af5257189b42c7795eaa33b83feed5b46949a1620a1b18ea289c1326dfd2a8 DIST rubygems-1.3.5.tgz 278469 RMD160 2d17f0de2d387bd2a034916cb79531110f3be196 SHA1 8545f25d00c757a310b879a2580e56d6012fc981 SHA256 c0928cc1ae54dedfb5f57ad3829882c1f90e42bc17bf50491aa6f93a937546ac DIST rubygems-1.3.6.tgz 285167 RMD160 f2aa5155a79f07a3f9106e90a4d1e4d39d31cc5a SHA1 ad6606d1eae82cb69381e4f5b2022d2f3f2733f3 SHA256 5c6e6ca672b68acccb8f898670f1661307dea8668fc7f71bb421cab51208d7b0 +DIST rubygems-1.3.7.tgz 290986 RMD160 2ea8e16d1535216045798258603d5f2f9e3dbfea SHA1 68ad2970963db9893b76acc8777be72a77c4bee4 SHA256 388b90ae6273f655507b10c8ba6bee9ea72e7d49c3e610025531cb8c3ba67c9d EBUILD rubygems-1.3.5-r1.ebuild 2809 RMD160 beafa61db1cc38a9ddfdb33ec70109bfbf1310c8 SHA1 1118c3f668f1fea1b4e6e74a051a668d8c78f42c SHA256 08cc7b6c18304a5a99d7527525ca8825b8828884a70a7d66325bf6bfa43ee089 EBUILD rubygems-1.3.5-r3.ebuild 3028 RMD160 67e906d35784d62dd31203b582fadeb904890ee9 SHA1 3caf5fc719c79205805bed6082d40dc9ab70d816 SHA256 8b28ca2c63cd22bdd010b1eec9fcc15f5900210e5740b9aaefe02faf6a706028 EBUILD rubygems-1.3.5.ebuild 3166 RMD160 95a7edee644212eabf8a86f1dc42d06c14a3deed SHA1 8c1b5af2fd039e655628a1884697883824b0bafc SHA256 14822c8c0b156a93a8ab2215b5502f7cea55c2cbce8a57b5ddd7eec2753338b1 -EBUILD rubygems-1.3.6-r2.ebuild 3209 RMD160 c60ffbc4bc3ac34bd1e382389333bc9bdf9aad84 SHA1 c31a719b3bdd3c0a3782e290c2768610e4548e62 SHA256 28dffae2d948809d47f8d3669d583c4585dbf04bd7c16bb5da7d0f5422ff8114 +EBUILD rubygems-1.3.6-r2.ebuild 3318 RMD160 e48c7b04653de2319bbf74b1ca47bb175c11cdbc SHA1 5a54b2893fce0761f30f0646e8d6c8161e016f62 SHA256 8c0dc8e300a669eae57b3be4096c275988b5d641d4a49e3efbb4298f5a90b610 EBUILD rubygems-1.3.6.ebuild 3096 RMD160 3abcac49900105943cbf2bbde168c97d088b162d SHA1 f598b8ab87f175ead2cb73ed599c37bfe6094fe4 SHA256 492d0c250fb3a7c5d84d52301c7ca4e4eaa942d452cbcf096c5fefe69e4c8ea9 -MISC ChangeLog 21355 RMD160 0cf458fcbfc301c59bd6d05a312387b43fd080cc SHA1 64e58e3f8405ecfdf51ab4aa8f068323ee3129e8 SHA256 75b7c917d5ba214cfb82b90a80a9a1a040c00a3c75215aba06ad47e29db9d567 +EBUILD rubygems-1.3.7.ebuild 3314 RMD160 e5905ad88c7f210df0978f0ba804c9e7aa533171 SHA1 3ea9c3519266f8ff546a6c6de6d028b67f38e83c SHA256 cbfab609137b0d8ebcd57165a7d2d15662bae18dd7dbc30d00c4eee20c06435d +MISC ChangeLog 21574 RMD160 73ee061e56693f86fff20caceae44344bead3bab SHA1 adacbab0ab0e5c3dd366c198e486b8e0fa28a541 SHA256 addb4dcf904fe17c64e82aa79e1e8670ee940a6b30f977bad179d9e9ef49b174 MISC metadata.xml 247 RMD160 eb1d10b4366542ce2f232dcaf7317341b6b5608f SHA1 fcb6e2a1d6cda6d45640f9c5a5dfcc0fd4f3ab3b SHA256 633ae9912e8dd27f76b9cf53f5ad0d3222db85d9a19a76da7fd5e26f40b144e3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvr2G4ACgkQ+tgfDpkAy6AY4gCfbeH641SfYht0/sj7AD0GOPK+ -IE4AmgNKQqC7gx9ugJb28QxIihgJTHgZ -=sMes +iEYEARECAAYFAkvtnsgACgkQ+tgfDpkAy6A4hQCgjAPMwZVY4o+y2Q2PBPfrY2Rm +B4QAnj2NQscf8wmC/I6l7MBaY/JQYB6U +=c3V/ -----END PGP SIGNATURE----- diff --git a/dev-ruby/rubygems/files/rubygems-1.3.7-rubyee.patch b/dev-ruby/rubygems/files/rubygems-1.3.7-rubyee.patch new file mode 100644 index 000000000000..7e40ad575807 --- /dev/null +++ b/dev-ruby/rubygems/files/rubygems-1.3.7-rubyee.patch @@ -0,0 +1,25 @@ +--- lib/rubygems/defaults.rb.orig 2010-05-14 20:43:47.051675672 +0200 ++++ lib/rubygems/defaults.rb 2010-05-14 20:50:32.023684192 +0200 +@@ -1,3 +1,4 @@ ++# This file is altered for Ruby Enterprise Edition on Gentoo. + module Gem + + @post_install_hooks ||= [] +@@ -24,7 +25,7 @@ + File.join(ConfigMap[:rubylibprefix], 'gems', + ConfigMap[:ruby_version]) + else +- File.join(ConfigMap[:libdir], ruby_engine, 'gems', ++ File.join(ConfigMap[:sitedir].gsub(/site_ruby\/?$/, ''), 'gems', + ConfigMap[:ruby_version]) + end + end +@@ -33,7 +34,7 @@ + # Path for gems in the user's home directory + + def self.user_dir +- File.join Gem.user_home, '.gem', ruby_engine, ConfigMap[:ruby_version] ++ File.join Gem.user_home, '.gem', 'rubyee', ConfigMap[:ruby_version] + end + + ## diff --git a/dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild b/dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild index 258a52559cdc..420363666507 100644 --- a/dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild +++ b/dev-ruby/rubygems/rubygems-1.3.6-r2.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-ruby/rubygems/rubygems-1.3.6-r2.ebuild,v 1.2 2010/05/13 10:45:59 a3li Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.6-r2.ebuild,v 1.3 2010/05/14 19:04:17 a3li Exp $ EAPI="2" @@ -82,12 +82,18 @@ all_ruby_install() { fi } -pkg_postinst() { +clear_source_cache() { local gemsitedir=$(ruby_rbconfig_value 'sitelibdir' | sed -e 's:site_ruby:gems:') SOURCE_CACHE="${gemsitedir}/source_cache" + if [[ -e "${SOURCE_CACHE}" ]]; then rm "${SOURCE_CACHE}" + einfo "Cleared gem source cache." fi +} + +pkg_postinst() { + _ruby_each_implementation clear_source_cache if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then eselect ruby set $(eselect --brief --no-color ruby show | head -n1) diff --git a/dev-ruby/rubygems/rubygems-1.3.7.ebuild b/dev-ruby/rubygems/rubygems-1.3.7.ebuild new file mode 100644 index 000000000000..a532397e8a47 --- /dev/null +++ b/dev-ruby/rubygems/rubygems-1.3.7.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7.ebuild,v 1.1 2010/05/14 19:04:17 a3li Exp $ + +EAPI="2" + +USE_RUBY="ruby18 ruby19 ree18 jruby" + +inherit ruby-ng + +DESCRIPTION="Centralized Ruby extension management system" +HOMEPAGE="http://rubyforge.org/projects/rubygems/" +LICENSE="|| ( Ruby GPL-2 )" + +# Needs to be installed first +RESTRICT="test" + +SRC_URI="mirror://rubyforge/${PN}/${P}.tgz" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd" +SLOT="0" +IUSE="doc server" + +# previous versions had rubygems bundled, so it would collide badly +RDEPEND=" + ruby_targets_jruby? ( >=dev-java/jruby-1.4.0-r5 ) + ruby_targets_ruby19? ( >=dev-lang/ruby-1.9.1_p376 ) +" + +# index_gem_repository.rb +PDEPEND="server? ( dev-ruby/builder[ruby_targets_ruby18] )" + +all_ruby_prepare() { + epatch "${FILESDIR}/${PN}-1.3.5-setup.patch" + # Fixes a new "feature" that would prevent us from recognizing installed + # gems inside the sandbox + epatch "${FILESDIR}/${PN}-1.3.3-gentoo.patch" +} + +each_ruby_prepare() { + case ${RUBY} in + *rubyee18) + epatch "${FILESDIR}/${P}-rubyee.patch" || die "ree patch failed" + ;; + *) + ;; + esac +} + +each_ruby_install() { + # Unset RUBYOPT to avoid interferences, bug #158455 et. al. + unset RUBYOPT + + local gemsitedir=$(ruby_rbconfig_value 'sitelibdir' | sed -e 's:site_ruby:gems:') + + # rubygems tries to create GEM_HOME if it doesn't exist, upsetting sandbox, + # bug #202109. Since 1.2.0 we also need to set GEM_PATH for this reason, bug #230163 + export GEM_HOME="${D}${gemsitedir}" + export GEM_PATH="${GEM_HOME}/" + keepdir ${gemsitedir}/{doc,gems,cache,specifications} + + myconf="" + if ! use doc; then + myconf="${myconf} --no-ri" + myconf="${myconf} --no-rdoc" + fi + + ${RUBY} setup.rb $myconf --destdir="${D}" || die "setup.rb install failed" + + insinto $(ruby_rbconfig_value 'sitelibdir') + newins "${FILESDIR}/auto_gem.rb.$(basename ${RUBY})" auto_gem.rb || die "newins auto_gem failed" +} + +all_ruby_install() { + dodoc README || die "dodoc README failed" + + doenvd "${FILESDIR}/10rubygems" || die "doenvd 10rubygems failed" + + if use server; then + newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed" + newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed" + fi +} + +clear_source_cache() { + local gemsitedir=$(ruby_rbconfig_value 'sitelibdir' | sed -e 's:site_ruby:gems:') + SOURCE_CACHE="${gemsitedir}/source_cache" + + if [[ -e "${SOURCE_CACHE}" ]]; then + rm "${SOURCE_CACHE}" + einfo "Cleared gem source cache." + fi +} + +pkg_postinst() { + _ruby_each_implementation clear_source_cache + + if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then + eselect ruby set $(eselect --brief --no-color ruby show | head -n1) + fi + + ewarn + ewarn "To switch between available Ruby profiles, execute as root:" + ewarn "\teselect ruby set ruby(18|19|...)" + ewarn +} + +pkg_postrm() { + ewarn "If you have uninstalled dev-ruby/rubygems, Ruby applications are unlikely" + ewarn "to run in current shells because of missing auto_gem." + ewarn "Please run \"unset RUBYOPT\" in your shells before using ruby" + ewarn "or start new shells" + ewarn + ewarn "If you have not uninstalled dev-ruby/rubygems, please do not unset " + ewarn "RUBYOPT" +} |