diff options
Diffstat (limited to 'dev-ruby/rubygems')
-rw-r--r-- | dev-ruby/rubygems/ChangeLog | 8 | ||||
-rw-r--r-- | dev-ruby/rubygems/Manifest | 14 | ||||
-rw-r--r-- | dev-ruby/rubygems/files/rubygems-1.3.3-gentoo.patch | 31 | ||||
-rw-r--r-- | dev-ruby/rubygems/files/rubygems-1.3.3-setup.patch | 31 | ||||
-rw-r--r-- | dev-ruby/rubygems/rubygems-1.3.3.ebuild | 105 |
5 files changed, 183 insertions, 6 deletions
diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog index 9c1674799434..a9b8c468d7dc 100644 --- a/dev-ruby/rubygems/ChangeLog +++ b/dev-ruby/rubygems/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/rubygems # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.119 2009/03/21 09:50:56 a3li Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.120 2009/05/09 08:39:37 a3li Exp $ + +*rubygems-1.3.3 (09 May 2009) + + 09 May 2009; Alex Legler <a3li@gentoo.org> +rubygems-1.3.3.ebuild, + +files/rubygems-1.3.3-gentoo.patch, +files/rubygems-1.3.3-setup.patch: + Version bump *rubygems-1.3.1-r30 (20 Mar 2009) diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest index 43b32e8e4949..d4ca159e9158 100644 --- a/dev-ruby/rubygems/Manifest +++ b/dev-ruby/rubygems/Manifest @@ -17,21 +17,25 @@ AUX rubygems-1.2.0-setup.patch 1534 RMD160 e253b5bf4b21a79e67bd4809cb0decad87240 AUX rubygems-1.3.1-gentoo.patch 2043 RMD160 27f3cf79db923fd7e0a8261a5e0b99c45a0a3230 SHA1 aade1ad9314e2e7ce0aa738cbb9abc485a289aa2 SHA256 3e527e27677f5725cd902f44ae4f9b5596ebeb1e0dedb561d490133ffca48191 AUX rubygems-1.3.1-proxy.patch 480 RMD160 4a782791fa29525473a6ec9de91885606c0c85e7 SHA1 8cea4f1a918c8df68581955ceaf07502de8310dc SHA256 ac7d7012910041395e8855169d36cb9fba81ba060b7f1f404e03041d5e5e7634 AUX rubygems-1.3.1-setup.patch 1534 RMD160 e253b5bf4b21a79e67bd4809cb0decad87240a77 SHA1 15dcec952759233a257dfb825df4ad05fac24e26 SHA256 a95b44921346f82384a5799cc92e2a4a8abde8e6073693349eb3c28d928c09c5 +AUX rubygems-1.3.3-gentoo.patch 1422 RMD160 e39a2042170399d0e98c772b0572026d6057353d SHA1 11cb4656b77185c78df809d3180061e5fe41139b SHA256 95e6c7ea38177b0798562be5abaf040e72db4a27f851502d91c4453890e630b0 +AUX rubygems-1.3.3-setup.patch 886 RMD160 fa4610c20574a42f2703748359dd0bf50b83892e SHA1 54fcc6dc9dd4435a1d043fdf8f10e1d0756722fe SHA256 5220a63f1c8a231a0f8d7dfa938ef4351764a76aa82cf941fdd9dd6b83c7b6bf DIST rubygems-0.9.4.tgz 204841 RMD160 6ee02db45173f05e6f8c5b1ecd5af832fb8601f8 SHA1 904080d36e34d7a6969c3cef228380eb82688d2a SHA256 b4d47bcfe2f3b08f7c3bb659a2f4e34a3fa9c1135ba98ad3272753753c354e5c DIST rubygems-1.1.1.tgz 423308 RMD160 264b6c2667fd74c111b6886da13b324bc391eaa8 SHA1 e1ead11fa2928fb4b7871c17fd1186198c97c11a SHA256 2b1ce82c8629e4583c8feb1248cfdd12207206f174a4aac2ac30b6d06b6664e1 DIST rubygems-1.2.0.tgz 246920 RMD160 c66444cc3f372f7170ba1d8ef3c456052acb2bde SHA1 89f8e35f03e1e8057cc8e237f2df025642653dde SHA256 28af450a85fd74ae8bd315023cbeeff98a132720978fa009199f6c95f4bb372d DIST rubygems-1.3.1.tgz 263748 RMD160 898f33bf49ac6d29d8980cb4feaf30ade0125248 SHA1 a21ae466146bffb28ece05cddbdced0b908ca74f SHA256 361f02e9e3bf1b6625f0e2146553b12c3003d36336cacba51410740f544a8d3b +DIST rubygems-1.3.3.tgz 292766 RMD160 a9dffb8b93e1ef5cc0679a1555d0899859d770a3 SHA1 395de32c37518041f0bea242fa343f521b8dc100 SHA256 22744ae3994939a198707b9d573d19432c34960220afd2d196ed718bfebee6d7 EBUILD rubygems-0.9.4-r2.ebuild 2842 RMD160 8d26a904cc547b0b692002d078daf00a0fa0d1be SHA1 fe835d08c081dd4e445448c58d08f42f8c34b8a6 SHA256 0fad8cfc0cf3a294bc8d1138f26cf86af4f0f8c9cded6ca7f271d0f32b6ee43e EBUILD rubygems-1.1.1.ebuild 2805 RMD160 b91676ccb894705fe00554f4a6fb4c6f12ccbe1f SHA1 61a06d30192dc8c71e9bee22f00e30206355504c SHA256 35619d8b9804b4a9101fd2cd65b6ca6384516a05bc5f1cec6322cf725f731985 EBUILD rubygems-1.2.0.ebuild 2959 RMD160 e29bb2b6c8a7ed9a4dbb984987eaa2f0d895618f SHA1 ef6ecf37365fce9ae378bc25679e0767e2822899 SHA256 85b9db90828b89184b8a3872b423e2b2eca84f13e7dbaede13fd82bef8b882a8 EBUILD rubygems-1.3.1-r30.ebuild 3186 RMD160 bb5002a10a1c38d4408db3c6c68cc365c96a101d SHA1 9b2c9325f8ec5e2b2b5b1b8cb130419db9209108 SHA256 c7f2fe7cb53b07c1afbfdac8200cb045591c3f0668ed9afbf081b900b50fdba4 EBUILD rubygems-1.3.1.ebuild 2675 RMD160 a9536a0c6668d4fac836a806b3634b5165ae6144 SHA1 a1963024a84cb2bb4534212cbd09e10c5afcac9b SHA256 164e7397245832d0e78478e6e56e98bdf8bea7b7163d7ec6ba0f5e23f0dbf8bf -MISC ChangeLog 17716 RMD160 a409b7f1ad78f3c6f0954c5d0b1e39aa8760272a SHA1 af9663d537a6bb3f133274b8330da182f69d5fc1 SHA256 1c0c273e5ba724f06fedd6d1f7f6e99139328a57e2ad0cb89723a302cfd2640c +EBUILD rubygems-1.3.3.ebuild 3178 RMD160 530120512b07478a6e082f041b58c198e33d599d SHA1 b29a0b20a2bd6555772b737a3010ea06739a188d SHA256 d20f9b159764a2e1fa3c6623b5c79f1a2a6a475e929f01cf22dbe975052fa33d +MISC ChangeLog 17905 RMD160 56e9f55a30f1f333348ac08418afa6e05f718890 SHA1 af423b57714f86fbf3ef00d91d2c0fa241ffa682 SHA256 c229d3b8102cb4d07d5d7de6afaaecb3789d2996eb14b756c3e23497e6b9fd45 MISC metadata.xml 247 RMD160 eb1d10b4366542ce2f232dcaf7317341b6b5608f SHA1 fcb6e2a1d6cda6d45640f9c5a5dfcc0fd4f3ab3b SHA256 633ae9912e8dd27f76b9cf53f5ad0d3222db85d9a19a76da7fd5e26f40b144e3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.10 (GNU/Linux) +Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAknEuI8ACgkQk3qunHEll7NQDwCg9FZCmCh/n9Zvo4LVMukdsil6 -cGQAoLC0Fw4ncigkr98kyicb7KASkZ7z -=Hec3 +iEYEARECAAYFAkoFQVkACgkQk3qunHEll7Mn9gCfaktVSv+gWp70MeSrOSIq8DD7 +t14An1DrbetBNYJE99ZdMXh68E1RPQR1 +=i8DD -----END PGP SIGNATURE----- diff --git a/dev-ruby/rubygems/files/rubygems-1.3.3-gentoo.patch b/dev-ruby/rubygems/files/rubygems-1.3.3-gentoo.patch new file mode 100644 index 000000000000..1c8c4dc34f91 --- /dev/null +++ b/dev-ruby/rubygems/files/rubygems-1.3.3-gentoo.patch @@ -0,0 +1,31 @@ +Fix a mismatch between our use of a sandbox while installing and +rubygems' assumptions on where to find already installed gems. +Patch by a3li@g.o. + +diff -ru a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb +--- a/lib/rubygems/dependency_installer.rb 2009-03-05 02:07:04.000000000 +0100 ++++ b/lib/rubygems/dependency_installer.rb 2009-05-08 23:41:53.000000000 +0200 +@@ -44,7 +44,7 @@ + # :wrappers:: See Gem::Installer::new + + def initialize(options = {}) +- if options[:install_dir] then ++ if options[:install_dir] and not options[:sandbox_fix] then + spec_dir = options[:install_dir], 'specifications' + @source_index = Gem::SourceIndex.from_gems_in spec_dir + else +diff -ru a/lib/rubygems/install_update_options.rb b/lib/rubygems/install_update_options.rb +--- a/lib/rubygems/install_update_options.rb 2009-03-14 00:01:10.000000000 +0100 ++++ b/lib/rubygems/install_update_options.rb 2009-05-08 23:43:05.000000000 +0200 +@@ -86,6 +86,11 @@ + options[:include_dependencies] = value + end + ++ add_option(:"Install/Update", '--sandbox-fix', ++ 'Fix specifications lookup path [Gentoo patch]') do |value, options| ++ options[:sandbox_fix] = true ++ end ++ + add_option(:"Install/Update", '--[no-]format-executable', + 'Make installed executable names match ruby.', + 'If ruby is ruby18, foo_exec will be', diff --git a/dev-ruby/rubygems/files/rubygems-1.3.3-setup.patch b/dev-ruby/rubygems/files/rubygems-1.3.3-setup.patch new file mode 100644 index 000000000000..3306dfe28856 --- /dev/null +++ b/dev-ruby/rubygems/files/rubygems-1.3.3-setup.patch @@ -0,0 +1,31 @@ +--- lib/rubygems/commands/setup_command.rb.0 2009-04-03 02:46:29.000000000 +0200 ++++ lib/rubygems/commands/setup_command.rb 2009-05-08 23:34:19.000000000 +0200 +@@ -111,8 +111,6 @@ + + remove_old_bin_files bin_dir + +- remove_source_caches install_destdir +- + install_rdoc + + say +@@ -226,10 +224,6 @@ + if File.writable? gem_doc_dir and + (not File.exist? rubygems_doc_dir or + File.writable? rubygems_doc_dir) then +- say "Removing old RubyGems RDoc and ri" +- Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir| +- rm_rf dir +- end + + if options[:ri] then + ri_dir = File.join rubygems_doc_dir, 'ri' +@@ -343,7 +337,7 @@ + + args << '--quiet' + args << '--main' << 'README' +- args << '.' << 'README' << 'LICENSE.txt' << 'GPL.txt' ++ args << '.' << 'README' + + r = RDoc::RDoc.new + r.document args diff --git a/dev-ruby/rubygems/rubygems-1.3.3.ebuild b/dev-ruby/rubygems/rubygems-1.3.3.ebuild new file mode 100644 index 000000000000..c4c31a288ea8 --- /dev/null +++ b/dev-ruby/rubygems/rubygems-1.3.3.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.3.ebuild,v 1.1 2009/05/09 08:39:37 a3li Exp $ + +inherit ruby + +DESCRIPTION="Centralized Ruby extension management system" +HOMEPAGE="http://rubyforge.org/projects/rubygems/" +LICENSE="|| ( Ruby GPL-2 )" + +# Needs to be installed first +RESTRICT="test" + +# The URL depends implicitly on the version, unfortunately. Even if you +# change the filename on the end, it still downloads the same file. +SRC_URI="mirror://rubyforge/${PN}/${P}.tgz" + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +SLOT="0" +IUSE="doc server" +DEPEND="=dev-lang/ruby-1.8*" +RDEPEND="${DEPEND}" +PDEPEND="server? ( dev-ruby/builder )" # index_gem_repository.rb + +USE_RUBY="ruby18" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${PN}-1.3.3-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" +} + +src_compile() { + # Allowing ruby_src_compile would be bad with the new setup.rb + : +} + +src_install() { + # RUBYOPT=-rauto_gem without rubygems installed will cause ruby to fail, bug #158455 + export RUBYOPT="${GENTOO_RUBYOPT}" + ewarn "RUBYOPT=${RUBYOPT}" + + # Force ebuild to use Ruby 1.8 + export RUBY="/usr/bin/ruby18" + + ver=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["ruby_version"]') + + # 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}/usr/$(get_libdir)/ruby/gems/${ver}" + export GEM_PATH="${GEM_HOME}/" + keepdir /usr/$(get_libdir)/ruby/gems/$ver/{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" + + dodoc README || die "dodoc README failed" + + cp "${FILESDIR}/auto_gem.rb" "${D}"/$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]') || die "cp auto_gem.rb 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 +} + +pkg_postinst() +{ + SOURCE_CACHE="/usr/$(get_libdir)/ruby/gems/$ver/source_cache" + if [[ -e "${SOURCE_CACHE}" ]]; then + rm "${SOURCE_CACHE}" + fi + + if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then + eselect ruby set ruby18 + fi + + ewarn + ewarn "This ebuild is compatible to eselect-ruby" + 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" +} |