From cbab9b3cb99d8e22cd4cbfd0ac45183eca964df3 Mon Sep 17 00:00:00 2001 From: Nguyen Thai Ngoc Duy Date: Sat, 16 Dec 2006 14:40:47 +0000 Subject: [PATCH] added patch to fix "gem build gemspec.yaml" failure Package-Manager: portage-2.1.1 --- dev-ruby/rubygems/ChangeLog | 8 ++- dev-ruby/rubygems/Manifest | 29 +++++------ .../rubygems/files/digest-rubygems-0.9.0-r2 | 3 ++ .../rubygems-0.9.0-build-from-yaml.patch | 12 +++++ dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild | 49 +++++++++++++++++++ 5 files changed, 86 insertions(+), 15 deletions(-) create mode 100644 dev-ruby/rubygems/files/digest-rubygems-0.9.0-r2 create mode 100644 dev-ruby/rubygems/files/rubygems-0.9.0-build-from-yaml.patch create mode 100644 dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog index 3762aeed819a..47a5a59c4100 100644 --- a/dev-ruby/rubygems/ChangeLog +++ b/dev-ruby/rubygems/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/rubygems # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.37 2006/11/01 17:56:32 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.38 2006/12/16 14:40:47 pclouds Exp $ + +*rubygems-0.9.0-r2 (16 Dec 2006) + + 16 Dec 2006; Nguyễn Thái Ngọc Duy + +files/rubygems-0.9.0-build-from-yaml.patch, +rubygems-0.9.0-r2.ebuild: + Added patch to fix "gem build gemspec.yaml" failure *rubygems-0.9.0-r1 (01 Nov 2006) diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest index 48d6d0e14b9f..d7a7e95c8b1c 100644 --- a/dev-ruby/rubygems/Manifest +++ b/dev-ruby/rubygems/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 10rubygems 21 RMD160 02441be7de6307bbb859fbc2bf5891809fe9ecf8 SHA1 3f98150bfb39a3f3f1dfabcf2d9bf80051960d81 SHA256 8c30de9ba7f327237af47f85d8f7f6701d34c9a8780ff7303244667568ca5833 MD5 15ffbd574f0d1b8f0e79d060c92749b4 files/10rubygems 21 RMD160 02441be7de6307bbb859fbc2bf5891809fe9ecf8 files/10rubygems 21 @@ -17,6 +14,10 @@ AUX rubygems-0.9.0-build-c-extensions.patch 3392 RMD160 212f9e3a5b19c5aec2a0a020 MD5 0295637467ebc9c5fc5441f04e73d599 files/rubygems-0.9.0-build-c-extensions.patch 3392 RMD160 212f9e3a5b19c5aec2a0a0205004bfbb77230d78 files/rubygems-0.9.0-build-c-extensions.patch 3392 SHA256 d17f8c750e7c423a029792e87e3a61a355e931363890ff2a4032538538606469 files/rubygems-0.9.0-build-c-extensions.patch 3392 +AUX rubygems-0.9.0-build-from-yaml.patch 593 RMD160 92fb50e21d2d6e7f022f9d1863228858c3f8c826 SHA1 baf3db12baaee271987c0665e2afc5cc18469dd0 SHA256 e698e51d2969f34614c0d8a38869083eb28a6aff6b087e4887472127b4864091 +MD5 5c408f7d3a5c5db9d8f9f4ce61afd128 files/rubygems-0.9.0-build-from-yaml.patch 593 +RMD160 92fb50e21d2d6e7f022f9d1863228858c3f8c826 files/rubygems-0.9.0-build-from-yaml.patch 593 +SHA256 e698e51d2969f34614c0d8a38869083eb28a6aff6b087e4887472127b4864091 files/rubygems-0.9.0-build-from-yaml.patch 593 DIST rubygems-0.8.11.tgz 160265 RMD160 381ef7f088b3b439f28797d6d7a3257b3e28d6e4 SHA1 6a7d047349a073f24621e589f50a6a6548f943be SHA256 6ad2b857248aef0e9a5297f708f9988fbade78e16d670109937a73e56fdbae6d DIST rubygems-0.9.0.tgz 174321 RMD160 7d2a4ec1a615f608e75c68ee346d957efbb34ed1 SHA1 90d2193e9bb91dbbfbb81ce749abcd827e3b6b53 SHA256 6e90baff5ec951939ffcec569b9e1829e46da56cd320b1de1c8e2f5be828fef0 EBUILD rubygems-0.8.11-r5.ebuild 1494 RMD160 3899bdc08cb4c1f0ab7b9bbd6f82d8ce30545546 SHA1 73e528262d5669c13fae7a549b0ad16073339462 SHA256 5e517fa0fa94c98208cae9277144b781ec0dc888cb92626573a9b8e2ef247cdd @@ -31,14 +32,18 @@ EBUILD rubygems-0.9.0-r1.ebuild 1553 RMD160 62759f44067be4f0a53e3f4c7d18cb9fd96d MD5 df07525c9ce2f70028fd70b42009eb47 rubygems-0.9.0-r1.ebuild 1553 RMD160 62759f44067be4f0a53e3f4c7d18cb9fd96dd56b rubygems-0.9.0-r1.ebuild 1553 SHA256 21f76e510e1004cf9b80e5d3ddcf40ce19aa6f3fea5fd5b3cfcffa89e264f8ec rubygems-0.9.0-r1.ebuild 1553 +EBUILD rubygems-0.9.0-r2.ebuild 1591 RMD160 e4b8c2d9def490d7487b19982a123d4cdbdab5f1 SHA1 b4a15d7c9fc35b99013054f62515aa20f70e3d7e SHA256 ed18502f4b6b95208380ee70ef3aab9f071be68c1ccce1c7ad7690c0e4429aad +MD5 106482f72ac64186631f05301a1c2ca0 rubygems-0.9.0-r2.ebuild 1591 +RMD160 e4b8c2d9def490d7487b19982a123d4cdbdab5f1 rubygems-0.9.0-r2.ebuild 1591 +SHA256 ed18502f4b6b95208380ee70ef3aab9f071be68c1ccce1c7ad7690c0e4429aad rubygems-0.9.0-r2.ebuild 1591 EBUILD rubygems-0.9.0.ebuild 1507 RMD160 752f72b8c2d186c3f7a5fe21b410f96728d914c1 SHA1 4d505d7e0ab7549f8397d21a3af241476d36c781 SHA256 37dabd14849905a252fb01cba43bb91dcad64e539dba0e5176a9785f2e13a9a3 MD5 8ece8145793c0f44d3ed9d582a103dd0 rubygems-0.9.0.ebuild 1507 RMD160 752f72b8c2d186c3f7a5fe21b410f96728d914c1 rubygems-0.9.0.ebuild 1507 SHA256 37dabd14849905a252fb01cba43bb91dcad64e539dba0e5176a9785f2e13a9a3 rubygems-0.9.0.ebuild 1507 -MISC ChangeLog 5497 RMD160 ef2dd034ea5e2ff21da106cf5b1a61a29d77d144 SHA1 adeae9d0423c954ccfea5577c5dc513b5227417b SHA256 6c55ae2604d94dbee312ec665346c7bb7f76bc124ba936dec1e9076f1f542d0a -MD5 9f2827a70a7c35b1100adad29288a67e ChangeLog 5497 -RMD160 ef2dd034ea5e2ff21da106cf5b1a61a29d77d144 ChangeLog 5497 -SHA256 6c55ae2604d94dbee312ec665346c7bb7f76bc124ba936dec1e9076f1f542d0a ChangeLog 5497 +MISC ChangeLog 5720 RMD160 014e1dd533638e503ee044534485e8b5d122959c SHA1 0e49497184e85c31f1940bbfc6b5d213b65269fb SHA256 a83e7e07d0244432694c53ce0236721585b4e460ef52cef4da1e19235e655579 +MD5 7e01fe8f0026e2cccf0f8b1760d82bc8 ChangeLog 5720 +RMD160 014e1dd533638e503ee044534485e8b5d122959c ChangeLog 5720 +SHA256 a83e7e07d0244432694c53ce0236721585b4e460ef52cef4da1e19235e655579 ChangeLog 5720 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157 @@ -55,10 +60,6 @@ SHA256 70a1185b3b03d3e319df2082ac691e533568859a4f8ee26de4898a35806aa378 files/di MD5 4c7cb65883b2c77de5ec840e74eca652 files/digest-rubygems-0.9.0-r1 235 RMD160 14cda89d31f6391477c71b22c23c9a4ade30e301 files/digest-rubygems-0.9.0-r1 235 SHA256 70a1185b3b03d3e319df2082ac691e533568859a4f8ee26de4898a35806aa378 files/digest-rubygems-0.9.0-r1 235 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFSNztAiZjviIA2XgRAkGiAJsEeD/y1Z8PhAUXCSXjpstf3lQ5tQCg1QYB -FHWcQCxtsW/YvxbGpVT99Yc= -=yGM6 ------END PGP SIGNATURE----- +MD5 4c7cb65883b2c77de5ec840e74eca652 files/digest-rubygems-0.9.0-r2 235 +RMD160 14cda89d31f6391477c71b22c23c9a4ade30e301 files/digest-rubygems-0.9.0-r2 235 +SHA256 70a1185b3b03d3e319df2082ac691e533568859a4f8ee26de4898a35806aa378 files/digest-rubygems-0.9.0-r2 235 diff --git a/dev-ruby/rubygems/files/digest-rubygems-0.9.0-r2 b/dev-ruby/rubygems/files/digest-rubygems-0.9.0-r2 new file mode 100644 index 000000000000..5b13f741f2b3 --- /dev/null +++ b/dev-ruby/rubygems/files/digest-rubygems-0.9.0-r2 @@ -0,0 +1,3 @@ +MD5 5d496e1f415b8b4033ab867f01d1161f rubygems-0.9.0.tgz 174321 +RMD160 7d2a4ec1a615f608e75c68ee346d957efbb34ed1 rubygems-0.9.0.tgz 174321 +SHA256 6e90baff5ec951939ffcec569b9e1829e46da56cd320b1de1c8e2f5be828fef0 rubygems-0.9.0.tgz 174321 diff --git a/dev-ruby/rubygems/files/rubygems-0.9.0-build-from-yaml.patch b/dev-ruby/rubygems/files/rubygems-0.9.0-build-from-yaml.patch new file mode 100644 index 000000000000..62f09b38687a --- /dev/null +++ b/dev-ruby/rubygems/files/rubygems-0.9.0-build-from-yaml.patch @@ -0,0 +1,12 @@ +diff -ur rubygems-0.9.0/lib/rubygems/specification.rb rubygems-0.9.0.new/lib/rubygems/specification.rb +--- rubygems-0.9.0/lib/rubygems/specification.rb 2006-06-27 01:46:30.000000000 +0700 ++++ rubygems-0.9.0.new/lib/rubygems/specification.rb 2006-12-16 21:27:10.000000000 +0700 +@@ -412,7 +412,7 @@ + def Specification.from_yaml(input) + input = normalize_yaml_input(input) + spec = YAML.load(input) +- if(spec.class == FalseClass) then ++ if(spec.nil? || spec.class == FalseClass) then + raise Gem::EndOfYAMLException + end + unless Specification === spec diff --git a/dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild b/dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild new file mode 100644 index 000000000000..4ee10acf02bf --- /dev/null +++ b/dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild,v 1.1 2006/12/16 14:40:47 pclouds Exp $ + +inherit ruby + +DESCRIPTION="Centralized Ruby extension management system" +HOMEPAGE="http://rubyforge.org/projects/rubygems/" +LICENSE="Ruby" + +# 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="http://rubyforge.org/frs/download.php/11289/${P}.tgz" + +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd" +SLOT="0" +IUSE="" +DEPEND=">=dev-lang/ruby-1.8" + +PATCHES="${FILESDIR}/no_post_install.patch + ${FILESDIR}/${P}-build-c-extensions.patch + ${FILESDIR}/${P}-build-from-yaml.patch" +USE_RUBY="ruby18" + +src_compile() { + return +} + +src_install() { + ver=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["MAJOR"] + "." + Config::CONFIG["MINOR"]') + GEM_HOME=${D}/usr/lib/ruby/gems/$ver ruby_src_install + cp "${FILESDIR}/auto_gem.rb" "${D}"/$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]') + keepdir /usr/lib/ruby/gems/$ver/doc + doenvd "${FILESDIR}/10rubygems" +} + +pkg_postinst() +{ + ewarn "If you have previously switched to using ruby18_with_gems using ruby-config, this" + ewarn "package has removed that file and makes it unnecessary anymore. Please use ruby-config" + ewarn "to revert back to ruby18." +} + +pkg_postrm() +{ + # If we potentially downgraded, then getting rid of RUBYOPT from env.d is probably a smart idea. + env-update + source /etc/profile +} -- 2.26.2