From ea9aeb39f92e7ed913901087f6a44261b5139850 Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Mon, 26 Dec 2011 08:46:41 +0000 Subject: [PATCH] Make sure only the latest slot installs binaries in /usr/bin. Package-Manager: portage-2.1.10.41/cvs/Linux x86_64 --- dev-ruby/activesupport/ChangeLog | 8 +++- dev-ruby/activesupport/Manifest | 11 ++--- .../activesupport-3.0.11-r1.ebuild | 45 +++++++++++++++++++ .../activesupport/activesupport-3.1.3.ebuild | 5 ++- dev-ruby/treetop/Manifest | 14 +++--- 5 files changed, 68 insertions(+), 15 deletions(-) create mode 100644 dev-ruby/activesupport/activesupport-3.0.11-r1.ebuild diff --git a/dev-ruby/activesupport/ChangeLog b/dev-ruby/activesupport/ChangeLog index efdea68d509d..fc211b104cef 100644 --- a/dev-ruby/activesupport/ChangeLog +++ b/dev-ruby/activesupport/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/activesupport # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.159 2011/12/26 08:25:55 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.160 2011/12/26 08:46:41 graaff Exp $ + +*activesupport-3.0.11-r1 (26 Dec 2011) + + 26 Dec 2011; Hans de Graaff + +activesupport-3.0.11-r1.ebuild, activesupport-3.1.3.ebuild: + Make sure only the latest slot installs binaries in /usr/bin. *activesupport-3.1.3 (26 Dec 2011) diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest index 3487385236f3..a3a6b552d364 100644 --- a/dev-ruby/activesupport/Manifest +++ b/dev-ruby/activesupport/Manifest @@ -14,14 +14,15 @@ DIST rails-3.1.3.tgz 3638313 RMD160 9453e35f16d2c4e7f594e62643d023c887000094 SHA EBUILD activesupport-2.3.14-r1.ebuild 1594 RMD160 3f82a5c9ea95693f6c1bcde742751b48919e32e6 SHA1 75c6e033f4862e5eb86c18c2333f8ca12ae886a7 SHA256 bc3867ddb3e94625dc2a62aba8e0eaf9f7392dc7bffdd5caafbf3cd06810d507 EBUILD activesupport-2.3.14.ebuild 1244 RMD160 57c756401e88405974891feb419f27ee3d45c48e SHA1 9cca430b8e22083f42503d3c4acf953e0357cafc SHA256 062a9d051fc3b0067379b935f9d91a92e0d3463ed53068ad654a47e54c4dc57c EBUILD activesupport-3.0.10.ebuild 1411 RMD160 fecff663e2206cb6212636e1292619c3f589381a SHA1 18a84615e1ddc2a348839ee6abe33048aec284a9 SHA256 f590160e221689cda0b1fbc44032111982400bb04d20167789b4ccaf7a549ca0 +EBUILD activesupport-3.0.11-r1.ebuild 1454 RMD160 98bf5413bf88fb28abdec603e62723e47b1a57f5 SHA1 8a240f62249984d678c6f8f0f2b5f2e02cf4bf6c SHA256 a98b82748b5c456645c3c17f214b82b40f9a588a09654f447ac8d93e44a36b7e EBUILD activesupport-3.0.11.ebuild 1429 RMD160 c85881e6fb9ddbfb609e7b1b5b7d763486b93320 SHA1 e8098b7033490caa03619584792f76718b27c43a SHA256 ba14bae148148db92e7b9bfb70130a2e50f158aa702a8eeed38ef089da13314d -EBUILD activesupport-3.1.3.ebuild 1378 RMD160 d7e444fec8c3e730f57f3b4c52b9d0325e6e2b74 SHA1 42e3472f88a0ef3b9a9b47eff32fd37be77dd676 SHA256 fcd700bcd69b350ca4cf2e665391902bd819d2bc0a81018b19408b5438c1ce10 -MISC ChangeLog 22235 RMD160 a8c81862f19f8a2071d6c74842e0127334391bf5 SHA1 369149e35b5b2b27853b91f3823c37d86787e2c3 SHA256 d143489f888a4f165c07dd4d55374b3d7e3cb111174547a7ee869c193cd45257 +EBUILD activesupport-3.1.3.ebuild 1419 RMD160 992bf39d691f6426c758d8a902324e041517d5a2 SHA1 416d5d7412ae071b19501d848f2211d415fe6024 SHA256 dd084b99211ac2fe37556029d987752be58a136e430792009c69cd27521d24c5 +MISC ChangeLog 22453 RMD160 585f7b6cb85bf63587b733aac83ca9ee1316da06 SHA1 7cb05c2b49879f505f9d53a1a75a68b1f36043df SHA256 b47e0596cd0dcef93b304bd1aa7fec2ab6b380dd2c28cd886ea3c4d92c78f2b9 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk74L5gACgkQiIP6VqMIqNftzAEAi8+L3TobuAtPAghdBbbJTT6x -h32JWK4ISs97DFOngDIA/1QWQWw3rnAEX7MHqBEE3md1szLlyorbvpwe4rNI6w6l -=QSDO +iF4EAREIAAYFAk74NHcACgkQiIP6VqMIqNdPpgEAjiszA7ke8HKR6nqDpn+v4Rji +FCFU2kPgDB2yrKSwj64A/ApVbW/xXOrfWxkr65atG3/CB3JfwzmKoFGcFPKCX6li +=ABzF -----END PGP SIGNATURE----- diff --git a/dev-ruby/activesupport/activesupport-3.0.11-r1.ebuild b/dev-ruby/activesupport/activesupport-3.0.11-r1.ebuild new file mode 100644 index 000000000000..69be16cb6419 --- /dev/null +++ b/dev-ruby/activesupport/activesupport-3.0.11-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.0.11-r1.ebuild,v 1.1 2011/12/26 08:46:41 graaff Exp $ + +EAPI=4 + +# jruby fails tests. +USE_RUBY="ruby18 ree18" + +RUBY_FAKEGEM_TASK_DOC="" + +RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc" + +RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec" + +RUBY_FAKEGEM_BINWRAP="" + +inherit ruby-fakegem + +DESCRIPTION="Utility Classes and Extension to the Standard Library" +HOMEPAGE="http://rubyforge.org/projects/activesupport/" +SRC_URI="https://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz" + +LICENSE="MIT" +SLOT="3.0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RUBY_S="rails-rails-*/${PN}" + +ruby_add_rdepend ">=dev-ruby/memcache-client-1.5.8" + +# libxml-ruby and nokogiri are not strictly needed, but there are tests +# using this code. +ruby_add_bdepend "test? ( virtual/ruby-test-unit >=dev-ruby/libxml-2.0.0 dev-ruby/nokogiri dev-ruby/mocha )" + +all_ruby_prepare() { + # don't support older mocha versions as the optional codepath + # breaks JRuby + epatch "${FILESDIR}"/${PN}-3.0.3-mocha-0.9.5.patch + + # Set test environment to our hand. + rm "${S}/../Gemfile" || die "Unable to remove Gemfile" + sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths" +} diff --git a/dev-ruby/activesupport/activesupport-3.1.3.ebuild b/dev-ruby/activesupport/activesupport-3.1.3.ebuild index 24668bc00007..017a93c3fbaa 100644 --- a/dev-ruby/activesupport/activesupport-3.1.3.ebuild +++ b/dev-ruby/activesupport/activesupport-3.1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.1.3.ebuild,v 1.1 2011/12/26 08:25:55 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.1.3.ebuild,v 1.2 2011/12/26 08:46:41 graaff Exp $ EAPI=4 @@ -28,7 +28,8 @@ RUBY_S="rails-rails-*/${PN}" ruby_add_rdepend ">=dev-ruby/memcache-client-1.5.8 >=dev-ruby/multi_json-1.0 - dev-ruby/i18n:0.6" + dev-ruby/i18n:0.6 + !!